summaryrefslogtreecommitdiffstats
path: root/src/test/java/com/gitblit/tests/GitBlitTest.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-07-02 14:54:12 -0400
committerJames Moger <james.moger@gitblit.com>2013-07-02 14:54:25 -0400
commit06fa4ba6d194446de377629f058c3b7528478520 (patch)
tree4b1d99cb07d82c8f2620cbc2fe0eb270e219a19f /src/test/java/com/gitblit/tests/GitBlitTest.java
parent26c887ea966b164a5f9cecc2e6a8b4f1ff2bd9b0 (diff)
downloadgitblit-06fa4ba6d194446de377629f058c3b7528478520.tar.gz
gitblit-06fa4ba6d194446de377629f058c3b7528478520.zip
Updated test suite to use relocated test config files
Diffstat (limited to 'src/test/java/com/gitblit/tests/GitBlitTest.java')
-rw-r--r--src/test/java/com/gitblit/tests/GitBlitTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/java/com/gitblit/tests/GitBlitTest.java b/src/test/java/com/gitblit/tests/GitBlitTest.java
index 786614f8..ab23f4eb 100644
--- a/src/test/java/com/gitblit/tests/GitBlitTest.java
+++ b/src/test/java/com/gitblit/tests/GitBlitTest.java
@@ -131,7 +131,7 @@ public class GitBlitTest {
@Test
public void testFileSettings() throws Exception {
- FileSettings settings = new FileSettings("distrib/gitblit.properties");
+ FileSettings settings = new FileSettings("src/main/distrib/data/gitblit.properties");
assertEquals(true, settings.getBoolean("missing", true));
assertEquals("default", settings.getString("missing", "default"));
assertEquals(10, settings.getInteger("missing", 10));
@@ -160,7 +160,7 @@ public class GitBlitTest {
assertEquals(5, GitBlit.getInteger("realm.userService", 5));
assertTrue(GitBlit.getBoolean("git.enableGitServlet", false));
- assertEquals("test-users.conf", GitBlit.getString("realm.userService", null));
+ assertEquals(GitBlitSuite.USERSCONF.getAbsolutePath(), GitBlit.getString("realm.userService", null));
assertEquals(5, GitBlit.getInteger("realm.minPasswordLength", 0));
List<String> mdExtensions = GitBlit.getStrings("web.markdownExtensions");
assertTrue(mdExtensions.size() > 0);