X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fdbsources%2FEBIAlphaFoldTest.java;h=8cba8ab66aad72a27b628a34d35cd497dcd3170a;hb=416733be19ca9e380edce9ee9b5bc0bad0092f99;hp=076ee7e6948e3674041cf2bb0845d4962034372f;hpb=0788111a588187a04dd0d254d70b055274cf2c9d;p=jalview.git

diff --git a/test/jalview/ws/dbsources/EBIAlphaFoldTest.java b/test/jalview/ws/dbsources/EBIAlphaFoldTest.java
index 076ee7e..8cba8ab 100644
--- a/test/jalview/ws/dbsources/EBIAlphaFoldTest.java
+++ b/test/jalview/ws/dbsources/EBIAlphaFoldTest.java
@@ -6,13 +6,16 @@ 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;
 import org.testng.annotations.Test;
 
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
 import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
 import jalview.structure.StructureMapping;
@@ -32,11 +35,13 @@ public class EBIAlphaFoldTest
   @DataProvider(name = "getExamplePAEfiles")
   public Object[][] getExamplePAEfiles()
   {
-    return new String[][] { {
-        "examples/test_fab41.result/test_fab41_predicted_aligned_error_v1.json" },
+    return new String[][] {
+        //
+        { "examples/test_fab41.result/test_fab41_predicted_aligned_error_v1.json" },
         { "examples/AlphaFold/AF-A0A1U8FD60-F1-predicted_aligned_error_v4.json" },
         { "examples/AlphaFold/AF-Q5VSL9-F1-predicted_aligned_error_v4.json" },
-        { "examples/AlphaFold/AF-Q5VSL9-F1-predicted_aligned_error_v4_2023.json" } };
+        //
+    };
   }
 
   @Test(groups = { "Functional" }, dataProvider = "getExamplePAEfiles")
@@ -46,7 +51,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")
@@ -62,8 +67,13 @@ public class EBIAlphaFoldTest
       FileAssert.assertFile(new File(paeFile),
               "Test file '" + paeFile + "' doesn't seem to exist");
     }
+    SequenceI seq = new Sequence("Dummy/1-2000", "ASDASDA");
+    AlignmentI al = new Alignment(new SequenceI[] { seq });
     StructureSelectionManager ssm = StructureSelectionManager
             .getStructureSelectionManager(Desktop.instance);
+    StructureMapping sm = new StructureMapping(seq, pdbFile, null, null,
+            null, null);
+    ssm.addStructureMapping(sm);
 
     StructureMapping[] smArray = ssm.getMapping(pdbFile);
 
@@ -71,13 +81,30 @@ 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();
+      Assert.fail("Exception importing paefile '" + paeFile + "'", e);
     }
+  }
 
+  @DataProvider(name = "getPDBandPAEfiles")
+  public Object[][] getPDBandPAEfiles()
+  {
+    return new String[][] {
+        //
+        /*
+         */
+        { "examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb",
+            "examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3_scores.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" },
+        /*
+         */
+    };
   }
+
 }