From 028d198f79b5dc7c41126b826ebb8f1ee141cff3 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 13 Jun 2014 17:23:56 +0200 Subject: [PATCH] [Minor] fixed test which breaks on Java8 --- .../runtime/query/enums/EnumHandlerTest.java | 14 +++++++++++--- src/test/resources/transienttest/data/Enums.xml | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java b/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java index e183ef907..6b52b8ef0 100644 --- a/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java +++ b/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java @@ -17,6 +17,8 @@ package li.strolch.runtime.query.enums; import static org.junit.Assert.assertEquals; +import java.util.Collections; +import java.util.List; import java.util.Locale; import li.strolch.agent.ComponentContainerTest; @@ -47,18 +49,24 @@ public class EnumHandlerTest { assertEquals("sex", sexEnum.getName()); assertEquals("en", sexEnum.getLocale()); assertEquals(3, sexEnum.getValues().size()); - assertEquals("both", sexEnum.getValues().get(0).getValue()); + List values = sexEnum.getEnumValues(); + Collections.sort(values); + assertEquals("both", values.get(0)); StrolchEnum salutationsEnum = enumHandler.getEnum("salutations", Locale.UK); assertEquals("salutations", salutationsEnum.getName()); assertEquals("en_GB", salutationsEnum.getLocale()); assertEquals(3, salutationsEnum.getValues().size()); - assertEquals("Mr", salutationsEnum.getValues().get(0).getValue()); + values = salutationsEnum.getEnumValues(); + Collections.sort(values); + assertEquals("Mr", values.get(0)); StrolchEnum religionsEnum = enumHandler.getEnum("religions", Locale.CANADA); assertEquals("religions", religionsEnum.getName()); assertEquals("en_CA", religionsEnum.getLocale()); assertEquals(9, religionsEnum.getValues().size()); - assertEquals("Orthodox", religionsEnum.getValues().get(0).getValue()); + values = religionsEnum.getEnumValues(); + Collections.sort(values); + assertEquals("Atheist", values.get(0)); } } diff --git a/src/test/resources/transienttest/data/Enums.xml b/src/test/resources/transienttest/data/Enums.xml index eb80fda34..57796e146 100644 --- a/src/test/resources/transienttest/data/Enums.xml +++ b/src/test/resources/transienttest/data/Enums.xml @@ -22,7 +22,7 @@ - +