Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

merge with issue-441

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-09-12 20:06:15 +02:00
parent a089105b6d 7a565c75aa
commit e41b3123ac
2 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-core/src/main/java/sonia/scm/search/SearchUtil.java
View File

@@ -45,6 +45,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
/**
*
@@ -197,7 +198,7 @@ public final class SearchUtil
query = query.toLowerCase(Locale.ENGLISH);
}
query = query.replace("*", ".*").replace("?", ".");
query = query.replace("\\", "\\\\").replace("*", ".*").replace("?", ".");
query = ".*".concat(query).concat(".*");
if (request.isIgnoreCase())

77
scm-core/src/test/java/sonia/scm/search/SearchUtilTest.java
View File

@@ -54,11 +54,9 @@ public class SearchUtilTest
public void testMultiMatchesAll()
{
assertTrue(SearchUtil.matchesAll(new SearchRequest("test"), "test",
"test hello", "hello test",
"hello test hello"));
"test hello", "hello test", "hello test hello"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test"), "test",
"test hello", "hello test",
"hello test hello", "ka"));
"test hello", "hello test", "hello test hello", "ka"));
}
/**
@@ -69,13 +67,11 @@ public class SearchUtilTest
public void testMultiMatchesOne()
{
assertTrue(SearchUtil.matchesOne(new SearchRequest("test"), "test",
"test hello", "hello test",
"hello test hello"));
"test hello", "hello test", "hello test hello"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test"), "test",
"test hello", "hello test",
"hello test hello", "ka"));
"test hello", "hello test", "hello test hello", "ka"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test"), "hans", "uew",
"klaus", "hello test hello", "ka"));
"klaus", "hello test hello", "ka"));
}
/**
@@ -89,15 +85,15 @@ public class SearchUtilTest
assertTrue(SearchUtil.matchesAll(new SearchRequest("test"), "hello test"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test"), "test hello"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test"),
"hello test hello"));
"hello test hello"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test"),
"hello hello"));
"hello hello"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test"),
"hello te hello"));
"hello te hello"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test"),
"hello TEST hello"));
"hello TEST hello"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test"),
"hello TesT hello"));
"hello TesT hello"));
}
/**
@@ -109,15 +105,15 @@ public class SearchUtilTest
{
assertTrue(SearchUtil.matchesAll(new SearchRequest("test", true), "tEsT"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test", true),
"heLLo teSt"));
"heLLo teSt"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test", true),
"TEST hellO"));
"TEST hellO"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test", true),
"hEllO tEsT hEllO"));
"hEllO tEsT hEllO"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test", true),
"heLLo heLLo"));
"heLLo heLLo"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test", true),
"heLLo te heLLo"));
"heLLo te heLLo"));
}
/**
@@ -131,15 +127,15 @@ public class SearchUtilTest
assertTrue(SearchUtil.matchesOne(new SearchRequest("test"), "hello test"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test"), "test hello"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test"),
"hello test hello"));
"hello test hello"));
assertFalse(SearchUtil.matchesOne(new SearchRequest("test"),
"hello hello"));
"hello hello"));
assertFalse(SearchUtil.matchesOne(new SearchRequest("test"),
"hello te hello"));
"hello te hello"));
assertFalse(SearchUtil.matchesOne(new SearchRequest("test"),
"hello TEST hello"));
"hello TEST hello"));
assertFalse(SearchUtil.matchesOne(new SearchRequest("test"),
"hello TesT hello"));
"hello TesT hello"));
}
/**
@@ -151,15 +147,36 @@ public class SearchUtilTest
{
assertTrue(SearchUtil.matchesOne(new SearchRequest("test", true), "tEsT"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test", true),
"heLLo teSt"));
"heLLo teSt"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test", true),
"TEST hellO"));
"TEST hellO"));
assertTrue(SearchUtil.matchesOne(new SearchRequest("test", true),
"hEllO tEsT hEllO"));
"hEllO tEsT hEllO"));
assertFalse(SearchUtil.matchesOne(new SearchRequest("test", true),
"heLLo heLLo"));
"heLLo heLLo"));
assertFalse(SearchUtil.matchesOne(new SearchRequest("test", true),
"heLLo te heLLo"));
"heLLo te heLLo"));
}
/**
* Test for issue 441
*
*/
@Test
public void testSpecialCharacter()
{
assertTrue(SearchUtil.matchesAll(new SearchRequest("test\\hansolo"),
"test\\hansolo"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("*\\hansolo"),
"test\\hansolo"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test\\*"),
"test\\hansolo"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("test\\hansolo"),
"abc test\\hansolo abc"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test\\hansolo"),
"testhansolo"));
assertFalse(SearchUtil.matchesAll(new SearchRequest("test\\hansolo"),
"test\\hnsolo"));
}
/**
@@ -170,7 +187,7 @@ public class SearchUtilTest
public void testWildcardMatches()
{
assertTrue(SearchUtil.matchesAll(new SearchRequest("*test*"),
"hello test hello"));
"hello test hello"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("?es?"), "test"));
assertTrue(SearchUtil.matchesAll(new SearchRequest("t*t"), "test"));
}