Use dynamic paths

Also fix failures for create network output. Input is usually the network name in the config while output is the returned .txt file.

Author: ryanmccann1024

data_scripts/structure_data.py

@@ -57,7 +57,7 @@ def create_network(net_name: str, base_fp: str = None, const_weight: bool = Fals
     """
     core_nodes_list = []
     if base_fp is None:
-        base_fp = 'data\\raw'
+        base_fp = os.path.join('data', 'raw')
     else:
         base_fp = os.path.join(base_fp, 'raw')
 

tests/test_structure_data.py

@@ -1,3 +1,4 @@
+import os
 import unittest
 from unittest.mock import mock_open, patch
 from data_scripts.structure_data import assign_link_lengths, create_network
@@ -14,7 +15,7 @@ def test_assign_link_lengths(self):
         """
         mock_file_content = "1\t2\t10\n2\t3\t20\n"
         node_pairs_dict = {'1': 'A', '2': 'B', '3': 'C'}
-        network_fp = "dummy/path/network.txt"
+        network_fp = os.path.join('dummy', 'path', 'network.txt')
 
         with patch("builtins.open", mock_open(read_data=mock_file_content)):
             response_dict = assign_link_lengths(network_fp=network_fp, node_pairs_dict=node_pairs_dict,
@@ -35,21 +36,23 @@ def test_create_network(self, mock_assign_link_lengths):
         """
         mock_assign_link_lengths.return_value = {'link_lengths': 'mocked'}
 
+        base_network_fp = os.path.join('data', 'raw')
+
         net_name = 'USNet'
         response = create_network(net_name=net_name, const_weight=False)
-        mock_assign_link_lengths.assert_called_with(constant_weight=False, network_fp='data\\raw\\us_network.txt',
+        mock_assign_link_lengths.assert_called_with(constant_weight=False, network_fp=os.path.join(base_network_fp, 'us_network.txt'),
                                                     node_pairs_dict={})
         self.assertEqual(({'link_lengths': 'mocked'}, []), response)
 
         net_name = 'NSFNet'
         response = create_network(net_name=net_name, const_weight=False)
-        mock_assign_link_lengths.assert_called_with(constant_weight=False, network_fp='data\\raw\\nsf_network.txt',
+        mock_assign_link_lengths.assert_called_with(constant_weight=False, network_fp=os.path.join(base_network_fp, 'nsf_network.txt'),
                                                     node_pairs_dict={})
         self.assertEqual(({'link_lengths': 'mocked'}, []), response)
 
         net_name = 'Pan-European'
         response = create_network(net_name=net_name, const_weight=False)
-        mock_assign_link_lengths.assert_called_with(constant_weight=False, network_fp='data\\raw\\europe_network.txt',
+        mock_assign_link_lengths.assert_called_with(constant_weight=False, network_fp=os.path.join(base_network_fp, 'europe_network.txt'),
                                                     node_pairs_dict={})
         self.assertEqual(({'link_lengths': 'mocked'}, []), response)
 
@@ -60,14 +63,15 @@ def test_create_network_with_base_fp(self):
         """
         Test create network with base_fp specified.
         """
-        base_fp = 'custom\\path'
+        base_fp = os.path.join('custom', 'path')
         with patch("data_scripts.structure_data.assign_link_lengths") as mock_assign_link_lengths:
             mock_assign_link_lengths.return_value = {'link_lengths': 'mocked'}
 
             net_name = 'USNet'
             response = create_network(net_name=net_name, base_fp=base_fp, const_weight=False)
+            network_fp = os.path.join(base_fp, 'raw', 'us_network.txt')
             mock_assign_link_lengths.assert_called_with(constant_weight=False,
-                                                        network_fp='custom\\path\\raw\\us_network.txt', node_pairs_dict={})
+                                                        network_fp=network_fp, node_pairs_dict={})
             self.assertEqual(({'link_lengths': 'mocked'}, []), response)