[tmapi-commit] SF.net SVN: tmapi:[183] trunk/src/test/java/org/tmapi/core/TestTopic.java

[<lh...@us...>]

Revision: 183
          http://tmapi.svn.sourceforge.net/tmapi/?rev=183&view=rev
Author:   lheuer
Date:     2010-07-20 12:54:47 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
Avoid merging of roles

Modified Paths:
--------------
    trunk/src/test/java/org/tmapi/core/TestTopic.java

Modified: trunk/src/test/java/org/tmapi/core/TestTopic.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestTopic.java	2010-07-19 15:18:32 UTC (rev 182)
+++ trunk/src/test/java/org/tmapi/core/TestTopic.java	2010-07-20 12:54:47 UTC (rev 183)
@@ -169,45 +169,45 @@
     public void testRoleAssociationFilter() {
         final Topic player = createTopic();
         final Topic assocType1 = createTopic();
-        final Topic assocType2 = createTopic();
+        final Topic unusedType = createTopic();
         final Topic roleType1 = createTopic();
         final Topic roleType2 = createTopic();
         final Association assoc = _tm.createAssociation(assocType1);
         assertEquals(0, player.getRolesPlayed(roleType1, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
         assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
         final Role role1 = assoc.createRole(roleType1, player);
         assertEquals(1, player.getRolesPlayed(roleType1, assocType1).size());
         assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
-        assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
         assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
         final Role role2 = assoc.createRole(roleType2, player);
         assertEquals(1, player.getRolesPlayed(roleType1, assocType1).size());
         assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
-        assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
         assertEquals(1, player.getRolesPlayed(roleType2, assocType1).size());
         assertTrue(player.getRolesPlayed(roleType2, assocType1).contains(role2));
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
-        role2.setType(roleType1);
+        assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
+        final Role role3 = _tm.createAssociation(assocType1).createRole(roleType1, player);
         assertEquals(2, player.getRolesPlayed(roleType1, assocType1).size());
         assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
-        assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role2));
-        assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
-        role1.remove();
+        assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role3));
+        assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
+        assertEquals(1, player.getRolesPlayed(roleType2, assocType1).size());
+        assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
+        role3.remove();
         assertEquals(1, player.getRolesPlayed(roleType1, assocType1).size());
-        assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role2));
-        assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+        assertTrue(player.getRolesPlayed(roleType1, assocType1).contains(role1));
+        assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
+        assertEquals(1, player.getRolesPlayed(roleType2, assocType1).size());
+        assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
         assoc.remove();
         assertEquals(0, player.getRolesPlayed(roleType1, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType1, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType1, unusedType).size());
         assertEquals(0, player.getRolesPlayed(roleType2, assocType1).size());
-        assertEquals(0, player.getRolesPlayed(roleType2, assocType2).size());
+        assertEquals(0, player.getRolesPlayed(roleType2, unusedType).size());
     }
 
     public void testRoleAssociationFilterIllegalAssociation() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.