zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adapted tests

Browse source
This commit is contained in:
anhefti 2020-04-14 10:26:17 +02:00
parent d0f6351754
commit 200fd7ad38
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

@ -1052,12 +1052,12 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
assertNotNull(attributes); assertNotNull(attributes);
assertFalse(attributes.hasError()); assertFalse(attributes.hasError());
final AttributeMapping attributeMapping = attributes.get(); final AttributeMapping attributeMapping = attributes.get();
assertEquals(192, attributeMapping.attributeIdMapping.size()); assertEquals(195, attributeMapping.attributeIdMapping.size());
assertEquals("[active, audio, backToStart, browserSecurity, browserViewMode, " assertEquals(
+ "exitSequence, functionKeys, kioskMode, logging, macSettings, " "[active, audio, backToStart, browserSecurity, browserViewMode, exitSequence, functionKeys, kioskMode, logging, "
+ "newBrowserWindow, newwinsize, proxies, quitLink, registry, " + "macSettings, newBrowserWindow, newwinsize, proxies, quitLink, registry, servicePolicy, sessionHandling, "
+ "servicePolicy, specialKeys, spellcheck, taskbar, urlFilter, " + "specialKeys, spellcheck, taskbar, urlFilter, userAgentDesktop, userAgentMac, userAgentTouch, winsize, wintoolbar, "
+ "userAgentDesktop, userAgentMac, userAgentTouch, winsize, wintoolbar, zoom, zoomMode]", + "zoom, zoomMode]",
attributeMapping.attributeGroupMapping.keySet() attributeMapping.attributeGroupMapping.keySet()
.stream() .stream()
.sorted() .sorted()
@ -1716,7 +1716,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.getOrThrow(); .getOrThrow();
assertNotNull(templateTrientations); assertNotNull(templateTrientations);
assertFalse(templateTrientations.isEmpty()); assertFalse(templateTrientations.isEmpty());
assertEquals(192, templateTrientations.size()); assertEquals(195, templateTrientations.size());
// get template attributes page // get template attributes page
final Page<TemplateAttribute> templateAttributes = restService final Page<TemplateAttribute> templateAttributes = restService

50
src/test/resources/data-test-additional.sql
View file

@ -105,6 +105,8 @@ INSERT IGNORE INTO configuration_attribute VALUES
(65, 'allowPDFPlugIn', 'CHECKBOX', null, null, null, null, 'true'), (65, 'allowPDFPlugIn', 'CHECKBOX', null, null, null, null, 'true'),
(66, 'downloadAndOpenSebConfig', 'CHECKBOX', null, null, null, null, 'true'), (66, 'downloadAndOpenSebConfig', 'CHECKBOX', null, null, null, null, 'true'),
(900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
(901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
(67, 'quitURL', 'TEXT_FIELD', null, null, null, null, null), (67, 'quitURL', 'TEXT_FIELD', null, null, null, null, null),
(68, 'quitURLConfirm', 'CHECKBOX', null, null, null, null, 'true'), (68, 'quitURLConfirm', 'CHECKBOX', null, null, null, null, 'true'),
(69, 'restartExamUseStartURL', 'CHECKBOX', null, null, null, null, 'false'), (69, 'restartExamUseStartURL', 'CHECKBOX', null, null, null, null, 'false'),
@ -257,8 +259,6 @@ INSERT IGNORE INTO configuration_attribute VALUES
(812, 'allowWlan', 'CHECKBOX', null, null, null, null, 'false'), (812, 'allowWlan', 'CHECKBOX', null, null, null, null, 'false'),
(813, 'hookKeys', 'CHECKBOX', null, null, null, null, 'true'), (813, 'hookKeys', 'CHECKBOX', null, null, null, null, 'true'),
(900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
(901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
(902, 'showBackToStartButton', 'CHECKBOX', null, null, null, null, 'true'), (902, 'showBackToStartButton', 'CHECKBOX', null, null, null, null, 'true'),
(903, 'showSettingsInApp', 'CHECKBOX', null, null, null, null, 'false'), (903, 'showSettingsInApp', 'CHECKBOX', null, null, null, null, 'false'),
(904, 'browserUserAgentWinTouchModeIPad', 'TEXT_FIELD', null, null, null, null, 'Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1'), (904, 'browserUserAgentWinTouchModeIPad', 'TEXT_FIELD', null, null, null, null, 'Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1'),
@ -315,9 +315,10 @@ INSERT IGNORE INTO orientation VALUES
(15, 15, 0, 2, 'wintoolbar', 0, 7, 3, 1, 'NONE'), (15, 15, 0, 2, 'wintoolbar', 0, 7, 3, 1, 'NONE'),
(16, 16, 0, 2, 'taskbar', 0, 9, 3, 1, 'NONE'), (16, 16, 0, 2, 'taskbar', 0, 9, 3, 1, 'NONE'),
(17, 17, 0, 2, 'taskbar', 5, 9, 2, 1, 'LEFT_SPAN'), (17, 17, 0, 2, 'taskbar', 5, 9, 2, 1, 'LEFT_SPAN'),
(18, 18, 0, 2, 'taskbar', 0, 10, 3, 1, 'NONE'), (812, 812, 0, 2, 'taskbar', 0, 10, 3, 1, 'NONE'),
(19, 19, 0, 2, 'taskbar', 0, 11, 3, 1, 'NONE'), (18, 18, 0, 2, 'taskbar', 0, 11, 3, 1, 'NONE'),
(20, 20, 0, 2, 'taskbar', 0, 12, 3, 1, 'NONE'), (19, 19, 0, 2, 'taskbar', 0, 12, 3, 1, 'NONE'),
(20, 20, 0, 2, 'taskbar', 0, 13, 3, 1, 'NONE'),
(21, 21, 0, 2, 'zoom', 0, 14, 3, 1, 'NONE'), (21, 21, 0, 2, 'zoom', 0, 14, 3, 1, 'NONE'),
(22, 22, 0, 2, 'zoom', 0, 15, 3, 1, 'NONE'), (22, 22, 0, 2, 'zoom', 0, 15, 3, 1, 'NONE'),
(23, 23, 0, 2, 'zoomMode', 3, 14, 4, 1, 'NONE'), (23, 23, 0, 2, 'zoomMode', 3, 14, 4, 1, 'NONE'),
@ -368,12 +369,16 @@ INSERT IGNORE INTO orientation VALUES
(65, 65, 0, 4, null, 0, 9, 8, 1, 'NONE'), (65, 65, 0, 4, null, 0, 9, 8, 1, 'NONE'),
(66, 66, 0, 4, null, 0, 10, 8, 1, 'NONE'), (66, 66, 0, 4, null, 0, 10, 8, 1, 'NONE'),
(67, 67, 0, 5, 'quitLink', 0, 1, 8, 1, 'TOP'), (900, 900, 0, 5, 'sessionHandling', 0, 0, 8, 1, 'NONE'),
(68, 68, 0, 5, 'quitLink', 0, 2, 8, 1, 'NONE'), (901, 901, 0, 5, 'sessionHandling', 0, 1, 8, 1, 'NONE'),
(69, 69, 0, 5, 'backToStart', 0, 4, 8, 1, 'NONE'), (67, 67, 0, 5, 'quitLink', 0, 4, 8, 1, 'TOP'),
(70, 70, 0, 5, 'backToStart', 0, 6, 8, 2, 'TOP'), (68, 68, 0, 5, 'quitLink', 0, 5, 8, 1, 'NONE'),
(71, 71, 0, 5, 'backToStart', 0, 8, 8, 2, 'TOP'),
(72, 72, 0, 5, 'backToStart', 0, 10, 8, 1, 'NONE'), (69, 69, 0, 5, 'backToStart', 0, 6, 8, 1, 'NONE'),
(70, 70, 0, 5, 'backToStart', 0, 8, 8, 2, 'TOP'),
(71, 71, 0, 5, 'backToStart', 0, 10, 8, 2, 'TOP'),
(72, 72, 0, 5, 'backToStart', 0, 12, 8, 1, 'NONE'),
(73, 73, 0, 6, null, 0, 2, 10, 6, 'TOP'), (73, 73, 0, 6, null, 0, 2, 10, 6, 'TOP'),
(74, 74, 0, 6, null, 1, 1, 1, 1, 'LEFT'), (74, 74, 0, 6, null, 1, 1, 1, 1, 'LEFT'),
@ -459,7 +464,8 @@ INSERT IGNORE INTO orientation VALUES
(301, 301, 0, 9, 'kioskMode', 4, 0, 3, 3, 'NONE'), (301, 301, 0, 9, 'kioskMode', 4, 0, 3, 3, 'NONE'),
(302, 302, 0, 9, null, 0, 5, 4, 1, 'NONE'), (302, 302, 0, 9, null, 0, 5, 4, 1, 'NONE'),
(303, 303, 0, 9, null, 0, 6, 4, 1, 'NONE'), (303, 303, 0, 9, null, 0, 6, 4, 1, 'NONE'),
(304, 304, 0, 9, null, 4, 5, 3, 1, 'NONE'), (501, 501, 0, 9, null, 4, 5, 3, 1, 'NONE'),
(304, 304, 0, 9, null, 4, 6, 3, 1, 'NONE'),
(305, 305, 0, 9, 'logging', 0, 8, 6, 1, 'NONE'), (305, 305, 0, 9, 'logging', 0, 8, 6, 1, 'NONE'),
(306, 306, 0, 9, 'logging', 3, 9, 4, 1, 'LEFT_SPAN'), (306, 306, 0, 9, 'logging', 3, 9, 4, 1, 'LEFT_SPAN'),
(307, 307, 0, 9, 'logging', 3, 10, 4, 1, 'LEFT_SPAN'), (307, 307, 0, 9, 'logging', 3, 10, 4, 1, 'LEFT_SPAN'),
@ -485,14 +491,13 @@ INSERT IGNORE INTO orientation VALUES
(408, 408, 0, 10, 'registry', 0, 9, 4, 1, 'NONE'), (408, 408, 0, 10, 'registry', 0, 9, 4, 1, 'NONE'),
(500, 500, 0, 11, 'specialKeys', 0, 1, 3, 1, 'NONE'), (500, 500, 0, 11, 'specialKeys', 0, 1, 3, 1, 'NONE'),
(501, 501, 0, 11, 'specialKeys', 0, 2, 3, 1, 'NONE'), (502, 502, 0, 11, 'specialKeys', 0, 2, 3, 1, 'NONE'),
(502, 502, 0, 11, 'specialKeys', 0, 3, 3, 1, 'NONE'), (503, 503, 0, 11, 'specialKeys', 0, 3, 3, 1, 'NONE'),
(503, 503, 0, 11, 'specialKeys', 0, 4, 3, 1, 'NONE'), (504, 504, 0, 11, 'specialKeys', 0, 4, 3, 1, 'NONE'),
(504, 504, 0, 11, 'specialKeys', 0, 5, 3, 1, 'NONE'), (505, 505, 0, 11, 'specialKeys', 0, 5, 3, 1, 'NONE'),
(505, 505, 0, 11, 'specialKeys', 0, 6, 3, 1, 'NONE'), (506, 506, 0, 11, 'specialKeys', 0, 6, 3, 1, 'NONE'),
(506, 506, 0, 11, 'specialKeys', 0, 7, 3, 1, 'NONE'), (507, 507, 0, 11, 'specialKeys', 0, 7, 3, 1, 'NONE'),
(507, 507, 0, 11, 'specialKeys', 0, 8, 3, 1, 'NONE'), (508, 508, 0, 11, 'specialKeys', 0, 8, 3, 1, 'NONE'),
(508, 508, 0, 11, 'specialKeys', 0, 9, 3, 1, 'NONE'),
(509, 509, 0, 11, 'functionKeys', 3, 1, 3, 1, 'NONE'), (509, 509, 0, 11, 'functionKeys', 3, 1, 3, 1, 'NONE'),
(510, 510, 0, 11, 'functionKeys', 3, 2, 3, 1, 'NONE'), (510, 510, 0, 11, 'functionKeys', 3, 2, 3, 1, 'NONE'),
@ -509,11 +514,6 @@ INSERT IGNORE INTO orientation VALUES
; ;
INSERT IGNORE INTO configuration_node VALUES INSERT IGNORE INTO configuration_node VALUES
(1, 1, 0, 'super-admin', 'test', null, 'EXAM_CONFIG', 'READY_TO_USE') (1, 1, 0, 'super-admin', 'test', null, 'EXAM_CONFIG', 'READY_TO_USE')
; ;