Fix GitBlitTest.testGitblitSettings()

diff --git a/src/test/java/com/gitblit/tests/GitBlitTest.java b/src/test/java/com/gitblit/tests/GitBlitTest.java
index 1f81b8756d99b9e2ada9cd57aa5f7564a84789f0..9eaae7f88497b4cfd57053768839f5c44ac0b012 100644 (file)
--- a/src/test/java/com/gitblit/tests/GitBlitTest.java
+++ b/src/test/java/com/gitblit/tests/GitBlitTest.java
@@ -15,6 +15,7 @@
  */\r
 package com.gitblit.tests;\r
 \r
+import java.io.File;\r
 import java.util.List;\r
 \r
 import org.eclipse.jgit.lib.Repository;\r
@@ -24,6 +25,7 @@ import com.gitblit.Constants.AccessRestrictionType;
 import com.gitblit.FileSettings;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.FileUtils;\r
 \r
 public class GitBlitTest extends GitblitUnitTest {\r
 \r
@@ -156,7 +158,9 @@ public class GitBlitTest extends GitblitUnitTest {
                assertEquals(5, settings().getInteger("realm.userService", 5));\r
 \r
                assertTrue(settings().getBoolean("git.enableGitServlet", false));\r
-               assertEquals("src/test/config/test-users.conf", settings().getString("realm.userService", null));\r
+               File userDir = new File(System.getProperty("user.dir"));\r
+               File userService = new File(settings().getString("realm.userService", null));\r
+               assertEquals("src/test/config/test-users.conf", FileUtils.getRelativePath(userDir, userService));\r
                assertEquals(5, settings().getInteger("realm.minPasswordLength", 0));\r
                List<String> mdExtensions = settings().getStrings("web.markdownExtensions");\r
                assertTrue(mdExtensions.size() > 0);\r