From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
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