[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test TopicNameTest.java,1.2,1.3

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

Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9785/src/org/tmapiutils/query/tolog/predicates/test

Modified Files:
	TopicNameTest.java 
Log Message:
TopicNamePredicate test should be TMAPI compatible

Index: TopicNameTest.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/TopicNameTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TopicNameTest.java	6 Mar 2005 19:37:40 -0000	1.2
--- TopicNameTest.java	7 Mar 2005 16:34:51 -0000	1.3
***************
*** 11,16 ****
  import org.tmapiutils.query.tolog.utils.TologContext;
  import org.tmapiutils.query.tolog.utils.VariableSet;
! import org.tmapi.core.TopicName;
  import org.tmapi.core.Topic;
  
  /**
--- 11,18 ----
  import org.tmapiutils.query.tolog.utils.TologContext;
  import org.tmapiutils.query.tolog.utils.VariableSet;
! // TMAPI
! import org.tmapi.core.TopicMap;
  import org.tmapi.core.Topic;
+ import org.tmapi.core.TopicName;
  
  /**
***************
*** 32,38 ****
  	 */
  	public String getTestMap() {
! 		return "[topic1 = \"Topic1\"]\n" +
			"[topic2 = \"Topic2\"]\n" +
			"[topic3 = \"Topic3\";\"topic3\"" +
			"        = \"Topic Three\"]\n" +
			"[topic4]";
  	}
  
  	/* (non-Javadoc)
  	 * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass()
--- 34,64 ----
  	 */
  	public String getTestMap() {
! 		return "[topic1 = \"Topic1\"]\n" +
!                 "[topic2 = \"Topic2\"]\n"  +
!                 "[topic3 = \"Topic3\";\"topic3\"" +
!                 "        = \"Topic Three\"]\n" +
!                 "[topic4]";
  	}
  
+ 
+     public void createTestMap(TopicMap tm) {
+         Topic topic1 = tm.createTopic();
+         topic1.createTopicName("Topic1", null);
+         Topic topic2 = tm.createTopic();
+         topic2.createTopicName("Topic2", null);
+         Topic topic3 = tm.createTopic();
+         topic3.createTopicName("Topic3", null);
+         // Should be the display name. 
+         // Todo: Test if this breaks something
+         topic3.createTopicName("topic3", null);
+         topic3.createTopicName("Topic Three", null);
+         Topic topic4 = tm.createTopic();
+ 
+         registerObject("topic1", topic1);
+         registerObject("topic2", topic2);
+         registerObject("topic3", topic3);
+         registerObject("topic4", topic4);
+     }
+ 
  	/* (non-Javadoc)
  	 * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass()
***************
*** 43,47 ****
  
  	public void testMatchOnName() throws Exception {
! 		Topic topic1 = (Topic) m_tm.getObjectById("topic1");
  		TopicName bn = (TopicName) topic1.getTopicNames().iterator().next();
  		
--- 69,73 ----
  
  	public void testMatchOnName() throws Exception {
! 		Topic topic1 = (Topic) getObjectById("topic1");
  		TopicName bn = (TopicName) topic1.getTopicNames().iterator().next();
  		
***************
*** 61,65 ****
  	
  	public void testMatchOnTopic() throws Exception {
! 		Topic topic3 = (Topic) m_tm.getObjectById("topic3");
  		ArrayList params = new ArrayList();
  		Variable a = new Variable("A");
--- 87,91 ----
  	
  	public void testMatchOnTopic() throws Exception {
! 		Topic topic3 = (Topic) getObjectById("topic3");
  		ArrayList params = new ArrayList();
  		Variable a = new Variable("A");
***************
*** 91,101 ****
  		assertNotNull(out);
  		assertEquals(4, out.getRows().size());
! 		assertFalse(out.getColumn(a).contains(m_tm.getObjectById("topic4")));
  	}
  	
  	public void testClosedMatch() throws Exception {
! 		Topic topic1 = (Topic) m_tm.getObjectById("topic1");
  		TopicName bn1 = (TopicName) topic1.getTopicNames().iterator().next();
! 		Topic topic2 = (Topic) m_tm.getObjectById("topic2");
  		
  		ArrayList params = new ArrayList();
--- 117,127 ----
  		assertNotNull(out);
  		assertEquals(4, out.getRows().size());
! 		assertFalse(out.getColumn(a).contains(getObjectById("topic4")));
  	}
  	
  	public void testClosedMatch() throws Exception {
! 		Topic topic1 = (Topic) getObjectById("topic1");
  		TopicName bn1 = (TopicName) topic1.getTopicNames().iterator().next();
! 		Topic topic2 = (Topic) getObjectById("topic2");
  		
  		ArrayList params = new ArrayList();