Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add current vs expected

Browse source
This commit is contained in:
Victor Shcherb 2021-04-21 17:23:08 +02:00
parent df3104b032
commit bc3a37b65f
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java
View file

@ -62,7 +62,7 @@ public class SearchResult {
double res = 1; double res = 1;
if (match) { if (match) {
res = ObjectType.getTypeWeight(match ? objectType : null); res = ObjectType.getTypeWeight(match ? objectType : null);
fullCompleteMatch = getSelfPhrase().equals(name); fullCompleteMatch = getSelfPhrase().equalsIgnoreCase(name);
if (fullCompleteMatch) { if (fullCompleteMatch) {
res = res * 10; res = res * 10;
} }

15
OsmAnd-java/src/test/java/net/osmand/search/SearchUICoreTest.java
View file

@ -180,21 +180,28 @@ public class SearchUICoreTest {
SearchResultCollection collection = new SearchResultCollection(phrase); SearchResultCollection collection = new SearchResultCollection(phrase);
collection.addSearchResults(matcher.getRequestResults(), true, true); collection.addSearchResults(matcher.getRequestResults(), true, true);
List<SearchResult> searchResults = collection.getCurrentSearchResults(); List<SearchResult> searchResults = collection.getCurrentSearchResults();
for(int i = 0; i < result.size(); i++) { for (int i = 0; i < result.size(); i++) {
String expected = result.get(i); String expected = result.get(i);
SearchResult res = i >= searchResults.size() ? null : searchResults.get(i); SearchResult res = i >= searchResults.size() ? null : searchResults.get(i);
if (simpleTest && expected.indexOf('[') != -1) { if (simpleTest && expected.indexOf('[') != -1) {
expected = expected.substring(0, expected.indexOf('[')).trim(); expected = expected.substring(0, expected.indexOf('[')).trim();
} }
// String present = result.toString(); // String present = result.toString();
String present = res == null ? ("#MISSING " + (i+1)) : formatResult(simpleTest, res, phrase); String present = res == null ? ("#MISSING " + (i + 1)) : formatResult(simpleTest, res, phrase);
if (!Algorithms.stringsEqual(expected, present)) { if (!Algorithms.stringsEqual(expected, present)) {
System.out.println(String.format("Phrase: %s", phrase)); System.out.println(String.format("Phrase: %s", phrase));
System.out.println(String.format("Mismatch for '%s' != '%s'. Result: ", expected, present)); System.out.println(String.format("Mismatch for '%s' != '%s'. Result: ", expected, present));
} System.out.println("CURRENT RESULTS: ");
for (SearchResult r : searchResults) { for (SearchResult r : searchResults) {
System.out.println(String.format("\t\"%s\",", formatResult(false, r, phrase))); System.out.println(String.format("\t\"%s\",", formatResult(false, r, phrase)));
} }
System.out.println("EXPECTED : ");
for (String r : result) {
System.out.println(String.format("\t\"%s\",", r));
}
}
Assert.assertEquals(expected, present); Assert.assertEquals(expected, present);
} }
} }