From 643b23ad34abd94fcccfb82e4763f0a116c30d71 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Tue, 12 Dec 2023 11:01:19 +0100 Subject: [PATCH] Vereinheitlichung der Tests von DomainOptionen --- .../test/java/de/hsadmin/remote/DomainTest.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java b/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java index 99e6652..44c03ee 100644 --- a/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java +++ b/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java @@ -135,13 +135,12 @@ public class DomainTest { Map row = (Map) o; assertTrue("Domain name should be exampleupdate.de but is " + row.get("name"), "exampleupdate.de".equals(row.get("name"))); assertTrue("ValidSubdomainNames should be * but is " + row.get("validsubdomainnames"), "*".equals(row.get("validsubdomainnames"))); - Object[] domainoptions = (Object[]) row.get("domainoptions"); - String options = ""; - for (Object option: domainoptions) { - options += option + " "; - } - String defaultDomainOptions = "htdocsfallback indexes dkim autoconfig greylisting includes letsencrypt multiviews "; - assertTrue("Domainoptions should be " + defaultDomainOptions + " but are " + options, defaultDomainOptions.equals(options)); + String[] checkDomainOptions = Arrays.asList((Object[]) row.get("domainoptions")).toArray(new String[0]); + String[] expectedDomainOptions = new String[] {"htdocsfallback", "indexes", "dkim", "autoconfig", "greylisting", "includes", "letsencrypt", "multiviews"}; + Arrays.sort(expectedDomainOptions); + Arrays.sort(checkDomainOptions); + assertTrue("Domainoptions should be " + Arrays.toString(expectedDomainOptions) + " but are " + Arrays.toString(checkDomainOptions), + Arrays.toString(expectedDomainOptions).equals(Arrays.toString(checkDomainOptions))); } else { fail("Map expected"); @@ -175,8 +174,7 @@ public class DomainTest { Map row = (Map) o; assertTrue("Domain name should be exampleupdate.de but is " + row.get("name"), "exampleupdate.de".equals(row.get("name"))); assertTrue("ValidSubdomainNames should be www2 but is " + row.get("validsubdomainnames"), "www2".equals(row.get("validsubdomainnames"))); - Object[] domainoptions = (Object[]) row.get("domainoptions"); - String[] checkDomainOptions = Arrays.asList(domainoptions).toArray(new String[0]); + String[] checkDomainOptions = Arrays.asList((Object[]) row.get("domainoptions")).toArray(new String[0]); Arrays.sort(newDomainOptions); Arrays.sort(checkDomainOptions); assertTrue("Domainoptions should be " + Arrays.toString(newDomainOptions) + " but are " + Arrays.toString(checkDomainOptions),