From 4b673e58e6c16a14430c48b860fbae6d5f7d917e Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 10 Apr 2019 17:15:38 +0200 Subject: [PATCH] [Fix] Fixed broken tests --- .../li/strolch/privilege/test/XmlTest.java | 4 ++-- .../strolch/rest/inspector/test/EnumTest.java | 23 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java b/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java index 20d40f90a..d1a5a8cc8 100644 --- a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java +++ b/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java @@ -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 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()); } diff --git a/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java b/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java index 221a3840c..5fd1ce0f8 100644 --- a/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java +++ b/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java @@ -1,12 +1,12 @@ /* * Copyright 2013 Robert von Burg - * + * * 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()); } }