From 02381e8a99849ac0c3480fee3fca071e2616025a Mon Sep 17 00:00:00 2001
From: Haug Michael <mh306@hdm-stuttgart.de>
Date: Fri, 22 Jun 2018 14:24:26 +0200
Subject: [PATCH] added test for Searching and Comparing
---
.../weather/model/SearchingAndComparing.java | 7 ++-
.../weather/SearchingAndComparingTest.java | 50 +++++++++++++------
2 files changed, 42 insertions(+), 15 deletions(-)
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 60dfc98..7d63c64 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 c235733..0aaf23b 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]);
+ } */
}
--
GitLab