diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java index 670c0dc0df1400d0c5a2442c70321da951e5baee..a4f9e327c143928bbc910c2a3f74321a8dbdee12 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java @@ -18,7 +18,7 @@ public class Forecast { public static void main(String[] args) { - SearchingAndComparing.MethodSearchingAndComparing(); + SearchingAndComparing.MethodSearchingAndComparing(OurScanner.ScanToSearch()); CopyToFile.CopyURLToFile("weatherCache\\" + SearchingAndComparing.GetID() + ".json"); diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java index b417ffdbac2fe56d9b89af9cc435242280115a67..9ee8bfcf80ed71b3d644c3b733c0aa4fd24ecea4 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java @@ -5,7 +5,6 @@ import org.apache.commons.io.FileUtils; import java.io.File; import java.io.IOException; -import java.net.URL; import java.util.Calendar; public class CopyToFile { 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 890339c3c48b0d44256e325f1deef6b44d806805..60dfc987d02e1a88436b1f65cdcae4d202023488 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 @@ -16,7 +16,7 @@ public class SearchingAndComparing { static boolean flagIfNothingFound = false; static boolean flagIfWrongInput = false; - static public void MethodSearchingAndComparing() { + static public void MethodSearchingAndComparing(String searchedCity) { /** @@ -29,7 +29,6 @@ public class SearchingAndComparing { City[] citySelector = new City[2000]; while (flagIfNothingFound == false) { - searchedCity = OurScanner.ScanToSearch(); int controlNumber = 0; for (int i = 0; i <= Cities.cities.length - 1; i++) { City createdCity = Cities.cities[i]; 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 new file mode 100644 index 0000000000000000000000000000000000000000..c2357330876fa26be4cec583e1c6dbe98581c839 --- /dev/null +++ b/src/test/java/de/hdm_stuttgart/mi/sd1/weather/SearchingAndComparingTest.java @@ -0,0 +1,24 @@ +package de.hdm_stuttgart.mi.sd1.weather; + +import de.hdm_stuttgart.mi.sd1.weather.model.SearchingAndComparing; +import org.junit.Assert; +import org.junit.Test; + +public class SearchingAndComparingTest { + @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()); + } +}