From 3811378e0ec542e1ec3139406bbf0fc395e9d3df Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 12:02:58 -0500
Subject: [PATCH] Invalidate all cached repository data on "clear cache" (issue-346)

---
 src/test/java/com/gitblit/tests/ModelUtilsTest.java |   92 +++++++++++++---------------------------------
 1 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/src/test/java/com/gitblit/tests/ModelUtilsTest.java b/src/test/java/com/gitblit/tests/ModelUtilsTest.java
index 988f681..e34e0aa 100644
--- a/src/test/java/com/gitblit/tests/ModelUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/ModelUtilsTest.java
@@ -1,51 +1,24 @@
 package com.gitblit.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import org.junit.After;
 import org.junit.Test;
 
-import com.gitblit.Keys;
-import com.gitblit.tests.mock.MemorySettings;
+import com.gitblit.Constants;
 import com.gitblit.utils.ModelUtils;
 
-public class ModelUtilsTest {
-
-	private static final String DEFAULT_USER_REPO_PREFIX = "~";
-
-	private static final Map<String, Object> backingMap = new HashMap<String, Object>();
-	private static final MemorySettings ms = new MemorySettings(backingMap);
-
-
-	private static void setPrefix(String prefix)
-	{
-		backingMap.put(Keys.git.userRepositoryPrefix, prefix);
-	}
-
-
-	private static void setRepoPrefix(String prefix)
-	{
-		backingMap.put(Keys.git.userRepositoryPrefix, prefix);
-		ModelUtils.setUserRepoPrefix(ms);
-	}
-
+public class ModelUtilsTest extends GitblitUnitTest {
 
 	@After
 	public void resetPrefix()
 	{
-		setRepoPrefix(DEFAULT_USER_REPO_PREFIX);
+		ModelUtils.setUserRepoPrefix(null);
 	}
 
 
 	@Test
 	public void testGetUserRepoPrefix()
 	{
-		assertEquals(DEFAULT_USER_REPO_PREFIX, ModelUtils.getUserRepoPrefix());
+		assertEquals(Constants.DEFAULT_USER_REPOSITORY_PREFIX, ModelUtils.getUserRepoPrefix());
 	}
 
 
@@ -53,38 +26,25 @@
 	public void testSetUserRepoPrefix()
 	{
 
-		assertEquals(DEFAULT_USER_REPO_PREFIX, ModelUtils.getUserRepoPrefix());
+		assertEquals(Constants.DEFAULT_USER_REPOSITORY_PREFIX, ModelUtils.getUserRepoPrefix());
 
-		setPrefix("@");
-		ModelUtils.setUserRepoPrefix(ms);
+		ModelUtils.setUserRepoPrefix("@");
 		assertEquals("@", ModelUtils.getUserRepoPrefix());
 
-		backingMap.remove(Keys.git.userRepositoryPrefix);
-		ModelUtils.setUserRepoPrefix(ms);
-		assertEquals(DEFAULT_USER_REPO_PREFIX, ModelUtils.getUserRepoPrefix());
+		ModelUtils.setUserRepoPrefix("");
+		assertEquals(Constants.DEFAULT_USER_REPOSITORY_PREFIX, ModelUtils.getUserRepoPrefix());
 
-		setPrefix("user/");
-		ModelUtils.setUserRepoPrefix(ms);
+		ModelUtils.setUserRepoPrefix("user/");
 		assertEquals("user/", ModelUtils.getUserRepoPrefix());
 
-		setPrefix("");
-		ModelUtils.setUserRepoPrefix(ms);
-		assertEquals(DEFAULT_USER_REPO_PREFIX, ModelUtils.getUserRepoPrefix());
-
-		setPrefix("u_");
-		ModelUtils.setUserRepoPrefix(ms);
+		ModelUtils.setUserRepoPrefix("u_");
 		assertEquals("u_", ModelUtils.getUserRepoPrefix());
 
 		ModelUtils.setUserRepoPrefix(null);
-		assertEquals(DEFAULT_USER_REPO_PREFIX, ModelUtils.getUserRepoPrefix());
+		assertEquals(Constants.DEFAULT_USER_REPOSITORY_PREFIX, ModelUtils.getUserRepoPrefix());
 
-		setPrefix("/somedir/otherdir/");
-		ModelUtils.setUserRepoPrefix(ms);
+		ModelUtils.setUserRepoPrefix("/somedir/otherdir/");
 		assertEquals("somedir/otherdir/", ModelUtils.getUserRepoPrefix());
-
-		setPrefix(DEFAULT_USER_REPO_PREFIX);
-		ModelUtils.setUserRepoPrefix(ms);
-		assertEquals(DEFAULT_USER_REPO_PREFIX, ModelUtils.getUserRepoPrefix());
 	}
 
 
@@ -92,31 +52,31 @@
 	public void testGetPersonalPath()
 	{
 		String username = "rob";
-		assertEquals(DEFAULT_USER_REPO_PREFIX+username.toLowerCase(), ModelUtils.getPersonalPath(username));
+		assertEquals(Constants.DEFAULT_USER_REPOSITORY_PREFIX+username.toLowerCase(), ModelUtils.getPersonalPath(username));
 
 		username = "James";
-		assertEquals(DEFAULT_USER_REPO_PREFIX+username.toLowerCase(), ModelUtils.getPersonalPath(username));
-		
-		setRepoPrefix("usr/");
+		assertEquals(Constants.DEFAULT_USER_REPOSITORY_PREFIX+username.toLowerCase(), ModelUtils.getPersonalPath(username));
+
+		ModelUtils.setUserRepoPrefix("usr/");
 		username = "noMan";
-		assertEquals("usr/"+username.toLowerCase(), ModelUtils.getPersonalPath(username));		
+		assertEquals("usr/"+username.toLowerCase(), ModelUtils.getPersonalPath(username));
 	}
 
 
 	@Test
 	public void testIsPersonalRepository()
 	{
-		String reponame = DEFAULT_USER_REPO_PREFIX + "one";
+		String reponame = Constants.DEFAULT_USER_REPOSITORY_PREFIX + "one";
 		assertTrue(ModelUtils.isPersonalRepository(reponame));
 
 		reponame = "none";
 		assertFalse(ModelUtils.isPersonalRepository(reponame));
 
-		setRepoPrefix("@@");
+		ModelUtils.setUserRepoPrefix("@@");
 		reponame = "@@two";
 		assertTrue(ModelUtils.isPersonalRepository(reponame));
 
-		setRepoPrefix("users/");
+		ModelUtils.setUserRepoPrefix("users/");
 		reponame = "users/three";
 		assertTrue(ModelUtils.isPersonalRepository(reponame));
 
@@ -128,18 +88,18 @@
 	@Test
 	public void testIsUsersPersonalRepository()
 	{
-		String reponame = DEFAULT_USER_REPO_PREFIX + "lynn";
+		String reponame = Constants.DEFAULT_USER_REPOSITORY_PREFIX + "lynn";
 		assertTrue(ModelUtils.isUsersPersonalRepository("lynn", reponame));
 
 		reponame = "prjB";
 		assertFalse(ModelUtils.isUsersPersonalRepository("lynn", reponame));
 
-		setRepoPrefix("@@");
+		ModelUtils.setUserRepoPrefix("@@");
 		reponame = "@@newton";
 		assertTrue(ModelUtils.isUsersPersonalRepository("newton", reponame));
 		assertFalse(ModelUtils.isUsersPersonalRepository("hertz", reponame));
 
-		setRepoPrefix("users/");
+		ModelUtils.setUserRepoPrefix("users/");
 		reponame = "users/fee";
 		assertTrue(ModelUtils.isUsersPersonalRepository("fee", reponame));
 		assertFalse(ModelUtils.isUsersPersonalRepository("gnome", reponame));
@@ -152,14 +112,14 @@
 	@Test
 	public void testGetUserNameFromRepoPath()
 	{
-		String reponame = DEFAULT_USER_REPO_PREFIX + "lynn";
+		String reponame = Constants.DEFAULT_USER_REPOSITORY_PREFIX + "lynn";
 		assertEquals("lynn", ModelUtils.getUserNameFromRepoPath(reponame));
 
-		setRepoPrefix("@@");
+		ModelUtils.setUserRepoPrefix("@@");
 		reponame = "@@newton";
 		assertEquals("newton", ModelUtils.getUserNameFromRepoPath(reponame));
 
-		setRepoPrefix("users/");
+		ModelUtils.setUserRepoPrefix("users/");
 		reponame = "users/fee";
 		assertEquals("fee", ModelUtils.getUserNameFromRepoPath(reponame));
 	}

--
Gitblit v1.9.1