From a9a2ffcf9a34bd25fe2e05bfdd4cde74725bb17d Mon Sep 17 00:00:00 2001
From: Milos Cubrilo <milos.cubrilo@gmail.com>
Date: Sun, 11 Jan 2015 07:41:29 -0500
Subject: [PATCH] #230 - Improve empty folder navigation.
---
src/test/java/com/gitblit/tests/RepositoryModelTest.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/RepositoryModelTest.java b/src/test/java/com/gitblit/tests/RepositoryModelTest.java
index 1fe3fbd..4520ada 100644
--- a/src/test/java/com/gitblit/tests/RepositoryModelTest.java
+++ b/src/test/java/com/gitblit/tests/RepositoryModelTest.java
@@ -16,8 +16,6 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.junit.After;
@@ -27,68 +25,67 @@
import org.junit.Test;
import com.gitblit.Constants;
-import com.gitblit.GitBlit;
import com.gitblit.models.RepositoryModel;
-public class RepositoryModelTest {
-
+public class RepositoryModelTest extends GitblitUnitTest {
+
private static boolean wasStarted = false;
-
+
@BeforeClass
public static void startGitBlit() throws Exception {
wasStarted = GitBlitSuite.startGitblit() == false;
}
-
+
@AfterClass
public static void stopGitBlit() throws Exception {
if (wasStarted == false)
GitBlitSuite.stopGitblit();
}
-
+
@Before
public void initializeConfiguration() throws Exception{
Repository r = GitBlitSuite.getHelloworldRepository();
StoredConfig config = r.getConfig();
-
+
config.unsetSection(Constants.CONFIG_GITBLIT, Constants.CONFIG_CUSTOM_FIELDS);
config.setString(Constants.CONFIG_GITBLIT, Constants.CONFIG_CUSTOM_FIELDS, "commitMessageRegEx", "\\d");
config.setString(Constants.CONFIG_GITBLIT, Constants.CONFIG_CUSTOM_FIELDS, "anotherProperty", "Hello");
-
+
config.save();
}
-
+
@After
public void teardownConfiguration() throws Exception {
Repository r = GitBlitSuite.getHelloworldRepository();
StoredConfig config = r.getConfig();
-
+
config.unsetSection(Constants.CONFIG_GITBLIT, Constants.CONFIG_CUSTOM_FIELDS);
config.save();
}
@Test
public void testGetCustomProperty() throws Exception {
- RepositoryModel model = GitBlit.self().getRepositoryModel(
+ RepositoryModel model = repositories().getRepositoryModel(
GitBlitSuite.getHelloworldRepository().getDirectory().getName());
-
+
assertEquals("\\d", model.customFields.get("commitMessageRegEx"));
assertEquals("Hello", model.customFields.get("anotherProperty"));
}
-
+
@Test
public void testSetCustomProperty() throws Exception {
- RepositoryModel model = GitBlit.self().getRepositoryModel(
+ RepositoryModel model = repositories().getRepositoryModel(
GitBlitSuite.getHelloworldRepository().getDirectory().getName());
-
+
assertEquals("\\d", model.customFields.get("commitMessageRegEx"));
assertEquals("Hello", model.customFields.get("anotherProperty"));
-
+
assertEquals("Hello", model.customFields.put("anotherProperty", "GoodBye"));
- GitBlit.self().updateRepositoryModel(model.name, model, false);
-
- model = GitBlit.self().getRepositoryModel(
+ repositories().updateRepositoryModel(model.name, model, false);
+
+ model = repositories().getRepositoryModel(
GitBlitSuite.getHelloworldRepository().getDirectory().getName());
-
+
assertEquals("\\d", model.customFields.get("commitMessageRegEx"));
assertEquals("GoodBye", model.customFields.get("anotherProperty"));
}
--
Gitblit v1.9.1