X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2Fscoremodels%2FFeatureScoreModelTest.java;fp=test%2Fjalview%2Fanalysis%2Fscoremodels%2FFeatureScoreModelTest.java;h=b40382dd7cd95b5329d7b884bcbe734d1f2c9c27;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=1dbaa4ab70dff5122e4a5806d57920974ff184fe;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git

diff --git a/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java b/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
index 1dbaa4a..b40382d 100644
--- a/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
+++ b/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
@@ -1,5 +1,7 @@
 package jalview.analysis.scoremodels;
 
+import org.testng.annotations.Test;
+import org.testng.AssertJUnit;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
@@ -7,9 +9,6 @@ import jalview.gui.AlignFrame;
 import jalview.io.FileLoader;
 import jalview.io.FormatAdapter;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 public class FeatureScoreModelTest
 {
   public static String alntestFile = "FER1_MESCR/72-76 DVYIL\nFER1_SPIOL/71-75 DVYIL\nFER3_RAPSA/21-25 DVYVL\nFER1_MAIZE/73-77 DVYIL\n";
@@ -29,8 +28,8 @@ public class FeatureScoreModelTest
     AlignFrame alf = new FileLoader(false).LoadFileWaitTillLoaded(alntestFile,
             FormatAdapter.PASTE);
     AlignmentI al = alf.getViewport().getAlignment();
-    Assert.assertEquals(4, al.getHeight());
-    Assert.assertEquals(5, al.getWidth());
+    AssertJUnit.assertEquals(4, al.getHeight());
+    AssertJUnit.assertEquals(5, al.getWidth());
     for (int i = 0; i < 4; i++)
     {
       SequenceI ds = al.getSequenceAt(i).getDatasetSequence();
@@ -55,18 +54,18 @@ public class FeatureScoreModelTest
     alf.getFeatureRenderer().setVisible("sf2");
     alf.getFeatureRenderer().setVisible("sf3");
     alf.getFeatureRenderer().findAllFeatures(true);
-    Assert.assertEquals("Number of feature types", 3, alf
+    AssertJUnit.assertEquals("Number of feature types", 3, alf
             .getFeatureRenderer().getDisplayedFeatureTypes().length);
-    Assert.assertTrue(alf.getCurrentView().areFeaturesDisplayed());
+    AssertJUnit.assertTrue(alf.getCurrentView().areFeaturesDisplayed());
     FeatureScoreModel fsm = new FeatureScoreModel();
-    Assert.assertTrue(fsm.configureFromAlignmentView(alf.getCurrentView()
+    AssertJUnit.assertTrue(fsm.configureFromAlignmentView(alf.getCurrentView()
             .getAlignPanel()));
     alf.selectAllSequenceMenuItem_actionPerformed(null);
     float[][] dm = fsm.findDistances(alf.getViewport().getAlignmentView(
             true));
-    Assert.assertTrue("FER1_MESCR should be identical with RAPSA (2)",
+    AssertJUnit.assertTrue("FER1_MESCR should be identical with RAPSA (2)",
             dm[0][2] == 0f);
-    Assert.assertTrue(
+    AssertJUnit.assertTrue(
             "FER1_MESCR should be further from SPIOL (1) than it is from RAPSA (2)",
             dm[0][1] > dm[0][2]);