{
private StructureSelectionManager ssm;
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp()
{
ssm = new StructureSelectionManager();
}
@Test(groups ={ "Functional" })
- public void testAddMapping()
+ public void testRegisterMapping()
{
AlignedCodonFrame acf1 = new AlignedCodonFrame();
AlignedCodonFrame acf2 = new AlignedCodonFrame();
- /*
- * One mapping only.
- */
- ssm.addMapping(acf1);
+ ssm.registerMapping(acf1);
assertEquals(1, ssm.seqmappings.size());
assertTrue(ssm.seqmappings.contains(acf1));
- assertEquals(1, ssm.seqMappingRefCounts.size());
- assertEquals(1, ssm.seqMappingRefCounts.get(acf1).intValue());
- /*
- * A second mapping.
- */
- ssm.addMapping(acf2);
+ ssm.registerMapping(acf2);
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());
/*
- * A second reference to the first mapping.
+ * Re-adding the first mapping does nothing
*/
- ssm.addMapping(acf1);
+ ssm.registerMapping(acf1);
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());
}
@Test(groups ={ "Functional" })
- public void testAddMappings()
+ public void testRegisterMappings()
{
AlignedCodonFrame acf1 = new AlignedCodonFrame();
AlignedCodonFrame acf2 = new AlignedCodonFrame();
set2.add(acf3);
/*
- * Adding both sets adds acf2 twice and acf1 and acf3 once each.
+ * Add both sets twice; each mapping should be added once only
*/
- ssm.addMappings(set1);
- ssm.addMappings(set2);
+ ssm.registerMappings(set1);
+ ssm.registerMappings(set1);
+ ssm.registerMappings(set2);
+ ssm.registerMappings(set2);
assertEquals(3, ssm.seqmappings.size());
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());
- }
-
- @Test(groups ={ "Functional" })
- public void testRemoveMapping()
- {
- AlignedCodonFrame acf1 = new AlignedCodonFrame();
- AlignedCodonFrame acf2 = new AlignedCodonFrame();
- ssm.addMapping(acf1);
-
- /*
- * Add one and remove it.
- */
- ssm.removeMapping(acf1);
- ssm.removeMapping(acf2);
- assertEquals(0, ssm.seqmappings.size());
- assertEquals(0, ssm.seqMappingRefCounts.size());
-
- /*
- * Add one twice and remove it once.
- */
- ssm.addMapping(acf1);
- ssm.addMapping(acf2);
- ssm.addMapping(acf1);
- ssm.removeMapping(acf1);
- 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());
-
- /*
- * Remove both once more to clear the set.
- */
- ssm.removeMapping(acf1);
- ssm.removeMapping(acf2);
- assertEquals(0, ssm.seqmappings.size());
- assertEquals(0, ssm.seqMappingRefCounts.size());
- }
-
- @Test(groups ={ "Functional" })
- public void testRemoveMappings()
- {
- AlignedCodonFrame acf1 = new AlignedCodonFrame();
- AlignedCodonFrame acf2 = new AlignedCodonFrame();
- AlignedCodonFrame acf3 = new AlignedCodonFrame();
-
- /*
- * Initial ref counts are 3/2/1:
- */
- ssm.addMapping(acf1);
- ssm.addMapping(acf1);
- ssm.addMapping(acf1);
- ssm.addMapping(acf2);
- ssm.addMapping(acf2);
- ssm.addMapping(acf3);
-
- Set<AlignedCodonFrame> set1 = new HashSet<AlignedCodonFrame>();
- set1.add(acf1);
- set1.add(acf2);
- Set<AlignedCodonFrame> set2 = new HashSet<AlignedCodonFrame>();
- set2.add(acf2);
- set2.add(acf3);
-
- /*
- * Remove one ref each to acf1, acf2, counts are now 2/1/1:
- */
- ssm.removeMappings(set1);
- assertEquals(3, ssm.seqmappings.size());
- 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());
-
- /*
- * Remove one ref each to acf2, acf3 - they are removed
- */
- 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());
}
}