Updated 4 tests with new structure

Author: SimonMand

test/test_bayern.py

@@ -38,14 +38,16 @@ def test_parse(self):
         self.assertEqual(len(schools), 1)
 
         school = schools[0]
-
-        self.assertEqual(school["schulname"], "Bayerische Landesschule")
-        self.assertEqual(school["strasse"], "Kurzstr. 2")
-        self.assertEqual(school["postleitzahl"], "81547")
-        self.assertEqual(school["ort"], "München")
-        self.assertEqual(school["schulart"], "Förderzentren")
-        self.assertEqual(school["lon"], 11.5686076923)
-        self.assertEqual(school["lat"], 48.1047906989)
+        parsed_school = spider.normalize(school)
+
+        self.assertEqual(parsed_school["id"], "BY-SCHUL_SCHULSTANDORTEFOERDERZENTREN_3721b800-751d-49a1-a6d2-19d237e7bcc8")
+        self.assertEqual(parsed_school["name"], "Bayerische Landesschule")
+        self.assertEqual(parsed_school["address"], "Kurzstr. 2")
+        self.assertEqual(parsed_school["city"], "München")
+        self.assertEqual(parsed_school["school_type"], "Förderzentren")
+        self.assertEqual(parsed_school["zip"], "81547")
+        self.assertEqual(parsed_school["latitude"], 48.1047906989)
+        self.assertEqual(parsed_school["longitude"], 11.5686076923)
 
 
 if __name__ == "__main__":

test/test_berlin.py

@@ -72,17 +72,19 @@ def test_parse(self):
         self.assertEqual(len(schools), 1)
 
         school = schools[0]
-        self.assertAlmostEqual(school["lon"], 13.33391576)
-        self.assertAlmostEqual(school["lat"], 52.52672359)
-        self.assertEqual(school["bsn"], "01A04")
-        self.assertEqual(school["schulname"], "Berlin-Kolleg")
-        self.assertEqual(school["plz"], "10551")
-        self.assertEqual(school["strasse"], "Turmstraße")
-        self.assertEqual(school["hausnr"], "75")
-        self.assertEqual(school["telefon"], "+49 30 901838210")
-        self.assertEqual(school["fax"], "+49 30 901838222")
-        self.assertEqual(school["email"], "[email protected]")
-        self.assertEqual(school["internet"], "https://www.berlin-kolleg.de")
+        parsed_school = spider.normalize(school)
+
+        self.assertEqual(parsed_school["id"], "BE-01A04")
+        self.assertEqual(parsed_school["name"], "Berlin-Kolleg")
+        self.assertEqual(parsed_school["address"], "Turmstraße 75")
+        self.assertEqual(parsed_school["city"], "Berlin")
+        self.assertEqual(parsed_school["fax"], "+49 30 901838222")
+        self.assertEqual(parsed_school["phone"], "+49 30 901838210")
+        self.assertEqual(parsed_school["school_type"], "Kolleg")
+        self.assertEqual(parsed_school["website"], "https://www.berlin-kolleg.de")
+        self.assertEqual(parsed_school["zip"], "10551")
+        self.assertEqual(parsed_school["latitude"], 52.52672359)
+        self.assertEqual(parsed_school["longitude"], 13.33391576)
 
 
 if __name__ == "__main__":

test/test_brandenburg.py

@@ -62,17 +62,19 @@ def test_parse(self):
 
         self.assertEqual(len(results), 1)
         school = results[0]
+        parsed_school = spider.normalize(school)
 
-        self.assertAlmostEqual(school["lat"], 51.74023651973522)
-        self.assertAlmostEqual(school["lon"], 14.651148207215728)
-
-        self.assertEqual(school["schul_nr"], "100020")
-        self.assertEqual(school["schulname"], "Grundschule Forst Mitte")
-        self.assertEqual(school["plz"], "03149")
-        self.assertEqual(school["ort"], "Forst (Lausitz)")
-        self.assertEqual(school["dienst_email"], "[email protected]")
-        self.assertEqual(school["schulform"], "Grundschule")
-        self.assertEqual(school["traeger"], "Gemeinde")
+        self.assertEqual(parsed_school["id"], "BB-100020")
+        self.assertEqual(parsed_school["name"], "Grundschule Forst Mitte")
+        self.assertEqual(parsed_school["address"], "Max-Fritz-Hammer-Straße 15")
+        self.assertEqual(parsed_school["city"], "Forst (Lausitz)")
+        self.assertEqual(parsed_school["fax"], "(03562) 691288")
+        self.assertEqual(parsed_school["phone"], "(03562) 7163")
+        self.assertEqual(parsed_school["school_type"], "Grundschule")
+        self.assertEqual(parsed_school["website"], "http://www.grundschule-forst-mitte.de")
+        self.assertEqual(parsed_school["zip"], "03149")
+        self.assertEqual(parsed_school["latitude"], 51.74023651973522)
+        self.assertEqual(parsed_school["longitude"], 14.651148207215728)
 
 
 if __name__ == '__main__':

test/test_hamburg.py

@@ -79,16 +79,19 @@ def test_parse(self):
         self.assertEqual(len(schools), 1)
 
         school = schools[0]
-        self.assertAlmostEqual(school["lon"], 10.047106063058099)
-        self.assertAlmostEqual(school["lat"], 53.601522503676144)
-        self.assertEqual(school["schul_id"], "5043-0")
-        self.assertEqual(school["schulname"], "Stadtteilschule Helmuth Hübener")
-        self.assertEqual(school["adresse_ort"], "22307 Hamburg")
-        self.assertEqual(school["adresse_strasse_hausnr"], "Benzenbergweg 2")
-        self.assertEqual(school["schul_telefonnr"], "+49 40 428 88 15 0")
-        self.assertEqual(school["fax"], "+49 40 428 88 15 22")
-        self.assertEqual(school["schul_email"], "[email protected]")
-        self.assertEqual(school["schul_homepage"], "https://helmuthhuebener.de")
+        parsed_school = spider.normalize(school)
+
+        self.assertEqual(parsed_school["id"], "HH-5043-0")
+        self.assertEqual(parsed_school["name"], "Stadtteilschule Helmuth Hübener")
+        self.assertEqual(parsed_school["address"], "Benzenbergweg 2")
+        self.assertEqual(parsed_school["city"], "Hamburg")
+        self.assertEqual(parsed_school["fax"], "+49 40 428 88 15 22")
+        self.assertEqual(parsed_school["phone"], "+49 40 428 88 15 0")
+        self.assertEqual(parsed_school["school_type"], "Stadtteilschule")
+        self.assertEqual(parsed_school["website"], "https://helmuthhuebener.de")
+        self.assertEqual(parsed_school["zip"], "22307")
+        self.assertEqual(parsed_school["latitude"], 53.601522503676144)
+        self.assertEqual(parsed_school["longitude"], 10.047106063058099)
 
 
 if __name__ == "__main__":