fix(tests): remove swagger-codegen dependecy

tests/test_client.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from tests.util import assert_blank
 from indexd.index.blueprint import ACCEPTABLE_HASHES
 
 
@@ -75,13 +76,13 @@ def test_index_list_with_params(client, user):
     assert rec_1["did"] in ids
     assert rec_2["did"] in ids
 
-    data_by_ids = client.get("/index/?ids=".format(",".join(ids)))
+    data_by_ids = client.get("/index/?ids={}".format(rec_1["did"]))
     assert data_by_ids.status_code == 200
     data_list_all = data_by_ids.json
 
     ids = [record["did"] for record in data_list_all["records"]]
     assert rec_1["did"] in ids
-    assert rec_2["did"] in ids
+    assert not rec_2["did"] in ids
 
     data_with_limit = client.get("/index/?limit=1")
     assert data_with_limit.status_code == 200
@@ -93,9 +94,9 @@ def test_index_list_with_params(client, user):
     data_by_url_md = client.get("/index/?urls_metadata=" + json.dumps(param))
     assert data_by_url_md.status_code == 200
     data_list = data_by_url_md.json
+    assert len(data_list["records"]) == 1
     assert data_list["records"][0]["did"] == rec_1["did"]
     assert data_list["records"][0]["urls_metadata"] == data1["urls_metadata"]
-    assert len(data_list["records"]) == 1
 
 
 def test_index_list_with_params_negate(client, user):
@@ -277,12 +278,7 @@ def test_create_blank_record(client, user):
     assert not rec["records"][0]["file_name"]
 
     # test that record is blank
-    assert rec["records"][0]["baseid"]
-    assert rec["records"][0]["did"]
-    assert not rec["records"][0]["size"]
-    assert not rec["records"][0]["acl"]
-    assert not rec["records"][0]["authz"]
-    assert not rec["records"][0]["hashes"]
+    assert_blank(rec)
 
 
 def test_create_blank_record_with_file_name(client, user):
@@ -306,12 +302,7 @@ def test_create_blank_record_with_file_name(client, user):
     assert rec["records"][0]["file_name"] == "myfile.txt"
 
     # test that record is blank
-    assert rec["records"][0]["baseid"]
-    assert rec["records"][0]["did"]
-    assert not rec["records"][0]["size"]
-    assert not rec["records"][0]["acl"]
-    assert not rec["records"][0]["authz"]
-    assert not rec["records"][0]["hashes"]
+    assert_blank(rec)
 
 
 def test_fill_size_n_hash_for_blank_record(client, user):
@@ -819,15 +810,10 @@ def test_create_blank_record_with_baseid(client, user):
     assert res.status_code == 201
     rec = res.json
     assert rec["did"]
-    res = client.get("/index/" + rec["did"])
+    res = client.get("/index/?baseid=baseid_123")
     assert res.status_code == 200
     rec = res.json
-    assert rec["acl"] == []
-    assert rec["authz"] == []
-    assert rec["urls_metadata"] == {}
-    assert rec["size"] is None
-    assert rec["version"] is None
-    assert rec["urls_metadata"] == {}
+    assert_blank(rec)
 
 
 def test_index_create_with_uploader(client, user):

tests/test_driver_alchemy_auth.py

@@ -23,9 +23,7 @@ def test_driver_init_does_not_create_records():
     Tests for creation of records after driver init.
     Tests driver init does not have unexpected side-effects.
     """
-    driver = SQLAlchemyAuthDriver(
-        "sqlite:///auth.sq3"
-    )  # pylint: disable=unused-variable
+    driver = SQLAlchemyAuthDriver("sqlite:///auth.sq3")  # pylint: disable=unused-variable
 
     with sqlite3.connect("auth.sq3") as conn:
 

tests/test_driver_alchemy_crud.py

@@ -64,9 +64,7 @@ def test_driver_init_does_not_create_record_hashes():
     """
     with sqlite3.connect("index.sq3") as conn:
 
-        driver = SQLAlchemyIndexDriver(
-            "sqlite:///index.sq3"
-        )  # pylint: disable=unused-variable
+        driver = SQLAlchemyIndexDriver("sqlite:///index.sq3")  # pylint: disable=unused-variable
 
         count = conn.execute(
             """

tests/util.py

@@ -34,13 +34,11 @@ def assert_blank(r):
     Check that the fields that should be empty in a
     blank record are empty.
     """
-    assert r.records[0].baseid
-    assert r.records[0].did
-    assert not r.records[0].size
-    assert not r.records[0].acl
-    assert not r.records[0].authz
-    assert not r.records[0].hashes.crc
-    assert not r.records[0].hashes.md5
-    assert not r.records[0].hashes.sha
-    assert not r.records[0].hashes.sha256
-    assert not r.records[0].hashes.sha512
+    assert r["records"][0]["baseid"]
+    assert r["records"][0]["did"]
+    assert not r["records"][0]["size"]
+    assert not r["records"][0]["acl"]
+    assert not r["records"][0]["authz"]
+    assert not r["records"][0]["hashes"]
+    assert not r["records"][0]["urls_metadata"]
+    assert not r["records"][0]["version"]