diff --git a/tests/files/2awe-assembly-1.out.json b/tests/files/2awe-assembly-1.out similarity index 90% rename from tests/files/2awe-assembly-1.out.json rename to tests/files/2awe-assembly-1.out index e428ccd..c0de73a 100644 --- a/tests/files/2awe-assembly-1.out.json +++ b/tests/files/2awe-assembly-1.out @@ -42,6 +42,6 @@ n4-helix with 4 tetrads propeller- H.U4 propeller- F.U4 -UGGUGU-UGGUGU-UGGUGU-UGGUGU-UGGUGU-UGGUGU-UGGUGU-UGGGU -.([.{<-.)].{<-.([.}>-.)].}>-.([.{<-.([.}>-.)].{<-.)]}> -.{<.([-.{<.)]-.}>.([-.}>.)]-.{<.([-.}>.([-.{<.)]-.}>)] +UGGUG-UUGGUG-UUGGUG-UUGGUG-UUGGUG-UUGGUG-UUGGUG-UUGGGU +.([.{-[.)(.{-].[).}-(.]].}-).((.[-{.{).]-(.}[.{-).)]}} +.((.[-{.{).]-(.}[.{-).)].}-}.([.{-[.)(.{-].[).}-(.]]}) diff --git a/tests/files/6fc9-assembly-1.out.json b/tests/files/6fc9-assembly-1.out similarity index 91% rename from tests/files/6fc9-assembly-1.out.json rename to tests/files/6fc9-assembly-1.out index 3c427af..039fda0 100644 --- a/tests/files/6fc9-assembly-1.out.json +++ b/tests/files/6fc9-assembly-1.out @@ -17,5 +17,5 @@ n4-helix with 2 tetrads lateral+ A.DT24, A.DT25 GGTTGGCGCGAAGCATTCGCGGGTTGG -((..))...............((..)) -((..((...............))..)) +([..[)...............(]..]) +((..)(...............)(..)) diff --git a/tests/test_cli.py b/tests/test_cli.py index b780886..8e2e9b9 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -36,7 +36,7 @@ def test_eltetrado_with_dssr(capfd): ] ) out, err = capfd.readouterr() - with open("tests/files/2awe-assembly-1.out.json") as f: + with open("tests/files/2awe-assembly-1.out") as f: assert out == f.read() @@ -49,5 +49,5 @@ def test_eltetrado_without_dssr(capfd): ] ) out, err = capfd.readouterr() - with open("tests/files/6fc9-assembly-1.out.json") as f: + with open("tests/files/6fc9-assembly-1.out") as f: assert out == f.read() diff --git a/tests/test_dto.py b/tests/test_dto.py index 440f281..ce0d734 100644 --- a/tests/test_dto.py +++ b/tests/test_dto.py @@ -105,7 +105,7 @@ def test_5v3f(): analysis = eltetrado(structure2d, structure3d, False, False, 2) dto = generate_dto(analysis) assert ( - dto.dotBracket.sequence == "UGCGAAGGGACGGUGCGGAGAGGAGAGCA-CGGGACGGUGCGGAGAGGAG" + dto.dotBracket.sequence == "GUGCGAAGGGACGGUGCGGAGAGGAGAGCA-CGGGACGGUGCGGAGAGGAG" ) - assert dto.dotBracket.line1 == "......([{..)].(.[{.).]}.}....-.([{..)].(.[{.).]}.}" - assert dto.dotBracket.line2 == "......([(..[{.).]}.{.)].}....-.([(..[{.).]}.{.)].}" + assert dto.dotBracket.line1 == ".......([{..)].(.[{.).]}.}....-.([{..)].(.[{.).]}.}" + assert dto.dotBracket.line2 == ".......([(..[{.).]}.{.)].}....-.([(..[{.).]}.{.)].}"