Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test OccurrencePredicateTest.java,1.3,1.4
|
From: Lars H. <lh...@us...> - 2005-03-07 14:10:35
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9364/src/org/tmapiutils/query/tolog/predicates/test Modified Files: OccurrencePredicateTest.java Log Message: Occurrence test TMAPI compatible Index: OccurrencePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/OccurrencePredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OccurrencePredicateTest.java 6 Mar 2005 21:11:33 -0000 1.3 --- OccurrencePredicateTest.java 7 Mar 2005 14:10:25 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- import org.tmapiutils.query.tolog.utils.VariableSet; // TMAPI + import org.tmapi.core.TopicMap; import org.tmapi.core.Topic; *************** *** 34,37 **** --- 35,52 ---- "{tm4j, homepage, \"http://www.tm4j.org/\"}"; + public void createTestMap(TopicMap tm) { + Topic tmapiutils = tm.createTopic(); + Topic homepage = tm.createTopic(); + Topic contact_details = tm.createTopic(); + tmapiutils.createOccurrence(createLocator("http://tmapiutils.org/", homepage, null); + tmapiutils.createOccurrence(createLocator("http://tmapiutils.org/contact/", contact_details, null); + Topic tmapi = tm.createTopic(); + tmapi.createOccurrence(createLocator("http://tmapi.org/", homepage, null); + + registerObject("tmapi", tmapi); + registerObject("tmapiutils", tmapiutils); + registerObject("homepage"), homepage); + registerObject("contact-details", contact_details); + } /** *************** *** 53,56 **** --- 68,73 ---- return TESTMAP; } + + /* (non-Javadoc) *************** *** 72,82 **** assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("techquila"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("tm4j"))); ! Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { assertTrue(out.getColumn(b).contains(it.next())); } ! it = ((Topic) m_tm.getObjectById("tm4j")).getOccurrences().iterator(); while (it.hasNext()) { assertTrue(out.getColumn(b).contains(it.next())); --- 89,99 ---- assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(getObjectById("tmapiutils"))); ! assertTrue(out.getColumn(a).contains(getObjectById("tmapi"))); ! Iterator it = ((Topic) getObjectById("tmapiutils")).getOccurrences().iterator(); while (it.hasNext()) { assertTrue(out.getColumn(b).contains(it.next())); } ! it = ((Topic) getObjectById("tmapi")).getOccurrences().iterator(); while (it.hasNext()) { assertTrue(out.getColumn(b).contains(it.next())); *************** *** 88,92 **** Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectById("techquila").getOccurrences().iterator().next()); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 105,109 ---- Variable a = new Variable("A"); params.add(a); ! params.add(getObjectById("tmapiutils").getOccurrences().iterator().next()); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 94,98 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("techquila"))); } --- 111,115 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(getObjectById("tmapiutils"))); } *************** *** 100,104 **** List params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectById("techquila")); params.add(a); m_predicate.setParameters(params); --- 117,121 ---- List params = new ArrayList(); Variable a = new Variable("A"); ! params.add(getObjectById("tmapiutils")); params.add(a); m_predicate.setParameters(params); *************** *** 107,111 **** assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { assertTrue(out.getColumn(a).contains(it.next())); --- 124,128 ---- assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! Iterator it = ((Topic) getObjectById("tmapiutils")).getOccurrences().iterator(); while (it.hasNext()) { assertTrue(out.getColumn(a).contains(it.next())); *************** *** 120,129 **** params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectById("tm4j")); ! params.set(1, m_tm.getObjectById("tm4j").getOccurrences().iterator().next()); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! params.set(0, m_tm.getObjectById("techquila")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 137,146 ---- params.add(b); m_predicate.setParameters(params); ! params.set(0, getObjectById("tmapi")); ! params.set(1, getObjectById("tmapi").getOccurrences().iterator().next()); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! params.set(0, getObjectById("tmapiutils")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 131,151 **** } } - - /* - * $Log$ - * Revision 1.3 2005/03/06 21:11:33 lheuer - * More TM4J -> TMAPI translations - * - * Revision 1.2 2005/03/06 19:37:23 lheuer - * Changed getTopicByID to getObjectById - * - * Revision 1.1 2005/03/06 17:33:23 lheuer - * Initial tolog import - * - * Revision 1.3 2004/06/14 20:09:46 kal_ahmed - * Updated test code to work with new Predicate interface. - * - * Revision 1.2 2004/06/10 08:19:41 kal_ahmed - * Added standard file header and footer. - * - */ \ No newline at end of file --- 148,149 ---- |
