git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch
[jalview.git]
/
test
/
jalview
/
analysis
/
scoremodels
/
ScoreModelsTest.java
diff --git
a/test/jalview/analysis/scoremodels/ScoreModelsTest.java
b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
index
c4c3edb
..
ffcd1a8
100644
(file)
--- a/
test/jalview/analysis/scoremodels/ScoreModelsTest.java
+++ b/
test/jalview/analysis/scoremodels/ScoreModelsTest.java
@@
-4,10
+4,8
@@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import jalview.api.analysis.DistanceScoreModelI;
import jalview.api.analysis.PairwiseScoreModelI;
import jalview.api.analysis.ScoreModelI;
import jalview.api.analysis.PairwiseScoreModelI;
import jalview.api.analysis.ScoreModelI;
-import jalview.api.analysis.SimilarityScoreModelI;
import java.util.Iterator;
import java.util.Iterator;
@@
-19,7
+17,7
@@
public class ScoreModelsTest
* Verify that the singleton constructor successfully loads Jalview's built-in
* score models
*/
* Verify that the singleton constructor successfully loads Jalview's built-in
* score models
*/
- @Test
+ @Test(groups = "Functional")
public void testConstructor()
{
Iterator<ScoreModelI> models = ScoreModels.getInstance().getModels()
public void testConstructor()
{
Iterator<ScoreModelI> models = ScoreModels.getInstance().getModels()
@@
-30,45
+28,39
@@
public class ScoreModelsTest
* models are served in order of addition
*/
ScoreModelI sm = models.next();
* models are served in order of addition
*/
ScoreModelI sm = models.next();
- assertTrue(sm instanceof SimilarityScoreModelI);
+ assertTrue(sm instanceof SimilarityScoreModel);
assertTrue(sm instanceof PairwiseScoreModelI);
assertTrue(sm instanceof PairwiseScoreModelI);
- assertFalse(sm instanceof DistanceScoreModelI);
+ assertFalse(sm instanceof DistanceScoreModel);
assertEquals(sm.getName(), "BLOSUM62");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('I', 'R'), -3f);
sm = models.next();
assertEquals(sm.getName(), "BLOSUM62");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('I', 'R'), -3f);
sm = models.next();
- assertTrue(sm instanceof SimilarityScoreModelI);
+ assertTrue(sm instanceof SimilarityScoreModel);
assertTrue(sm instanceof PairwiseScoreModelI);
assertTrue(sm instanceof PairwiseScoreModelI);
- assertFalse(sm instanceof DistanceScoreModelI);
+ assertFalse(sm instanceof DistanceScoreModel);
assertEquals(sm.getName(), "PAM250");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), -4f);
sm = models.next();
assertEquals(sm.getName(), "PAM250");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), -4f);
sm = models.next();
- assertTrue(sm instanceof SimilarityScoreModelI);
+ assertTrue(sm instanceof SimilarityScoreModel);
assertTrue(sm instanceof PairwiseScoreModelI);
assertTrue(sm instanceof PairwiseScoreModelI);
- assertFalse(sm instanceof DistanceScoreModelI);
- assertEquals(sm.getName(), "Identity (SeqSpace)");
+ assertFalse(sm instanceof DistanceScoreModel);
+ assertEquals(sm.getName(), "PID");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f);
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f);
sm = models.next();
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f);
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f);
sm = models.next();
- assertTrue(sm instanceof SimilarityScoreModelI);
+ assertTrue(sm instanceof SimilarityScoreModel);
assertTrue(sm instanceof PairwiseScoreModelI);
assertTrue(sm instanceof PairwiseScoreModelI);
- assertFalse(sm instanceof DistanceScoreModelI);
+ assertFalse(sm instanceof DistanceScoreModel);
assertEquals(sm.getName(), "DNA");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f);
sm = models.next();
assertEquals(sm.getName(), "DNA");
assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f);
sm = models.next();
- assertFalse(sm instanceof SimilarityScoreModelI);
+ assertFalse(sm instanceof SimilarityScoreModel);
assertFalse(sm instanceof PairwiseScoreModelI);
assertFalse(sm instanceof PairwiseScoreModelI);
- assertTrue(sm instanceof DistanceScoreModelI);
+ assertTrue(sm instanceof DistanceScoreModel);
assertEquals(sm.getName(), "Sequence Feature Similarity");
assertEquals(sm.getName(), "Sequence Feature Similarity");
-
- sm = models.next();
- assertFalse(sm instanceof SimilarityScoreModelI);
- assertFalse(sm instanceof PairwiseScoreModelI);
- assertTrue(sm instanceof DistanceScoreModelI);
- assertEquals(sm.getName(), "PID");
}
/**
}
/**
@@
-77,7
+69,7
@@
public class ScoreModelsTest
* suite. It makes no assertions and is just provided as a utility method for
* printing out matrices. Relocated here from ScoreMatrixPrinter.
*/
* suite. It makes no assertions and is just provided as a utility method for
* printing out matrices. Relocated here from ScoreMatrixPrinter.
*/
- @Test
+ @Test(groups = "none")
public void printAllMatrices_tabDelimited()
{
printAllMatrices(false);
public void printAllMatrices_tabDelimited()
{
printAllMatrices(false);
@@
-89,7
+81,7
@@
public class ScoreModelsTest
* suite. It makes no assertions and is just provided as a utility method for
* printing out matrices. Relocated here from ScoreMatrixPrinter.
*/
* suite. It makes no assertions and is just provided as a utility method for
* printing out matrices. Relocated here from ScoreMatrixPrinter.
*/
- @Test
+ @Test(groups = "none")
public void printAllMatrices_asHtml()
{
printAllMatrices(true);
public void printAllMatrices_asHtml()
{
printAllMatrices(true);