From db653ae29c54163c7ca2dd6d2b5063d4623c3a8c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 29 May 2011 14:04:38 -0400
Subject: [PATCH] Unit testing.
---
src/com/gitblit/utils/StringUtils.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index 8b7960b..fd6ca98 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -1,10 +1,24 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.utils;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.List;
-
public class StringUtils {
@@ -32,17 +46,22 @@
retStr.append(" ");
} else if (changeSpace && inStr.charAt(i) == '\t') {
retStr.append(" ");
- } else
+ } else {
retStr.append(inStr.charAt(i));
+ }
i++;
}
return retStr.toString();
}
public static String flattenStrings(List<String> values) {
+ return flattenStrings(values, " ");
+ }
+
+ public static String flattenStrings(List<String> values, String separator) {
StringBuilder sb = new StringBuilder();
for (String value : values) {
- sb.append(value).append(" ");
+ sb.append(value).append(separator);
}
return sb.toString().trim();
}
@@ -98,8 +117,9 @@
byte[] sha1hash = md.digest();
StringBuilder sb = new StringBuilder(sha1hash.length * 2);
for (int i = 0; i < sha1hash.length; i++) {
- if (((int) sha1hash[i] & 0xff) < 0x10)
- sb.append("0");
+ if (((int) sha1hash[i] & 0xff) < 0x10) {
+ sb.append('0');
+ }
sb.append(Long.toString((int) sha1hash[i] & 0xff, 16));
}
return sb.toString();
@@ -107,10 +127,10 @@
throw new RuntimeException(t);
}
}
-
+
public static String getRootPath(String path) {
if (path.indexOf('/') > -1) {
- return path.substring(0, path.indexOf('/'));
+ return path.substring(0, path.lastIndexOf('/'));
}
return "";
}
--
Gitblit v1.9.1