Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed broken tests

This commit is contained in:
Robert von Burg 2019-04-10 17:15:38 +02:00
parent 78c96d4351
commit 4b673e58e6
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java
View File

@ -172,7 +172,7 @@ public class XmlTest {
assertEquals("Application", admin.getFirstname());
assertEquals("Administrator", admin.getLastname());
assertEquals(UserState.ENABLED, admin.getUserState());
assertEquals("en-GB", admin.getLocale().toString());
assertEquals("en-GB", admin.getLocale().toLanguageTag());
assertThat(admin.getRoles(), containsInAnyOrder("PrivilegeAdmin", "AppUser"));
Map<String, String> properties = admin.getProperties();
assertEquals(new HashSet<>(Arrays.asList("organization", "organizationalUnit")), properties.keySet());
@ -188,7 +188,7 @@ public class XmlTest {
assertEquals("System User", systemAdmin.getFirstname());
assertEquals("Administrator", systemAdmin.getLastname());
assertEquals(UserState.SYSTEM, systemAdmin.getUserState());
assertEquals("en-GB", systemAdmin.getLocale().toString());
assertEquals("en-GB", systemAdmin.getLocale().toLanguageTag());
assertThat(systemAdmin.getRoles(), containsInAnyOrder("system_admin_privileges"));
assertTrue(systemAdmin.getProperties().isEmpty());
}

23
li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java
View File

@ -1,12 +1,12 @@
/*
* Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -57,14 +57,13 @@ public class EnumTest extends AbstractRestfulTest {
.path(ROOT_PATH + "/sex") //
.request(MediaType.APPLICATION_JSON) //
.header(HttpHeaders.AUTHORIZATION, this.authToken) //
.acceptLanguage(Locale.ENGLISH) //
.get();
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String strolchEnumS = result.readEntity(String.class);
assertNotNull(strolchEnumS);
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
assertEquals("sex", strolchEnumJ.get("name").getAsString());
assertEquals(4, strolchEnumJ.get("values").getAsJsonObject().size());
assertEquals(4, strolchEnumJ.get("values").getAsJsonArray().size());
}
@Test
@ -75,15 +74,15 @@ public class EnumTest extends AbstractRestfulTest {
.path(ROOT_PATH + "/salutation") //
.request(MediaType.APPLICATION_JSON) //
.header(HttpHeaders.AUTHORIZATION, this.authToken) //
.acceptLanguage(Locale.ENGLISH) //
.get();
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String strolchEnumS = result.readEntity(String.class);
assertNotNull(strolchEnumS);
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
assertEquals(3, strolchEnumJ.get("values").getAsJsonObject().size());
assertEquals("Mrs", strolchEnumJ.get("values").getAsJsonObject().get("mrs").getAsString());
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
assertEquals("Mr",
strolchEnumJ.get("values").getAsJsonArray().get(0).getAsJsonObject().get("value").getAsString());
}
@Test
@ -91,17 +90,17 @@ public class EnumTest extends AbstractRestfulTest {
// query
Response result = target() //
.path(ROOT_PATH + "/salutation") //
.path(ROOT_PATH + "/salutation/" + Locale.GERMAN.toLanguageTag()) //
.request(MediaType.APPLICATION_JSON) //
.header(HttpHeaders.AUTHORIZATION, this.authToken) //
.acceptLanguage(Locale.GERMAN) //
.get();
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String strolchEnumS = result.readEntity(String.class);
assertNotNull(strolchEnumS);
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
assertEquals(3, strolchEnumJ.get("values").getAsJsonObject().size());
assertEquals("Frau", strolchEnumJ.get("values").getAsJsonObject().get("mrs").getAsString());
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
assertEquals("Herr", strolchEnumJ.get("values").getAsJsonArray().get(0).getAsJsonObject().get("value").
getAsString());
}
}