diff --git a/about-app/src/main/resources/mgnl-i18n/about-app-messages_en.properties b/about-app/src/main/resources/mgnl-i18n/about-app-messages_en.properties index ac8ec50..3688e61 100644 --- a/about-app/src/main/resources/mgnl-i18n/about-app-messages_en.properties +++ b/about-app/src/main/resources/mgnl-i18n/about-app-messages_en.properties @@ -4,7 +4,7 @@ about.app.icon=icon-info # SubApps about.app.main.description=The about app shows an overview of the installed Magnolia version and the environment it runs in. -about.app.main.installation.title=Installation Information +about.app.main.installation.title=Installation information about.app.main.magnolia.title=Magnolia about.app.main.environment.title=Environment about.app.main.mgnledition=Edition diff --git a/about-app/src/test/java/info/magnolia/about/app/AboutPresenterTest.java b/about-app/src/test/java/info/magnolia/about/app/AboutPresenterTest.java index 4ce49ed..103b90c 100644 --- a/about-app/src/test/java/info/magnolia/about/app/AboutPresenterTest.java +++ b/about-app/src/test/java/info/magnolia/about/app/AboutPresenterTest.java @@ -51,20 +51,31 @@ public class AboutPresenterTest { @Test public void testRepoName() { + // GIVEN MagnoliaConfigurationProperties properties = mock(MagnoliaConfigurationProperties.class); when(properties.getProperty("magnolia.repositories.config")).thenReturn("repositories.xml"); when(properties.getProperty("magnolia.app.rootdir")).thenReturn(new File("target/test-classes").getAbsolutePath()); AboutPresenter presenter = new AboutPresenter(mock(AboutView.class), mock(ServerConfiguration.class), properties, mock(SimpleTranslator.class)); - assertEquals("magnolia", presenter.getRepoName()); + + // WHEN + String repoName = presenter.getRepoName(); + + // THEN + assertEquals("magnolia", repoName); } @Test public void testConnectionString() { + // GIVEN MagnoliaConfigurationProperties properties = mock(MagnoliaConfigurationProperties.class); when(properties.getProperty("magnolia.repositories.jackrabbit.config")).thenReturn("jackrabbit-bundle-derby-search.xml"); when(properties.getProperty("magnolia.app.rootdir")).thenReturn(new File("target/test-classes").getAbsolutePath()); AboutPresenter presenter = new AboutPresenter(mock(AboutView.class), mock(ServerConfiguration.class), properties, mock(SimpleTranslator.class)); + + // WHEN String[] connection = presenter.getConnectionString(); + + // THEN assertTrue(connection.length > 0); assertEquals("jdbc:derby:${rep.home}/version/db;create=true", connection[0]); }