MARMOTTA-534: removed hardcoded password from the tests
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/fd300f29 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/fd300f29 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/fd300f29 Branch: refs/heads/develop Commit: fd300f29d621d5d38073e5436e811aaa4f45f32f Parents: 29ff1c4 Author: Sergio Fernández <[email protected]> Authored: Wed May 10 11:21:42 2017 +0200 Committer: Sergio Fernández <[email protected]> Committed: Wed May 10 11:21:42 2017 +0200 ---------------------------------------------------------------------- .../marmotta/platform/user/services/AccountServiceTest.java | 7 +++++-- .../platform/user/webservices/UserWebServiceTest.java | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/fd300f29/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/services/AccountServiceTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/services/AccountServiceTest.java b/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/services/AccountServiceTest.java index 28de609..d184670 100644 --- a/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/services/AccountServiceTest.java +++ b/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/services/AccountServiceTest.java @@ -1,6 +1,7 @@ package org.apache.marmotta.platform.user.services; import com.jayway.restassured.RestAssured; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.exception.io.MarmottaImportException; import org.apache.marmotta.platform.core.test.base.JettyMarmotta; import org.apache.marmotta.platform.user.api.AccountService; @@ -31,7 +32,7 @@ public class AccountServiceTest { @BeforeClass public static void setUp() throws MarmottaImportException, URISyntaxException { - marmotta = new JettyMarmotta("/marmotta", AccountService.class); + marmotta = new JettyMarmotta("/marmotta", ConfigurationService.class, AccountService.class); RestAssured.baseURI = "http://localhost";; RestAssured.port = marmotta.getPort(); RestAssured.basePath = marmotta.getContext(); @@ -55,12 +56,14 @@ public class AccountServiceTest { @Test public void testAdminDefaults() { final AccountService accountService = marmotta.getService(AccountService.class); + final ConfigurationService configurationService = marmotta.getService(ConfigurationService.class); + final String passwd = configurationService.getStringConfiguration("user.admin.password"); final UserAccount admin = accountService.getAccount("admin"); final Set<String> roles = admin.getRoles(); Assert.assertEquals(3, roles.size()); Assert.assertThat(roles, hasItems("user", "editor", "manager")); - Assert.assertTrue(admin.checkPasswd("pass123")); + Assert.assertTrue(admin.checkPasswd(passwd)); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/fd300f29/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/webservices/UserWebServiceTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/webservices/UserWebServiceTest.java b/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/webservices/UserWebServiceTest.java index 9ed28fc..d7f7a81 100644 --- a/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/webservices/UserWebServiceTest.java +++ b/platform/marmotta-user/src/test/java/org/apache/marmotta/platform/user/webservices/UserWebServiceTest.java @@ -1,8 +1,10 @@ package org.apache.marmotta.platform.user.webservices; import com.jayway.restassured.RestAssured; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.exception.io.MarmottaImportException; import org.apache.marmotta.platform.core.test.base.JettyMarmotta; +import org.apache.marmotta.platform.user.api.AccountService; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; @@ -24,7 +26,7 @@ public class UserWebServiceTest { @BeforeClass public static void setUp() throws MarmottaImportException, URISyntaxException { - marmotta = new JettyMarmotta("/marmotta", UserWebService.class); + marmotta = new JettyMarmotta("/marmotta", ConfigurationService.class, UserWebService.class); RestAssured.baseURI = "http://localhost";; RestAssured.port = marmotta.getPort(); RestAssured.basePath = marmotta.getContext(); @@ -38,11 +40,14 @@ public class UserWebServiceTest { @Test @Ignore("internal jboss issue") public void testLogin() throws IOException, InterruptedException { + final ConfigurationService configurationService = marmotta.getService(ConfigurationService.class); + final String passwd = configurationService.getStringConfiguration("user.admin.password"); + expect(). log().ifError(). statusCode(200). given(). - auth(). preemptive().basic("admin", "pass123"). + auth(). preemptive().basic("admin", passwd). when(). get("/user/login"); }
