From 0cb03d6f6feb66fdf2ce4e8663be8f5cdd81acce Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Thu, 1 Jun 2023 15:49:33 +0100 Subject: [PATCH] JAL-629 added data for test --- test/jalview/ws/dbsources/EBIAlphaFoldTest.java | 29 +++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/test/jalview/ws/dbsources/EBIAlphaFoldTest.java b/test/jalview/ws/dbsources/EBIAlphaFoldTest.java index 076ee7e..b737042 100644 --- a/test/jalview/ws/dbsources/EBIAlphaFoldTest.java +++ b/test/jalview/ws/dbsources/EBIAlphaFoldTest.java @@ -6,7 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import org.json.simple.parser.ParseException; -import org.junit.Assert; +import org.testng.Assert; import org.testng.FileAssert; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; @@ -46,7 +46,7 @@ public class EBIAlphaFoldTest new Sequence("Dummy/1-2000", "ASDASDA"), EBIAlfaFold.parseJSONtoPAEContactMatrix( new FileInputStream(paeFile))); - Assert.assertNotEquals("No data from " + paeFile, cm.getMax(), 0); + Assert.assertNotEquals(cm.getMax(), 0.0f, "No data from " + paeFile); } @Test(groups = { "Functional" }, dataProvider = "getPDBandPAEfiles") @@ -71,13 +71,32 @@ public class EBIAlphaFoldTest { boolean done = EBIAlfaFold.importPaeJSONAsContactMatrixToStructure( smArray, paeInput, "label"); - Assert.assertTrue( - "Import of '" + paeFile + "' didn't complete successfully", - done); + Assert.assertTrue(done, + "Import of '" + paeFile + "' didn't complete successfully"); } catch (IOException | ParseException e) { e.printStackTrace(); } + } + @DataProvider(name = "getPDBandPAEfiles") + public Object[][] getPDBandPAEfiles() + { + return new String[][] { + // + /* + */ + { "examples/test_fab41.result/sample.a2m", + "examples/test_fab41.result/test_fab41_predicted_aligned_error_v1.json" }, + /* + { "examples/AlphaFold/AF-A0A1U8FD60-F1-model_v4.pdb", + "examples/AlphaFold/AF-A0A1U8FD60-F1-predicted_aligned_error_v4.json" }, + { "examples/AlphaFold/AF-Q5VSL9-F1-model_v4.pdb", + "examples/AlphaFold/AF-Q5VSL9-F1-predicted_aligned_error_v4.json" }, + { "examples/AlphaFold/AF-Q5VSL9-F1-model_v4.pdb", + "examples/AlphaFold/AF-Q5VSL9-F1-predicted_aligned_error_v4_2023.json" }, + */ + }; } + } -- 1.7.10.2