Unit testing. Removal of some unused code paths.

11 files changed, 37 insertions, 56 deletions

diff --git a/src/com/gitblit/FileSettings.java b/src/com/gitblit/FileSettings.java
index e6fb9398..393e76c0 100644
--- a/src/com/gitblit/FileSettings.java
+++ b/src/com/gitblit/FileSettings.java
@@ -34,10 +34,16 @@ public class FileSettings implements IStoredSettings {
 

 	private final Logger logger = LoggerFactory.getLogger(FileSettings.class);

 

+	private final File propertiesFile;

+	

 	private Properties properties = new Properties();

 

 	private long lastread;

 

+	public FileSettings(String file) {

+		this.propertiesFile = new File(file);

+	}

+	

 	@Override

 	public List<String> getAllKeys(String startingWith) {

 		startingWith = startingWith.toLowerCase();

@@ -138,15 +144,14 @@ public class FileSettings implements IStoredSettings {
 		return strings;

 	}

 

-	private synchronized Properties read() {

-		File file = new File(Constants.PROPERTIES_FILE);

-		if (file.exists() && (file.lastModified() > lastread)) {

+	private synchronized Properties read() {		

+		if (propertiesFile.exists() && (propertiesFile.lastModified() > lastread)) {

 			FileInputStream is = null;

 			try {

 				properties = new Properties();

-				is = new FileInputStream(Constants.PROPERTIES_FILE);

+				is = new FileInputStream(propertiesFile);

 				properties.load(is);

-				lastread = file.lastModified();

+				lastread = propertiesFile.lastModified();

 			} catch (FileNotFoundException f) {

 				// IGNORE - won't happen because file.exists() check above

 			} catch (Throwable t) {

@@ -166,6 +171,6 @@ public class FileSettings implements IStoredSettings {
 

 	@Override

 	public String toString() {

-		return new File(Constants.PROPERTIES_FILE).getAbsolutePath();

+		return propertiesFile.getAbsolutePath();

 	}

 }

diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 416c47ad..28b16279 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -425,7 +425,7 @@ public class GitBlitServer {
 	@Parameters(separators = " ")

 	private static class Params {

 		

-		private static final FileSettings FILESETTINGS = new FileSettings();

+		private static final FileSettings FILESETTINGS = new FileSettings(Constants.PROPERTIES_FILE);

 

 		/*

 		 * Server parameters

diff --git a/src/com/gitblit/GitBlitServlet.java b/src/com/gitblit/GitBlitServlet.java
index 46868846..a71012b4 100644
--- a/src/com/gitblit/GitBlitServlet.java
+++ b/src/com/gitblit/GitBlitServlet.java
@@ -56,7 +56,7 @@ public class GitBlitServlet extends GitServlet {
 		}

 		int forwardSlash = url.indexOf('/');

 		if (forwardSlash > -1) {

-			String repository = url.substring(0, forwardSlash);

+			String repository = url.substring(0, forwardSlash).toLowerCase();

 			String function = url.substring(forwardSlash + 1);

 			String query = req.getQueryString() == null ? "" : req.getQueryString();

 			RepositoryModel model = GitBlit.self().getRepositoryModel(repository);

diff --git a/src/com/gitblit/MakeCertificate.java b/src/com/gitblit/MakeCertificate.java
index 67b2fd90..cd01643e 100644
--- a/src/com/gitblit/MakeCertificate.java
+++ b/src/com/gitblit/MakeCertificate.java
@@ -156,7 +156,7 @@ public class MakeCertificate {
 	@Parameters(separators = " ")

 	private static class Params {

 

-		private static final FileSettings FILESETTINGS = new FileSettings();

+		private static final FileSettings FILESETTINGS = new FileSettings(Constants.PROPERTIES_FILE);

 		

 		@Parameter(names = { "--alias" }, description = "Server alias", required = true)

 		public String alias;

diff --git a/src/com/gitblit/models/PathModel.java b/src/com/gitblit/models/PathModel.java
index 17a7971e..08415317 100644
--- a/src/com/gitblit/models/PathModel.java
+++ b/src/com/gitblit/models/PathModel.java
@@ -43,16 +43,6 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 		return FileMode.TREE.equals(mode);

 	}

 

-	public static PathModel getParentPath(String basePath, String commitId) {

-		String parentPath = null;

-		if (basePath.lastIndexOf('/') > -1) {

-			parentPath = basePath.substring(0, basePath.lastIndexOf('/'));

-		}

-		PathModel model = new PathModel("..", parentPath, 0, 40000, commitId);

-		model.isParentPath = true;

-		return model;

-	}

-

 	@Override

 	public int hashCode() {

 		return commitId.hashCode() + path.hashCode();

diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 7241d76b..afe1b5a2 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -37,11 +37,7 @@ public class RepositoryModel implements Serializable {
 	public boolean isFrozen;

 

 	public RepositoryModel() {

-		this.name = "";

-		this.description = "";

-		this.owner = "";

-		this.lastChange = new Date(0);

-		this.accessRestriction = AccessRestrictionType.NONE;

+		this("", "", "", new Date(0));

 	}

 

 	public RepositoryModel(String name, String description, String owner, Date lastchange) {

diff --git a/src/com/gitblit/models/TicketModel.java b/src/com/gitblit/models/TicketModel.java
index b284340a..d86a073d 100644
--- a/src/com/gitblit/models/TicketModel.java
+++ b/src/com/gitblit/models/TicketModel.java
@@ -58,11 +58,6 @@ public class TicketModel implements Serializable, Comparable<TicketModel> {
 		public String author;

 		public Date date;

 

-		public Comment(String text, Date date) {

-			this.text = text;

-			this.date = date;

-		}

-

 		public Comment(String filename, String content) throws ParseException {

 			String[] chunks = filename.split("_", -1);

 			this.date = new Date(Long.parseLong(chunks[1]) * 1000L);

diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 797c14e2..f23fd291 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -34,12 +34,7 @@ public class UserModel implements Serializable {
 	}

 

 	public boolean canAccessRepository(String repositoryName) {

-		return canAdmin || repositories.contains(repositoryName);

-	}

-

-	public void setRepositories(List<String> repositories) {

-		this.repositories.clear();

-		this.repositories.addAll(repositories);

+		return canAdmin || repositories.contains(repositoryName.toLowerCase());

 	}

 

 	public void addRepository(String name) {

diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java
index 16aea77c..ac8e2098 100644
--- a/src/com/gitblit/utils/TimeUtils.java
+++ b/src/com/gitblit/utils/TimeUtils.java
@@ -45,9 +45,9 @@ public class TimeUtils {
 	public static String duration(int days) {

 		if (days <= 60) {

 			return days + (days > 1 ? " days" : " day");

-		} else if (days <= 365) {

+		} else if (days < 365) {

 			int rem = days % 30;

-			return (days / 30) + " months, " + rem + (rem > 1 ? " days" : " day");

+			return (days / 30) + (rem >= 15 ? 1 : 0) + " months";

 		} else {

 			int years = days / 365;

 			int rem = days % 365;

@@ -56,23 +56,17 @@ public class TimeUtils {
 				if (rem == 0) {

 					return yearsString;

 				} else {

-					return yearsString + ", " + rem + (rem > 1 ? " days" : " day");

+					return yearsString + (rem >= 15 ? ", 1 month" : "");

 				}

 			} else {

 				int months = rem / 30;

 				int remDays = rem % 30;

-				String monthsString;

-				if (months == 0) {

-					monthsString = yearsString;

-				} else {

-					monthsString = yearsString + ", " + months

-							+ (months > 1 ? " months" : " month");

-				}

-				if (remDays == 0) {

-					return monthsString;

-				} else {

-					return monthsString + ", " + remDays + (remDays > 1 ? " days" : " day");

+				if (remDays >= 15) {

+					months++;

 				}

+				String monthsString = yearsString + ", " + months

+						+ (months > 1 ? " months" : " month");

+				return monthsString;

 			}

 		}

 	}

@@ -120,7 +114,7 @@ public class TimeUtils {
 		String ago = null;

 		if (isToday(date) || isYesterday(date)) {

 			int mins = minutesAgo(date, true);

-			if (mins > 120) {

+			if (mins >= 120) {

 				if (css) {

 					return "age1";

 				}

@@ -128,7 +122,7 @@ public class TimeUtils {
 				if (hours > 23) {

 					ago = "yesterday";

 				} else {

-					ago = hours + " hour" + (hours > 1 ? "s" : "") + " ago";

+					ago = hours + " hours ago";

 				}

 			} else {

 				if (css) {

@@ -158,8 +152,6 @@ public class TimeUtils {
 						months++;

 					}

 					ago = months + " month" + (months > 1 ? "s" : "") + " ago";

-				} else {

-					ago = days + " day" + (days > 1 ? "s" : "") + " ago";

 				}

 			} else if (days == 365) {

 				ago = "1 year ago";

diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index fb647f78..fe40a3df 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -140,9 +140,10 @@ public class EditUserPage extends BasePage {
 				Iterator<String> selectedRepositories = repositories.getSelectedChoices();

 				List<String> repos = new ArrayList<String>();

 				while (selectedRepositories.hasNext()) {

-					repos.add(selectedRepositories.next());

+					repos.add(selectedRepositories.next().toLowerCase());

 				}

-				userModel.setRepositories(repos);

+				userModel.repositories.clear();

+				userModel.repositories.addAll(repos);				

 				try {

 					GitBlit.self().editUserModel(oldName, userModel, isCreate);

 				} catch (GitBlitException e) {

diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index 4fc7119a..ac84e73a 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -65,7 +65,14 @@ public class TreePage extends RepositoryPage {
 		// breadcrumbs

 		add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));

 		if (path != null && path.trim().length() > 0) {

-			paths.add(0, PathModel.getParentPath(path, objectId));

+			// add .. parent path entry

+			String parentPath = null;

+			if (path.lastIndexOf('/') > -1) {

+				parentPath = path.substring(0, path.lastIndexOf('/'));

+			}

+			PathModel model = new PathModel("..", parentPath, 0, 40000, objectId);

+			model.isParentPath = true;

+			paths.add(0, model);

 		}

 

 		final ByteFormat byteFormat = new ByteFormat();