From 3610dc445e01ee07faae64acaabcdc00aac5e1b5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 17:00:41 -0400
Subject: [PATCH] Delay pf4j instantiation and setup to start()
---
src/test/java/com/gitblit/tests/Issue0271Test.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/Issue0271Test.java b/src/test/java/com/gitblit/tests/Issue0271Test.java
index 437c5b9..15c6ff2 100644
--- a/src/test/java/com/gitblit/tests/Issue0271Test.java
+++ b/src/test/java/com/gitblit/tests/Issue0271Test.java
@@ -17,7 +17,6 @@
import java.io.File;
-import org.junit.Assert;
import org.junit.Test;
import com.gitblit.ConfigUserService;
@@ -28,16 +27,16 @@
/**
* https://code.google.com/p/gitblit/issues/detail?id=271
- *
+ *
* Reported Problem:
* Inherited team permissions are incorrect.
- *
+ *
* @see src/test/resources/issue0270.conf
- *
+ *
* @author James Moger
*
*/
-public class Issue0271Test extends Assert {
+public class Issue0271Test extends GitblitUnitTest {
RepositoryModel repo(String name, AccessRestrictionType restriction) {
RepositoryModel repo = new RepositoryModel();
@@ -45,29 +44,29 @@
repo.accessRestriction = restriction;
return repo;
}
-
+
/**
* Test the provided users.conf file for expected access permissions.
- *
+ *
* @throws Exception
*/
@Test
public void testFile() throws Exception {
File realmFile = new File("src/test/resources/issue0271.conf");
ConfigUserService service = new ConfigUserService(realmFile);
-
+
RepositoryModel test = repo("test.git", AccessRestrictionType.VIEW);
RepositoryModel teama_test = repo("teama/test.git", AccessRestrictionType.VIEW);
-
+
UserModel a = service.getUserModel("a");
UserModel b = service.getUserModel("b");
UserModel c = service.getUserModel("c");
-
+
// assert V for test.git
assertEquals(AccessPermission.VIEW, a.getRepositoryPermission(test).permission);
assertEquals(AccessPermission.VIEW, b.getRepositoryPermission(test).permission);
assertEquals(AccessPermission.VIEW, c.getRepositoryPermission(test).permission);
-
+
// assert expected permissions for teama/test.git
assertEquals(AccessPermission.VIEW, a.getRepositoryPermission(teama_test).permission);
assertEquals(AccessPermission.PUSH, b.getRepositoryPermission(teama_test).permission);
--
Gitblit v1.9.1