[tmapi-commit] SF.net SVN: tmapi:[125] trunk/src/test/java/org/tmapi/index/ TestTypeInstanceIndex.java

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

Revision: 125
          http://tmapi.svn.sourceforge.net/tmapi/?rev=125&view=rev
Author:   lheuer
Date:     2009-10-02 15:53:38 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
Applied patch contributed by Stefan Kesberg to take type-instance relationships as assocs into account

Modified Paths:
--------------
    trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java

Modified: trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java
===================================================================
--- trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java	2009-10-01 17:21:27 UTC (rev 124)
+++ trunk/src/test/java/org/tmapi/index/TestTypeInstanceIndex.java	2009-10-02 15:53:38 UTC (rev 125)
@@ -14,6 +14,7 @@
 package org.tmapi.index;
 
 import org.tmapi.core.Association;
+import org.tmapi.core.FeatureNotRecognizedException;
 import org.tmapi.core.Name;
 import org.tmapi.core.Occurrence;
 import org.tmapi.core.Role;
@@ -29,7 +30,8 @@
  */
 public class TestTypeInstanceIndex extends TMAPITestCase {
 
-    private TypeInstanceIndex _typeInstanceIdx;
+	private static final String _FEATURE_TYPE_INSTANCE_ASSOCIATIONS= "http://tmapi.org/features/type-instance-associations";
+	private TypeInstanceIndex _typeInstanceIdx;
 
     public TestTypeInstanceIndex(String name) {
         super(name);
@@ -61,7 +63,7 @@
         }
     }
 
-    public void testTopic() {
+    public void testTopic() throws FeatureNotRecognizedException {
         _updateIndex();
         assertTrue(_typeInstanceIdx.getTopics(null).isEmpty());
         assertTrue(_typeInstanceIdx.getTopicTypes().isEmpty());
@@ -85,7 +87,16 @@
         _updateIndex();
         assertEquals(1, _typeInstanceIdx.getTopicTypes().size());
         assertTrue(_typeInstanceIdx.getTopicTypes().contains(type1));
-        assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+        
+        if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
+        {
+        	assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+        }
+        else
+        {
+        	assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+        }
+        
         assertFalse(_typeInstanceIdx.getTopics(null).contains(topic));
         assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
         assertTrue(_typeInstanceIdx.getTopics(null).contains(type2));
@@ -100,7 +111,16 @@
         assertEquals(2, _typeInstanceIdx.getTopicTypes().size());
         assertTrue(_typeInstanceIdx.getTopicTypes().contains(type1));
         assertTrue(_typeInstanceIdx.getTopicTypes().contains(type2));
-        assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+        
+        if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
+        {
+        	assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+        }
+        else
+        {
+        	assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+        }
+        
         assertFalse(_typeInstanceIdx.getTopics(null).contains(topic));
         assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
         assertTrue(_typeInstanceIdx.getTopics(null).contains(type2));
@@ -116,7 +136,16 @@
         topic.remove();
         _updateIndex();
         assertEquals(0, _typeInstanceIdx.getTopicTypes().size());
-        assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+        
+        if (_sys.getFeature(_FEATURE_TYPE_INSTANCE_ASSOCIATIONS))
+        {
+        	assertEquals(5, _typeInstanceIdx.getTopics(null).size());
+        }
+        else
+        {
+        	assertEquals(2, _typeInstanceIdx.getTopics(null).size());
+        }
+        
         assertTrue(_typeInstanceIdx.getTopics(null).contains(type1));
         assertTrue(_typeInstanceIdx.getTopics(null).contains(type2));
         assertTrue(_typeInstanceIdx.getTopics(type1).isEmpty());


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