From 3286926d2ec11445f76cd170e4c2fcff597a0754 Mon Sep 17 00:00:00 2001
From: Fabrice Bacchella <fbacchella@spamcop.net>
Date: Tue, 26 May 2015 04:48:40 -0400
Subject: [PATCH] Two slight improvement for custom UserService: - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString
---
src/test/java/com/gitblit/tests/RepositoryModelTest.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/RepositoryModelTest.java b/src/test/java/com/gitblit/tests/RepositoryModelTest.java
index 56c1ebb..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,10 +25,9 @@
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;
@@ -68,7 +65,7 @@
@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"));
@@ -77,16 +74,16 @@
@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);
+ repositories().updateRepositoryModel(model.name, model, false);
- model = GitBlit.self().getRepositoryModel(
+ model = repositories().getRepositoryModel(
GitBlitSuite.getHelloworldRepository().getDirectory().getName());
assertEquals("\\d", model.customFields.get("commitMessageRegEx"));
--
Gitblit v1.9.1