X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSequenceFeatureTest.java;fp=test%2Fjalview%2Fdatamodel%2FSequenceFeatureTest.java;h=d105cc5d2721d9196693c84d4ce3cb0faa199eaf;hb=b9d3d1f71c6a8aee09cd23e1303b062cbe43a239;hp=7b0bc0c1697725c1f6f0a7488dc1c001fd899a45;hpb=ce4840757da155836d19edb70821fce6d2258d88;p=jalview.git diff --git a/test/jalview/datamodel/SequenceFeatureTest.java b/test/jalview/datamodel/SequenceFeatureTest.java index 7b0bc0c..d105cc5 100644 --- a/test/jalview/datamodel/SequenceFeatureTest.java +++ b/test/jalview/datamodel/SequenceFeatureTest.java @@ -137,41 +137,47 @@ public class SequenceFeatureTest // changing score breaks equals: float restoref = sf2.getScore(); - sf2.setScore(12.4f); + sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), + sf2.getFeatureGroup(), 10f); assertFalse(sf1.equals(sf2)); - sf2.setScore(restoref); + sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), + sf2.getFeatureGroup(), restoref); // NaN doesn't match a number restoref = sf2.getScore(); - sf2.setScore(Float.NaN); + sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), + sf2.getFeatureGroup(), Float.NaN); assertFalse(sf1.equals(sf2)); // NaN matches NaN - sf1.setScore(Float.NaN); + sf1 = new SequenceFeature(sf1, sf1.getBegin(), sf1.getEnd(), + sf1.getFeatureGroup(), Float.NaN); assertTrue(sf1.equals(sf2)); - sf1.setScore(restoref); - sf2.setScore(restoref); + sf1 = new SequenceFeature(sf1, sf1.getBegin(), sf1.getEnd(), + sf1.getFeatureGroup(), restoref); + sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), + sf2.getFeatureGroup(), restoref); // changing start position breaks equals: int restorei = sf2.getBegin(); - sf2 = new SequenceFeature(sf2, 21, sf2.getEnd(), sf2.getFeatureGroup()); + sf2 = new SequenceFeature(sf2, 21, sf2.getEnd(), sf2.getFeatureGroup(), sf2.getScore()); assertFalse(sf1.equals(sf2)); sf2 = new SequenceFeature(sf2, restorei, sf2.getEnd(), - sf2.getFeatureGroup()); + sf2.getFeatureGroup(), sf2.getScore()); // changing end position breaks equals: restorei = sf2.getEnd(); sf2 = new SequenceFeature(sf2, sf2.getBegin(), 32, - sf2.getFeatureGroup()); + sf2.getFeatureGroup(), sf2.getScore()); assertFalse(sf1.equals(sf2)); sf2 = new SequenceFeature(sf2, sf2.getBegin(), restorei, - sf2.getFeatureGroup()); + sf2.getFeatureGroup(), sf2.getScore()); // changing feature group breaks equals: restores = sf2.getFeatureGroup(); - sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), "Group"); + sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), "Group", sf2.getScore()); assertFalse(sf1.equals(sf2)); - sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), restores); + sf2 = new SequenceFeature(sf2, sf2.getBegin(), sf2.getEnd(), restores, sf2.getScore()); // changing ID breaks equals: restores = (String) sf2.getValue("ID");