Skip to content

1.修改ObjectUtil类；2.修复WildcardMatcher.matchPath方法的bug；3.单元测试兼容windows #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

1.修改ObjectUtil类；2.修复WildcardMatcher.matchPath方法的bug；3.单元测试兼容windows #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b4b709
1.ObjectUtil.toPrettyString添加对char数组的处理；2.ObjectUtil.toPrettyString对O…
hxy1991 Mar 27, 2017
276d254
windows下的File.separatorChar返回的是"\\"，不包含"/"，在windows进行WildcardMatcher.…
hxy1991 Apr 5, 2017
9bdbc4b
单元测试兼容windows
hxy1991 Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions modules/utils/src/main/java/org/springside/modules/utils/base/ObjectUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,15 @@ public static String toPrettyString(Object value) {
sb.append(Arrays.toString((short[]) value));
} else if (componentType == byte.class) {
sb.append(Arrays.toString((byte[]) value));
} else if (componentType == char.class) {
sb.append(Arrays.toString((char[]) value));
} else {
throw new IllegalArgumentException("unsupport array type");
}

return sb.toString();
} else {
StringBuilder sb = new StringBuilder();
sb.append('[');

Object[] array = (Object[]) value;
for (int i = 0; i < array.length; i++) {
if (i > 0) {
sb.append(", ");
}
sb.append(toPrettyString(array[i]));
}
sb.append(']');
return sb.toString();
}
return Arrays.toString((Object[]) value);
} else if (value instanceof Iterable) {
Iterable iterable = (Iterable) value;
StringBuilder sb = new StringBuilder();
Expand Down
7 changes: 5 additions & 2 deletions modules/utils/src/main/java/org/springside/modules/utils/text/WildcardMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@

import org.apache.commons.lang3.StringUtils;
import org.springside.modules.utils.base.Platforms;
import org.springside.modules.utils.io.FilePathUtil;

import java.io.File;

/**
*
Expand Down Expand Up @@ -166,8 +169,8 @@ public static int matchPathOne(String path, String[] patterns) {
* separators (both \ and /). '**' represents deep tree wildcard, as in Ant.
*/
public static boolean matchPath(String path, String pattern) {
String[] pathElements = StringUtils.split(path, Platforms.FILE_PATH_SEPARATOR_CHAR);
String[] patternElements = StringUtils.split(pattern, Platforms.FILE_PATH_SEPARATOR_CHAR);
String[] pathElements = StringUtils.split(path, PATH_SEPARATORS);
String[] patternElements = StringUtils.split(pattern, PATH_SEPARATORS);
return matchTokens(pathElements, patternElements);
}

Expand Down
3 changes: 2 additions & 1 deletion modules/utils/src/test/java/org/springside/modules/utils/base/ObjectUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ public void toPrettyString() {
assertThat(ObjectUtil.toPrettyString(new boolean[] { true, false })).isEqualTo("[true, false]");
assertThat(ObjectUtil.toPrettyString(new short[] { 1, 2 })).isEqualTo("[1, 2]");
assertThat(ObjectUtil.toPrettyString(new byte[] { 1, 2 })).isEqualTo("[1, 2]");

assertThat(ObjectUtil.toPrettyString(new char[] { '1', '2' })).isEqualTo("[1, 2]");

assertThat(ObjectUtil.toPrettyString(new Integer[] { 1, 2 })).isEqualTo("[1, 2]");
assertThat(ObjectUtil.toPrettyString(ListUtil.newArrayList("1", "2"))).isEqualTo("{1,2}");
}
Expand Down
9 changes: 7 additions & 2 deletions modules/utils/src/test/java/org/springside/modules/utils/base/SystemPropertiesUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,13 @@ public void stringSystemProperty() {
assertThat(result).isEqualTo("123");

// env值
String result2 = SystemPropertiesUtil.getString(name, "HOME", "123");
assertThat(result2).isNotEqualTo("123");
if (Platforms.IS_WINDOWS) {
String result2 = SystemPropertiesUtil.getString(name, "JAVA_HOME", "123");
assertThat(result2).isNotEqualTo("123");
} else {
String result2 = SystemPropertiesUtil.getString(name, "HOME", "123");
assertThat(result2).isNotEqualTo("123");
}

// system properties值
System.setProperty(name, "456");
Expand Down
7 changes: 6 additions & 1 deletion modules/utils/src/test/java/org/springside/modules/utils/io/IOUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@
import java.io.IOException;

import org.junit.Test;
import org.springside.modules.utils.base.Platforms;
import org.springside.modules.utils.io.type.StringBuilderWriter;
import org.springside.modules.utils.text.Charsets;

public class IOUtilTest {

@Test
public void read() throws IOException {
assertThat(IOUtil.toString(ResourceUtil.asStream("test.txt"))).isEqualTo("ABCDEFG\nABC");
if (Platforms.IS_WINDOWS) {
assertThat(IOUtil.toString(ResourceUtil.asStream("test.txt"))).isEqualTo("ABCDEFG\r\nABC");
} else {
assertThat(IOUtil.toString(ResourceUtil.asStream("test.txt"))).isEqualTo("ABCDEFG\nABC");
}
assertThat(IOUtil.toLines(ResourceUtil.asStream("test.txt"))).hasSize(2).containsExactly("ABCDEFG", "ABC");
}

Expand Down
11 changes: 8 additions & 3 deletions modules/utils/src/test/java/org/springside/modules/utils/io/URLResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,21 @@
import java.io.InputStream;

import org.junit.Test;
import org.springside.modules.utils.base.Platforms;

public class URLResourceTest {

@Test
public void resource() throws IOException {
File file = URLResourceUtil.asFile("classpath://application.properties");
assertThat(FileUtil.toString(file)).isEqualTo("springside.min=1\nspringside.max=10");

InputStream is = URLResourceUtil.asStream("classpath://application.properties");
assertThat(IOUtil.toString(is)).isEqualTo("springside.min=1\nspringside.max=10");
if (Platforms.IS_WINDOWS) {
assertThat(FileUtil.toString(file)).isEqualTo("springside.min=1\r\nspringside.max=10");
assertThat(IOUtil.toString(is)).isEqualTo("springside.min=1\r\nspringside.max=10");
} else {
assertThat(FileUtil.toString(file)).isEqualTo("springside.min=1\nspringside.max=10");
assertThat(IOUtil.toString(is)).isEqualTo("springside.min=1\nspringside.max=10");
}
IOUtil.closeQuietly(is);

try {
Expand Down
7 changes: 6 additions & 1 deletion modules/utils/src/test/java/org/springside/modules/utils/text/HashUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.io.InputStream;

import org.junit.Test;
import org.springside.modules.utils.base.Platforms;
import org.springside.modules.utils.io.ResourceUtil;

public class HashUtilTest {
Expand Down Expand Up @@ -47,7 +48,11 @@ public void hashSha1() {
public void hashFile() throws IOException {
InputStream in = ResourceUtil.asStream("test.txt");
String result = EncodeUtil.encodeBase64(HashUtil.sha1File(in));
assertThat(result).isEqualTo("DmSnwK/Fl0Jplrwtm9tfi7cb/js=");
if (Platforms.IS_WINDOWS) {
assertThat(result).isEqualTo("zV5GyYs9TxreIF1wRODMLsA/4Qg=");
} else {
assertThat(result).isEqualTo("DmSnwK/Fl0Jplrwtm9tfi7cb/js=");
}
result = EncodeUtil.encodeBase64(HashUtil.md5File(in));
assertThat(result).isEqualTo("1B2M2Y8AsgTpgAmY7PhCfg==");
}
Expand Down