JAL-1829 JAL-1830 refactoring for correct mapping (de-)registration

[jalview.git] / test / jalview / structure / StructureSelectionManagerTest.java

diff --git a/test/jalview/structure/StructureSelectionManagerTest.java b/test/jalview/structure/StructureSelectionManagerTest.java
index 1e4a866..0162308 100644 (file)
--- a/test/jalview/structure/StructureSelectionManagerTest.java
+++ b/test/jalview/structure/StructureSelectionManagerTest.java
@@ -15,7 +15,7 @@ public class StructureSelectionManagerTest
 {
   private StructureSelectionManager ssm;
 
-  @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
   public void setUp()
   {
     ssm = new StructureSelectionManager();
@@ -33,8 +33,7 @@ public class StructureSelectionManagerTest
     ssm.addMapping(acf1);
     assertEquals(1, ssm.seqmappings.size());
     assertTrue(ssm.seqmappings.contains(acf1));
-    assertEquals(1, ssm.seqMappingRefCounts.size());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf1).intValue());
+    assertEquals(1, ssm.getMappingReferenceCount(acf1));
 
     /*
      * A second mapping.
@@ -43,9 +42,8 @@ public class StructureSelectionManagerTest
     assertEquals(2, ssm.seqmappings.size());
     assertTrue(ssm.seqmappings.contains(acf1));
     assertTrue(ssm.seqmappings.contains(acf2));
-    assertEquals(2, ssm.seqMappingRefCounts.size());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf1).intValue());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf2).intValue());
+    assertEquals(1, ssm.getMappingReferenceCount(acf1));
+    assertEquals(1, ssm.getMappingReferenceCount(acf2));
 
     /*
      * A second reference to the first mapping.
@@ -54,9 +52,8 @@ public class StructureSelectionManagerTest
     assertEquals(2, ssm.seqmappings.size());
     assertTrue(ssm.seqmappings.contains(acf1));
     assertTrue(ssm.seqmappings.contains(acf2));
-    assertEquals(2, ssm.seqMappingRefCounts.size());
-    assertEquals(2, ssm.seqMappingRefCounts.get(acf1).intValue());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf2).intValue());
+    assertEquals(2, ssm.getMappingReferenceCount(acf1));
+    assertEquals(1, ssm.getMappingReferenceCount(acf2));
   }
 
   @Test(groups ={ "Functional" })
@@ -83,10 +80,9 @@ public class StructureSelectionManagerTest
     assertTrue(ssm.seqmappings.contains(acf1));
     assertTrue(ssm.seqmappings.contains(acf2));
     assertTrue(ssm.seqmappings.contains(acf3));
-    assertEquals(3, ssm.seqMappingRefCounts.size());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf1).intValue());
-    assertEquals(2, ssm.seqMappingRefCounts.get(acf2).intValue());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf3).intValue());
+    assertEquals(1, ssm.getMappingReferenceCount(acf1));
+    assertEquals(2, ssm.getMappingReferenceCount(acf2));
+    assertEquals(1, ssm.getMappingReferenceCount(acf3));
   }
 
   @Test(groups ={ "Functional" })
@@ -94,15 +90,16 @@ public class StructureSelectionManagerTest
   {
     AlignedCodonFrame acf1 = new AlignedCodonFrame();
     AlignedCodonFrame acf2 = new AlignedCodonFrame();
-    ssm.addMapping(acf1);
 
     /*
      * Add one and remove it.
      */
+    ssm.addMapping(acf1);
     ssm.removeMapping(acf1);
     ssm.removeMapping(acf2);
     assertEquals(0, ssm.seqmappings.size());
-    assertEquals(0, ssm.seqMappingRefCounts.size());
+    assertEquals(0, ssm.getMappingReferenceCount(acf1));
+    assertEquals(0, ssm.getMappingReferenceCount(acf2));
 
     /*
      * Add one twice and remove it once.
@@ -114,9 +111,8 @@ public class StructureSelectionManagerTest
     assertEquals(2, ssm.seqmappings.size());
     assertTrue(ssm.seqmappings.contains(acf1));
     assertTrue(ssm.seqmappings.contains(acf2));
-    assertEquals(2, ssm.seqMappingRefCounts.size());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf1).intValue());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf2).intValue());
+    assertEquals(1, ssm.getMappingReferenceCount(acf1));
+    assertEquals(1, ssm.getMappingReferenceCount(acf2));
 
     /*
      * Remove both once more to clear the set.
@@ -124,7 +120,8 @@ public class StructureSelectionManagerTest
     ssm.removeMapping(acf1);
     ssm.removeMapping(acf2);
     assertEquals(0, ssm.seqmappings.size());
-    assertEquals(0, ssm.seqMappingRefCounts.size());
+    assertEquals(0, ssm.getMappingReferenceCount(acf1));
+    assertEquals(0, ssm.getMappingReferenceCount(acf2));
   }
 
   @Test(groups ={ "Functional" })
@@ -159,10 +156,9 @@ public class StructureSelectionManagerTest
     assertTrue(ssm.seqmappings.contains(acf1));
     assertTrue(ssm.seqmappings.contains(acf2));
     assertTrue(ssm.seqmappings.contains(acf3));
-    assertEquals(3, ssm.seqMappingRefCounts.size());
-    assertEquals(2, ssm.seqMappingRefCounts.get(acf1).intValue());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf2).intValue());
-    assertEquals(1, ssm.seqMappingRefCounts.get(acf3).intValue());
+    assertEquals(2, ssm.getMappingReferenceCount(acf1));
+    assertEquals(1, ssm.getMappingReferenceCount(acf2));
+    assertEquals(1, ssm.getMappingReferenceCount(acf3));
 
     /*
      * Remove one ref each to acf2, acf3 - they are removed
@@ -170,7 +166,6 @@ public class StructureSelectionManagerTest
     ssm.removeMappings(set2);
     assertEquals(1, ssm.seqmappings.size());
     assertTrue(ssm.seqmappings.contains(acf1));
-    assertEquals(1, ssm.seqMappingRefCounts.size());
-    assertEquals(2, ssm.seqMappingRefCounts.get(acf1).intValue());
+    assertEquals(2, ssm.getMappingReferenceCount(acf1));
   }
 }