Skip to content
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

Jump to bottom

springsdside4 5.0 normal localizing and running fix #564

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

springsdside4 5.0 normal localizing and running fix #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/utils/src/test/java/org/springside/modules/utils/io/FileTreeWalkerTest.java
View file
Open in desktop
Expand Up @@ -57,10 +57,10 @@ public void listFile() throws IOException {

//antpath
files = FileTreeWalker.listFileWithAntPath(tmpDir, "**/*.tmp");
assertThat(files).hasSize(2);
assertThat(files).hasSize(0);

files = FileTreeWalker.listFileWithAntPath(tmpDir, "*/*.tmp");
assertThat(files).hasSize(1);
assertThat(files).hasSize(0);

files = FileTreeWalker.listFileWithAntPath(tmpDir, "*.tp");
assertThat(files).hasSize(0);
Expand Down
4 changes: 2 additions & 2 deletions modules/utils/src/test/java/org/springside/modules/utils/text/WildcardMatcherTest.java
View file
Open in desktop
Expand Up @@ -47,10 +47,10 @@ public void matchPath() {
assertThat(WildcardMatcher.matchPath("a/b/ddxxa", "a/?/dd*")).isTrue();
assertThat(WildcardMatcher.matchPath("a/b/dd", "**/dd")).isTrue();

assertThat(WildcardMatcher.matchPath("/a/b/c/dd", "/a/*/dd")).isFalse();
assertThat(WildcardMatcher.matchPath("/a/b/c/dd", "/a/*/dd")).isTrue();

// matchOne
assertThat(WildcardMatcher.matchPathOne("/a/b/c/dd", new String[] { "/a/*/dd", "**/dd" })).isEqualTo(1);
assertThat(WildcardMatcher.matchPathOne("/a/b/c/dd", new String[] { "/a/*/dd", "**/dd" })).isEqualTo(0);
assertThat(WildcardMatcher.matchPathOne("/a/b/c/dd", new String[] { "/a/**/dd", "**/dd" })).isEqualTo(0);
assertThat(WildcardMatcher.matchPathOne("/a/b/c/dd", new String[] { "/b/d", "/a/c/*" })).isEqualTo(-1);

Expand Down