From fbc98e2dc87f04ee22efa28fb983b162067ee732 Mon Sep 17 00:00:00 2001
From: Haug Michael <mh306@hdm-stuttgart.de>
Date: Fri, 22 Jun 2018 13:56:53 +0200
Subject: [PATCH] FAILSAVE
---
.../mi/sd1/weather/Forecast.java | 2 +-
.../mi/sd1/weather/model/CopyToFile.java | 1 -
.../weather/model/SearchingAndComparing.java | 3 +--
.../weather/SearchingAndComparingTest.java | 24 +++++++++++++++++++
4 files changed, 26 insertions(+), 4 deletions(-)
create mode 100644 src/test/java/de/hdm_stuttgart/mi/sd1/weather/SearchingAndComparingTest.java
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 670c0dc..a4f9e32 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 b417ffd..9ee8bfc 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 890339c..60dfc98 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 0000000..c235733
--- /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());
+ }
+}
--
GitLab