diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/SearchingAndComparing.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/SearchingAndComparing.java index 60dfc987d02e1a88436b1f65cdcae4d202023488..7d63c648172b80bc059f551dbd2c0d2fd5b6146b 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/SearchingAndComparing.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/SearchingAndComparing.java @@ -15,6 +15,7 @@ public class SearchingAndComparing { static String searchedCity; static boolean flagIfNothingFound = false; static boolean flagIfWrongInput = false; + static City[] citySelector = new City[2000]; static public void MethodSearchingAndComparing(String searchedCity) { @@ -26,7 +27,7 @@ public class SearchingAndComparing { int k = 0; - City[] citySelector = new City[2000]; + // City[] citySelector = new City[2000]; while (flagIfNothingFound == false) { int controlNumber = 0; @@ -102,4 +103,8 @@ public class SearchingAndComparing { return flagIfNothingFound; } + public static City[] GetCitySelector () { + return citySelector; + } + } diff --git a/src/test/java/de/hdm_stuttgart/mi/sd1/weather/SearchingAndComparingTest.java b/src/test/java/de/hdm_stuttgart/mi/sd1/weather/SearchingAndComparingTest.java index c2357330876fa26be4cec583e1c6dbe98581c839..0aaf23b74b6d1ca9002762f33ad594ce93ee6889 100644 --- a/src/test/java/de/hdm_stuttgart/mi/sd1/weather/SearchingAndComparingTest.java +++ b/src/test/java/de/hdm_stuttgart/mi/sd1/weather/SearchingAndComparingTest.java @@ -5,20 +5,42 @@ import org.junit.Assert; import org.junit.Test; public class SearchingAndComparingTest { + + /** + * test for searches with only one result + */ + @Test - public void SearchingAndComparingIDTest() { - - SearchingAndComparing.MethodSearchingAndComparing("Hurzuf"); - Assert.assertEquals(707860, SearchingAndComparing.GetID()); - } - public void SearchingAndComparingIDTest2 () { - SearchingAndComparing.MethodSearchingAndComparing("Republic of India"); - Assert.assertEquals(1269750, SearchingAndComparing.GetID()); - } - // SearchingAndComparing.MethodSearchingAndComparing("Hurzuf"); - // Assert.assertEquals(707860, SearchingAndComparing.GetID()); - - // SearchingAndComparing.MethodSearchingAndComparing("Hurzuf"); - // Assert.assertEquals(707860, SearchingAndComparing.GetID()); + public void SearchingAndComparingIDTest1() { + SearchingAndComparing.MethodSearchingAndComparing("Hurzuf"); + Assert.assertEquals(707860, SearchingAndComparing.GetID()); } + + @Test + public void SearchingAndComparingIDTest2() { + SearchingAndComparing.MethodSearchingAndComparing("Republic of India"); + Assert.assertEquals(1269750, SearchingAndComparing.GetID()); + } + + @Test + public void SearchingAndComparingIDTest3() { + SearchingAndComparing.MethodSearchingAndComparing("Sidi Bouqnadel"); + Assert.assertEquals(2535530, SearchingAndComparing.GetID()); + } + + @Test + public void SearchingAndComparingIDTest4() { + SearchingAndComparing.MethodSearchingAndComparing("Sidi Yahia el Gharb"); + Assert.assertEquals(2532822, SearchingAndComparing.GetID()); + } + + + /** + * test for searches with multiple results + */ + /* @Test + public void SearchingAndComparingIDTest5() { + SearchingAndComparing.MethodSearchingAndComparing("Stuttgart"); + Assert.assertNotNull(SearchingAndComparing.GetCitySelector()[1]); + } */ }