diff --git a/tests/test_BaseStruc.py b/tests/test_BaseStruc.py index 43e61f1..ae3f7ed 100644 --- a/tests/test_BaseStruc.py +++ b/tests/test_BaseStruc.py @@ -32,10 +32,12 @@ def testBaseStruc(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc, baseUnitCell = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, baseUnitCell, baseConnectivity = readStrucFile( + iparamsSphere['baseStrucFile'] + ) else: baseStruc = None diff --git a/tests/test_atomFill.py b/tests/test_atomFill.py index b816012..fac0ac9 100644 --- a/tests/test_atomFill.py +++ b/tests/test_atomFill.py @@ -30,10 +30,10 @@ def testAtomFill(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile']) else: baseStruc = None @@ -45,4 +45,4 @@ def testAtomFill(): outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere) assert len(outStrucSphere) != 0, "Output structure should have some length" - assert strucTypeSphere == "atom", "Structure type should be an atom" \ No newline at end of file + assert strucTypeSphere == "atom", "Structure type should be an atom" diff --git a/tests/test_atomRandomPlace.py b/tests/test_atomRandomPlace.py index 458f087..87bf8f8 100644 --- a/tests/test_atomRandomPlace.py +++ b/tests/test_atomRandomPlace.py @@ -32,10 +32,10 @@ def testRandomPlace(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile']) else: baseStruc = None @@ -45,4 +45,4 @@ def testRandomPlace(): outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere) assert len(outStrucSphere) != 0, "Output structure should have some length" - assert strucTypeSphere == "atom", "Structure type should be an atom" \ No newline at end of file + assert strucTypeSphere == "atom", "Structure type should be an atom" diff --git a/tests/test_moleculeFill.py b/tests/test_moleculeFill.py index 12291c3..41695e6 100644 --- a/tests/test_moleculeFill.py +++ b/tests/test_moleculeFill.py @@ -30,10 +30,10 @@ def testMoleculeFill(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile']) else: baseStruc = None @@ -43,4 +43,4 @@ def testMoleculeFill(): outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere) assert len(outStrucSphere) != 0, "Output structure should have some length" - assert strucTypeSphere == "molecule", "Structure type should be an atom" \ No newline at end of file + assert strucTypeSphere == "molecule", "Structure type should be an atom" diff --git a/tests/test_moleculeRandomPlace.py b/tests/test_moleculeRandomPlace.py index d820f4c..76c62ec 100644 --- a/tests/test_moleculeRandomPlace.py +++ b/tests/test_moleculeRandomPlace.py @@ -32,10 +32,12 @@ def testMoleculeRandomPlace(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc, baseUnitCell = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, baseUnitCell, baseConnectivity = readStrucFile( + iparamsSphere['baseStrucFile'] + ) else: baseStruc = None @@ -45,4 +47,4 @@ def testMoleculeRandomPlace(): outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere) assert len(outStrucSphere) != 0, "Output structure should have some length" - assert strucTypeSphere == "molecule", "Structure type should be an atom" \ No newline at end of file + assert strucTypeSphere == "molecule", "Structure type should be an atom" diff --git a/tests/test_randOrient.py b/tests/test_randOrient.py index 6544c7f..5514b5f 100644 --- a/tests/test_randOrient.py +++ b/tests/test_randOrient.py @@ -32,10 +32,10 @@ def testRandOrient(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile']) else: baseStruc = None @@ -45,4 +45,4 @@ def testRandOrient(): outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere) assert len(outStrucSphere) != 0, "Output structure should have some length" - assert strucTypeSphere == "molecule", "Structure type should be an atom" \ No newline at end of file + assert strucTypeSphere == "molecule", "Structure type should be an atom" diff --git a/tests/test_readWritePDB.py b/tests/test_readWritePDB.py index 1b9e141..55d48c1 100644 --- a/tests/test_readWritePDB.py +++ b/tests/test_readWritePDB.py @@ -30,10 +30,10 @@ def testReadWritePDB(): if name not in iparamsCube: iparamsCube[name] = dparams[name] - struc, unitCell = readStrucFile(iparamsSphere['structureFile']) + struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile']) if iparamsSphere['baseStrucFile']: - baseStruc = readStrucFile(iparamsSphere['baseStrucFile']) + baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile']) else: baseStruc = None @@ -45,4 +45,4 @@ def testReadWritePDB(): outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere) assert len(outStrucSphere) != 0, "Output structure should have some length" assert strucTypeSphere == "molecule", "Structure type should be an atom" - assert isinstance(outStrucSphere[0][0][-1], str), 'Final place should be residue ID' \ No newline at end of file + assert isinstance(outStrucSphere[0][0][-1], str), 'Final place should be residue ID'