Index: DamClients/DamPythonInterface/trunk/src/tests/test_dampythonframework.py =================================================================== diff -u -r3530 -r3534 --- DamClients/DamPythonInterface/trunk/src/tests/test_dampythonframework.py (.../test_dampythonframework.py) (revision 3530) +++ DamClients/DamPythonInterface/trunk/src/tests/test_dampythonframework.py (.../test_dampythonframework.py) (revision 3534) @@ -157,7 +157,7 @@ char_point = row_csv[relevant_columns] if not (char_point.isin([-1]).sum().sum() == 3): characteristic_points_results[characteristic_points].append( - Point( + dpi.Point( X=list(char_point["X_" + characteristic_point_type])[0], Z=list(char_point["Z_" + characteristic_point_type])[0], PointType=self.get_characteristic_point_type( @@ -327,14 +327,15 @@ @pytest.mark.acceptance def test_tutorial_read_csv_files(self): + current_path = Path(__file__).parent.resolve() segments_list = self.read_segment_csv_file( - "trunk\\src\\tests\\test_data\\csvfiles\\segments.csv" + str(Path(current_path, "test_data\\csvfiles\\segments.csv")) ) surface_lines = self.read_surface_lines_csv( - "trunk\\src\\tests\\test_data\\csvfiles\\surfacelines.csv" + str(Path(current_path, "test_data\\csvfiles\\surfacelines.csv")) ) characteristic_points = self.read_characteristic_points( - "trunk\\src\\tests\\test_data\\csvfiles\\characteristicpoints.csv" + str(Path(current_path, "test_data\\csvfiles\\characteristicpoints.csv")) ) # merge the two dictionaries to create surface line for key, value in surface_lines.items(): @@ -350,16 +351,16 @@ # the soil profile should also be created # In this case only 1D segments will be inputted profiles = self.read_profile( - "trunk\\src\\tests\\test_data\\csvfiles\\soilprofiles.csv" + str(Path(current_path, "test_data\\csvfiles\\soilprofiles.csv")) ) # read location csv locations = self.read_locations_csv( - "trunk\\src\\tests\\test_data\\csvfiles\\locations.csv", - "trunk\\src\\tests\\test_data\\csvfiles\\scenarios.csv", + str(Path(current_path, "test_data\\csvfiles\\locations.csv")), + str(Path(current_path, "test_data\\csvfiles\\scenarios.csv")), ) # read soil materials csv soils = self.read_soilmaterials_csv( - "trunk\\src\\tests\\test_data\\csvfiles\\soilmaterials.csv" + str(Path(current_path, "test_data\\csvfiles\\soilmaterials.csv")) ) # create stability parameters stability_parameter = dpi.StabilityParameters(