refactor: Update tests with network API changes

Author: annehaley

uvdat/core/tests/test_dataset.py

@@ -1,9 +1,6 @@
-import itertools
-
 import pytest
 
-from uvdat.core.models.networks import Network, NetworkNode
-from uvdat.core.models.project import Dataset, Project
+from uvdat.core.models.project import Dataset
 
 
 @pytest.mark.django_db
@@ -22,74 +19,6 @@ def test_rest_dataset_list_retrieve(authenticated_api_client, dataset: Dataset):
     assert resp.json()['id'] == dataset.id
 
 
-@pytest.mark.django_db
-def test_rest_dataset_gcc_no_networks(authenticated_api_client, dataset: Dataset, project: Project):
-    project.datasets.add(dataset)
-    resp = authenticated_api_client.get(
-        f'/api/v1/datasets/{dataset.id}/gcc/?project={project.id}&exclude_nodes=1'
-    )
-    assert resp.status_code == 400
-
-
-@pytest.mark.django_db
-def test_rest_dataset_gcc_empty_network(
-    authenticated_api_client, project: Project, network: Network
-):
-    dataset = network.vector_data.dataset
-    project.datasets.add(dataset)
-    resp = authenticated_api_client.get(
-        f'/api/v1/datasets/{dataset.id}/gcc/?project={project.id}&exclude_nodes=1'
-    )
-
-    assert resp.status_code == 200
-    assert resp.json() == []
-
-
-@pytest.mark.parametrize('group_sizes', [(3, 2), (20, 3)])
-@pytest.mark.django_db
-def test_rest_dataset_gcc(
-    authenticated_api_client,
-    project: Project,
-    network: Network,
-    network_edge_factory,
-    network_node_factory,
-    group_sizes,
-):
-    group_a_size, group_b_size = group_sizes
-
-    # Create two groups of nodes that fully connected
-    group_a = [network_node_factory(network=network) for _ in range(group_a_size)]
-    for from_node, to_node in itertools.combinations(group_a, 2):
-        network_edge_factory(network=network, from_node=from_node, to_node=to_node)
-
-    group_b = [network_node_factory(network=network) for _ in range(group_b_size)]
-    for from_node, to_node in itertools.combinations(group_b, 2):
-        network_edge_factory(network=network, from_node=from_node, to_node=to_node)
-
-    # Join these two groups by a single node
-    connecting_node: NetworkNode = network_node_factory(network=network)
-    network_edge_factory(network=network, from_node=group_a[0], to_node=connecting_node)
-    network_edge_factory(network=network, from_node=group_b[0], to_node=connecting_node)
-
-    # Network should look like this
-    #  *             *
-    #  |             |
-    #  * ---- * ---- *
-    #  |
-    #  *
-
-    dataset = network.vector_data.dataset
-    project.datasets.add(dataset)
-    resp = authenticated_api_client.get(
-        f'/api/v1/datasets/{dataset.id}/gcc/'
-        f'?project={project.id}&exclude_nodes={connecting_node.id}'
-    )
-
-    larger_group: list[NetworkNode] = max(group_a, group_b, key=len)
-    assert resp.status_code == 200
-    assert sorted(resp.json()) == sorted([n.id for n in larger_group])
-
-
 @pytest.mark.django_db
 def test_rest_dataset_layers(
     authenticated_api_client,
@@ -131,27 +60,3 @@ def test_rest_dataset_data_objects(
     print(data)
     # Assert these lists are the same objects
     assert sorted([x['id'] for x in data]) == sorted([x.id for x in data_objects])
-
-
-@pytest.mark.django_db
-def test_rest_dataset_network_no_network(authenticated_api_client, dataset: Dataset):
-    resp = authenticated_api_client.get(f'/api/v1/datasets/{dataset.id}/network/')
-    assert resp.status_code == 200
-    assert not resp.json()
-
-
-@pytest.mark.django_db
-def test_rest_dataset_network(authenticated_api_client, network_edge):
-    network = network_edge.network
-    dataset = network.vector_data.dataset
-    assert network_edge.from_node != network_edge.to_node
-
-    resp = authenticated_api_client.get(f'/api/v1/datasets/{dataset.id}/network/')
-    assert resp.status_code == 200
-
-    data: list[dict] = resp.json()
-    assert len(data) == 1
-
-    data: dict = data[0]
-    assert len(data['nodes']) == 2
-    assert len(data['edges']) == 1

uvdat/core/tests/test_network.py

@@ -0,0 +1,90 @@
+import itertools
+
+import pytest
+
+from uvdat.core.models import Dataset, Network, NetworkNode, Project
+
+
+@pytest.mark.django_db
+def test_rest_dataset_networks_no_network(
+    authenticated_api_client, dataset: Dataset, project: Project
+):
+    project.datasets.add(dataset)
+    resp = authenticated_api_client.get(f'/api/v1/datasets/{dataset.id}/networks/')
+    assert resp.status_code == 200
+    assert not resp.json()
+
+
+@pytest.mark.django_db
+def test_rest_dataset_networks(authenticated_api_client, project: Project, network_edge):
+    network = network_edge.network
+    dataset = network.vector_data.dataset
+    project.datasets.add(dataset)
+    assert network_edge.from_node != network_edge.to_node
+
+    resp = authenticated_api_client.get(f'/api/v1/datasets/{dataset.id}/networks/')
+    assert resp.status_code == 200
+
+    data: list[dict] = resp.json()
+    assert len(data) == 1
+
+    data: dict = data[0]
+    assert len(data['nodes']) == 2
+    assert len(data['edges']) == 1
+
+
+@pytest.mark.django_db
+def test_rest_network_gcc_empty(authenticated_api_client, user, project: Project, network: Network):
+    dataset = network.vector_data.dataset
+    project.set_owner(user)
+    project.datasets.add(dataset)
+    resp = authenticated_api_client.get(f'/api/v1/networks/{network.id}/gcc/?exclude_nodes=1')
+
+    assert resp.status_code == 200
+    assert resp.json() == []
+
+
+@pytest.mark.parametrize('group_sizes', [(3, 2), (20, 3)])
+@pytest.mark.django_db
+def test_rest_network_gcc(
+    authenticated_api_client,
+    user,
+    project: Project,
+    network: Network,
+    network_edge_factory,
+    network_node_factory,
+    group_sizes,
+):
+    dataset = network.vector_data.dataset
+    project.set_owner(user)
+    project.datasets.add(dataset)
+    group_a_size, group_b_size = group_sizes
+
+    # Create two groups of nodes that fully connected
+    group_a = [network_node_factory(network=network) for _ in range(group_a_size)]
+    for from_node, to_node in itertools.combinations(group_a, 2):
+        network_edge_factory(network=network, from_node=from_node, to_node=to_node)
+
+    group_b = [network_node_factory(network=network) for _ in range(group_b_size)]
+    for from_node, to_node in itertools.combinations(group_b, 2):
+        network_edge_factory(network=network, from_node=from_node, to_node=to_node)
+
+    # Join these two groups by a single node
+    connecting_node: NetworkNode = network_node_factory(network=network)
+    network_edge_factory(network=network, from_node=group_a[0], to_node=connecting_node)
+    network_edge_factory(network=network, from_node=group_b[0], to_node=connecting_node)
+
+    # Network should look like this
+    #  *             *
+    #  |             |
+    #  * ---- * ---- *
+    #  |
+    #  *
+
+    resp = authenticated_api_client.get(
+        f'/api/v1/networks/{network.id}/gcc/?exclude_nodes={connecting_node.id}'
+    )
+
+    larger_group: list[NetworkNode] = max(group_a, group_b, key=len)
+    assert resp.status_code == 200
+    assert sorted(resp.json()) == sorted([n.id for n in larger_group])