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

Fix tests

Browse source
This commit is contained in:
Victor Shcherb 2020-06-19 18:48:39 +02:00
parent 4aed05b5c9
commit 54c0510bbe
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -180,14 +180,14 @@ 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();
int i = 0; for(int i = 0; i < result.size(); i++) {
for (SearchResult res : searchResults) { String expected = result.get(i);
String expected = result.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 = 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));
@ -196,9 +196,6 @@ public class SearchUICoreTest {
} }
} }
Assert.assertEquals(expected, present); Assert.assertEquals(expected, present);
if (i >= result.size()) {
break;
}
} }
} }