Adjust tests to PlanPro importer 2.0

Author: arneboockmeyer

test/complex-example_test.py

@@ -1,12 +1,12 @@
-from planpro_importer.reader import PlanProReader
+from planpro_importer import PlanProVersion, import_planpro
 
 from railwayroutegenerator.routegenerator import RouteGenerator
 
 from .helper import compare_route_lists
 
 
 def test_complex_example():
-    topology = PlanProReader("complex-example.ppxml").read_topology_from_plan_pro_file()
+    topology = import_planpro("complex-example.ppxml", PlanProVersion.PlanPro19)
 
     route_generator = RouteGenerator(topology)
     route_generator.generate_routes()

test/line-multiple-signals_test.py

@@ -1,14 +1,14 @@
-from planpro_importer.reader import PlanProReader
+from planpro_importer import PlanProVersion, import_planpro
 
 from railwayroutegenerator.routegenerator import RouteGenerator
 
 from .helper import compare_route_lists
 
 
 def test_line_multiple_signals():
-    topology = PlanProReader(
-        "line-test-multiple-signals.ppxml"
-    ).read_topology_from_plan_pro_file()
+    topology = import_planpro(
+        "line-test-multiple-signals.ppxml", PlanProVersion.PlanPro19
+    )
 
     route_generator = RouteGenerator(topology)
     route_generator.generate_routes()

test/line_test.py

@@ -1,12 +1,12 @@
-from planpro_importer.reader import PlanProReader
+from planpro_importer import PlanProVersion, import_planpro
 
 from railwayroutegenerator.routegenerator import RouteGenerator
 
 from .helper import compare_route_lists
 
 
 def test_line():
-    topology = PlanProReader("line-test.ppxml").read_topology_from_plan_pro_file()
+    topology = import_planpro("line-test.ppxml", PlanProVersion.PlanPro19)
 
     route_generator = RouteGenerator(topology)
     route_generator.generate_routes()

test/point-with-branch_test.py

@@ -1,14 +1,12 @@
-from planpro_importer.reader import PlanProReader
+from planpro_importer import PlanProVersion, import_planpro
 
 from railwayroutegenerator.routegenerator import RouteGenerator
 
 from .helper import compare_route_lists
 
 
 def test_point_with_branch():
-    topology = PlanProReader(
-        "point-with-branch.ppxml"
-    ).read_topology_from_plan_pro_file()
+    topology = import_planpro("point-with-branch.ppxml", PlanProVersion.PlanPro19)
 
     route_generator = RouteGenerator(topology)
     route_generator.generate_routes()

test/point-with-other-signal_test.py

@@ -1,14 +1,14 @@
-from planpro_importer.reader import PlanProReader
+from planpro_importer import PlanProVersion, import_planpro
 
 from railwayroutegenerator.routegenerator import RouteGenerator
 
 from .helper import compare_route_lists
 
 
 def test_point_with_other_signal():
-    topology = PlanProReader(
-        "point-with-other-signal-test.ppxml"
-    ).read_topology_from_plan_pro_file()
+    topology = import_planpro(
+        "point-with-other-signal-test.ppxml", PlanProVersion.PlanPro19
+    )
 
     route_generator = RouteGenerator(topology)
     route_generator.generate_routes()

test/simple-point_test.py

@@ -1,14 +1,12 @@
-from planpro_importer.reader import PlanProReader
+from planpro_importer import PlanProVersion, import_planpro
 
 from railwayroutegenerator.routegenerator import RouteGenerator
 
 from .helper import compare_route_lists
 
 
 def test_simple_point():
-    topology = PlanProReader(
-        "simple-point-test.ppxml"
-    ).read_topology_from_plan_pro_file()
+    topology = import_planpro("simple-point-test.ppxml", PlanProVersion.PlanPro19)
 
     route_generator = RouteGenerator(topology)
     route_generator.generate_routes()