From 090d9369622dfc48145eb6d7c8862b4711f642ae Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 4 Jul 2015 08:51:16 +0000 Subject: [PATCH] CCM NG: Improved test coverage for KernelConfig git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3520 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/kernel/KernelConfigTest.java | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/KernelConfigTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/KernelConfigTest.java index bca875ec0..a5da49b37 100644 --- a/ccm-core/src/test/java/com/arsdigita/kernel/KernelConfigTest.java +++ b/ccm-core/src/test/java/com/arsdigita/kernel/KernelConfigTest.java @@ -37,6 +37,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.tests.categories.IntegrationTest; +import sun.util.locale.StringTokenIterator; + +import java.util.StringTokenizer; import static org.junit.Assert.*; @@ -47,26 +50,26 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @Category(IntegrationTest.class) public class KernelConfigTest { - + public KernelConfigTest() { } - + @BeforeClass public static void setUpClass() { } - + @AfterClass public static void tearDownClass() { } - + @Before public void setUp() { } - + @After public void tearDown() { } - + @Deployment public static WebArchive createDeployment() { final PomEquippedResolveStage pom = Maven @@ -75,12 +78,12 @@ public class KernelConfigTest { final PomEquippedResolveStage dependencies = pom .importCompileAndRuntimeDependencies(); final File[] libs = dependencies.resolve().withTransitivity().asFile(); - + for (File lib : libs) { System.err.printf("Adding file '%s' to test archive...%n", lib.getName()); } - + return ShrinkWrap .create(WebArchive.class, "LibreCCM-com.arsdigita.kernel.KernelConfigTest.war") @@ -94,7 +97,8 @@ public class KernelConfigTest { .addPackage(com.arsdigita.web.CCMApplicationContextListener.class .getPackage()) .addPackage(com.arsdigita.xml.XML.class.getPackage()) - .addPackage(com.arsdigita.xml.formatters.DateFormatter.class.getPackage()) + .addPackage(com.arsdigita.xml.formatters.DateFormatter.class + .getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) .addAsLibraries(libs) @@ -112,17 +116,23 @@ public class KernelConfigTest { "com/arsdigita/kernel/KernelConfig_parameter.properties") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } - + @Test public void verifyKernelConfig() { final KernelConfig kernelConfig = KernelConfig.getConfig(); - + assertThat(kernelConfig.isDebugEnabled(), is(true)); + assertThat(kernelConfig.isWebdevSupportActive(), + is(false)); assertThat(kernelConfig.isDataPermissionCheckEnabled(), is(false)); assertThat(kernelConfig.getPrimaryUserIdentifier(), is(equalTo("email"))); + assertThat(kernelConfig.screenNameIsPrimaryIdentifier(), + is(false)); + assertThat(kernelConfig.emailIsPrimaryIdentifier(), + is(true)); assertThat(kernelConfig.isSSOenabled(), is(false)); assertThat(kernelConfig.isLoginRemembered(), @@ -135,6 +145,17 @@ public class KernelConfigTest { is(true)); assertThat(kernelConfig.getLanguagesIndependentCode(), is(equalTo("--"))); + assertThat(kernelConfig.hasLanguage("de"), + is(true)); + assertThat(kernelConfig.hasLanguage("en"), + is(true)); + assertThat(kernelConfig.hasLanguage("es"), + is(false)); + assertThat(kernelConfig.getDefaultLanguage(), + is(equalTo("de"))); + final StringTokenizer tokenizer = kernelConfig + .getSupportedLanguagesTokenizer(); + assertThat(tokenizer.countTokens(), is(2)); } - + }