From a7cf328535adb5c67eb86d6d42f47fa10e8fa320 Mon Sep 17 00:00:00 2001
From: fb084 <fb084@hdm-stuttgart.de>
Date: Fri, 15 Jun 2018 10:43:46 +0200
Subject: [PATCH] First Unit Test implemented
---
.../mi/sd1/weather/Forecast.java | 8 +++-----
.../mi/sd1/weather/model/CopyToFile.java | 19 +++++++++----------
.../weather/model/SearchingAndComparing.java | 6 +++++-
.../mi/sd1/weather/model/URLCreator.java | 2 +-
.../mi/sd1/weather/InputTest.java | 13 +++++++++++++
5 files changed, 31 insertions(+), 17 deletions(-)
create mode 100755 src/test/java/de/hdm_stuttgart/mi/sd1/weather/InputTest.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 c043d7c..2635917 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
@@ -21,16 +21,14 @@ public class Forecast {
SearchingAndComparing.MethodSearchingAndComparing();
-//TEST FUER GIT PLS IGNORE
-
- CopyToFile.CopyURLToFile();
-/*
+ CopyToFile.CopyURLToFile();
+
CopyToFile.CopyFileToWeather();
WeatherOutput.PrintWeather();
- */
+
}
}
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 4f4cb2b..89e8ff3 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,38 +5,37 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.sql.Time;
import java.util.Calendar;
public class CopyToFile {
+ public static String filePath;
- public static String CopyURLToFile() {
+ public static void CopyURLToFile() {
- if (new File("weatherCache\\" + SearchingAndComparing.getID() + ".json").isFile() ||
- (Calendar.getInstance().getTimeInMillis() - new File("weatherCache\\" + SearchingAndComparing.getID() + ".json").lastModified() > 600000) &&
- new File("weatherCache\\" + SearchingAndComparing.getID() + ".json").lastModified() > 0) {
+ if (new File("weatherCache\\" + SearchingAndComparing.GetID() + ".json").isFile() ||
+ (Calendar.getInstance().getTimeInMillis() - new File("weatherCache\\" + SearchingAndComparing.GetID() + ".json").lastModified() > 600000) &&
+ new File("weatherCache\\" + SearchingAndComparing.GetID() + ".json").lastModified() > 0) {
System.out.println("Loading file from cache...");
} else {
try {
FileUtils.copyURLToFile(
URLCreator.CreateUrl(),
- new File("weatherCache\\" + SearchingAndComparing.getID() + ".json"));
+ new File("weatherCache\\" + SearchingAndComparing.GetID() + ".json"));
} catch (IOException e) {
System.out.println("ERROR");
}
}
-
- return "weatherCache\\" + SearchingAndComparing.getID() + ".json";
+ filePath = "weatherCache\\" + SearchingAndComparing.GetID() + ".json";
+ //return "weatherCache\\" + SearchingAndComparing.GetID() + ".json";
}
public static Weather CopyFileToWeather() {
Weather weatherObject = null;
try {
- weatherObject = WeatherDataParser.parse(CopyToFile.CopyURLToFile());
+ weatherObject = WeatherDataParser.parse(filePath);
} catch (IOException e) {
System.out.println("ERROR");
}
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 b3f931d..0d25bff 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
@@ -9,7 +9,11 @@ import java.util.Scanner;
public class SearchingAndComparing {
static int idToSearch = 0;
+ static String searchedCity;
+ static public String GetSearchedCity() {
+ return searchedCity;
+ }
static public void MethodSearchingAndComparing() {
System.out.println("Please enter your City: ");
@@ -70,7 +74,7 @@ public class SearchingAndComparing {
}
- public static int getID(){
+ public static int GetID(){
return idToSearch;
}
diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/URLCreator.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/URLCreator.java
index 8d7e2e6..511eef3 100755
--- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/URLCreator.java
+++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/URLCreator.java
@@ -6,7 +6,7 @@ import java.net.URL;
public class URLCreator {
public static URL CreateUrl () throws MalformedURLException {
- URL linkWithId = new URL("https://api.openweathermap.org/data/2.5/forecast?lang=de&APPID=41d009d32d4e302e0cd3d0f55bf5da24&units=metric&id="+ SearchingAndComparing.getID());
+ URL linkWithId = new URL("https://api.openweathermap.org/data/2.5/forecast?lang=de&APPID=41d009d32d4e302e0cd3d0f55bf5da24&units=metric&id="+ SearchingAndComparing.GetID());
return linkWithId;
}
}
diff --git a/src/test/java/de/hdm_stuttgart/mi/sd1/weather/InputTest.java b/src/test/java/de/hdm_stuttgart/mi/sd1/weather/InputTest.java
new file mode 100755
index 0000000..e354c9f
--- /dev/null
+++ b/src/test/java/de/hdm_stuttgart/mi/sd1/weather/InputTest.java
@@ -0,0 +1,13 @@
+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 InputTest {
+ @Test
+ public void testCityInput() {
+
+ Assert.assertNull(SearchingAndComparing.GetSearchedCity());
+ }
+}
--
GitLab