Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test DirectInstanceOfPredicateTest.java,1.3,1.4 InstanceOfPredicateTest.java,1.2,1.3 OccurrencePredicateTest.java,1.2,1.3 ReifiesPredicateTest.java,1.1,1.2
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog/predicates/test Modified Files: DirectInstanceOfPredicateTest.java InstanceOfPredicateTest.java OccurrencePredicateTest.java ReifiesPredicateTest.java Log Message: More TM4J -> TMAPI translations Index: ReifiesPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/ReifiesPredicateTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReifiesPredicateTest.java 6 Mar 2005 17:33:23 -0000 1.1 --- ReifiesPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.2 *************** *** 55,59 **** Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectByID("assoc1")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 55,59 ---- Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectById("assoc1")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 61,65 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectByID("fredemp"))); } --- 61,65 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("fredemp"))); } *************** *** 67,71 **** ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectByID("fredemp")); params.add(a); m_predicate.setParameters(params); --- 67,71 ---- ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectById("fredemp")); params.add(a); m_predicate.setParameters(params); *************** *** 74,78 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectByID("assoc1"))); } --- 74,78 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("assoc1"))); } *************** *** 88,93 **** assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).get(0).equals(m_tm.getObjectByID("fredemp"))); ! assertTrue(out.getRow(0).get(1).equals(m_tm.getObjectByID("assoc1"))); } --- 88,93 ---- assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).get(0).equals(m_tm.getObjectById("fredemp"))); ! assertTrue(out.getRow(0).get(1).equals(m_tm.getObjectById("assoc1"))); } *************** *** 99,104 **** params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectByID("fredemp")); ! params.set(1, m_tm.getObjectByID("assoc1")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); --- 99,104 ---- params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectById("fredemp")); ! params.set(1, m_tm.getObjectById("assoc1")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 106,111 **** assertEquals(1, out.getRows().size()); ! params.set(0, m_tm.getObjectByID("fredemp")); ! params.set(1, m_tm.getObjectByID("m1")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 106,111 ---- assertEquals(1, out.getRows().size()); ! params.set(0, m_tm.getObjectById("fredemp")); ! params.set(1, m_tm.getObjectById("m1")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 117,120 **** --- 117,123 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:33:23 lheuer * Initial tolog import Index: DirectInstanceOfPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/DirectInstanceOfPredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DirectInstanceOfPredicateTest.java 6 Mar 2005 19:37:23 -0000 1.3 --- DirectInstanceOfPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.4 *************** *** 60,69 **** assertEquals(2, out.getColumns().size()); assertEquals(5, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("digestive"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("custardcream"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("jaffacake"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("biscuit"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("cake"))); } --- 60,69 ---- assertEquals(2, out.getColumns().size()); assertEquals(5, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("digestive"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("custardcream"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("biscuit"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("cake"))); } *************** *** 79,84 **** assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("jaffacake"))); } --- 79,84 ---- assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } *************** *** 93,98 **** assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("cake"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("biscuit"))); } --- 93,98 ---- assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("cake"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("biscuit"))); } *************** *** 108,112 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("jaffacake"))); } --- 108,112 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } Index: OccurrencePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/OccurrencePredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OccurrencePredicateTest.java 6 Mar 2005 19:37:23 -0000 1.2 --- OccurrencePredicateTest.java 6 Mar 2005 21:11:33 -0000 1.3 *************** *** 72,77 **** 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()) { --- 72,77 ---- 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()) { *************** *** 134,137 **** --- 134,140 ---- /* * $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 Index: InstanceOfPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/InstanceOfPredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InstanceOfPredicateTest.java 6 Mar 2005 19:37:23 -0000 1.2 --- InstanceOfPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.3 *************** *** 54,58 **** ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectByID("nelly")); params.add(a); m_predicate.setParameters(params); --- 54,58 ---- ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectById("nelly")); params.add(a); m_predicate.setParameters(params); *************** *** 61,67 **** assertEquals(1, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("elephant"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("mammal"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("animal"))); } --- 61,67 ---- assertEquals(1, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("elephant"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("mammal"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("animal"))); } *************** *** 70,74 **** Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectByID("animal")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 70,74 ---- Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectById("animal")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 76,80 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("nelly"))); } --- 76,80 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("nelly"))); } *************** *** 90,97 **** assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("nelly"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("elephant"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("mammal"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("animal"))); } --- 90,97 ---- assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("nelly"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("elephant"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("mammal"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("animal"))); } *************** *** 104,108 **** m_predicate.setParameters(params); params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectByID("mammal")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); --- 104,108 ---- m_predicate.setParameters(params); params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectById("mammal")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 110,114 **** params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectByID("reptile")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 110,114 ---- params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectById("reptile")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 120,123 **** --- 120,126 ---- /* * $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 |
