Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/test AssociationPredicateTest.java,1.1,1.2 MemoryQueryEvaluatorImplTest.java,1.1,1.2 ProjectionTest.java,1.1,1.2 SortingTest.java,1.1,1.2 TologParserTest.java,1.1,1.2 TologParserTestBase.java,1.1,1.2
|
From: Lars H. <lh...@us...> - 2005-03-06 21:11:46
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog/test Modified Files: AssociationPredicateTest.java MemoryQueryEvaluatorImplTest.java ProjectionTest.java SortingTest.java TologParserTest.java TologParserTestBase.java Log Message: More TM4J -> TMAPI translations Index: AssociationPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/AssociationPredicateTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssociationPredicateTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- AssociationPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.2 *************** *** 18,22 **** import org.apache.log4j.BasicConfigurator; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; --- 18,22 ---- import org.apache.log4j.BasicConfigurator; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; *************** *** 60,66 **** DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getTopicByID("worksfor")); ! params.add(new PlayerRoleVarPair(m_tm.getTopicByID("kal"), m_tm.getTopicByID("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("A"), m_tm.getTopicByID("employer"))); p.setParameters(params); c.addPredicate(p); --- 60,66 ---- DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getObjectById("worksfor")); ! params.add(new PlayerRoleVarPair(m_tm.getObjectById("kal"), m_tm.getObjectById("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("A"), m_tm.getObjectById("employer"))); p.setParameters(params); c.addPredicate(p); *************** *** 73,77 **** assertNotNull(row); assertEquals(row.size(), 1); ! assertEquals(m_tm.getTopicByID("techquila"), row.get(0)); } --- 73,77 ---- assertNotNull(row); assertEquals(row.size(), 1); ! assertEquals(m_tm.getObjectById("techquila"), row.get(0)); } *************** *** 83,89 **** p.initialise(m_tm); ArrayList params = new ArrayList(); ! params.add(m_tm.getTopicByID("worksfor")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getTopicByID("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getTopicByID("employer"))); p.setParameters(params); c.addPredicate(p); --- 83,89 ---- p.initialise(m_tm); ArrayList params = new ArrayList(); ! params.add(m_tm.getObjectById("worksfor")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getObjectById("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getObjectById("employer"))); p.setParameters(params); c.addPredicate(p); *************** *** 99,107 **** assertEquals(row.size(), 2); assertTrue( ! row.get(0).equals(m_tm.getTopicByID("kal")) || ! row.get(0).equals(m_tm.getTopicByID("fred"))); assertTrue( ! row.get(1).equals(m_tm.getTopicByID("techquila")) || ! row.get(1).equals(m_tm.getTopicByID("bigcorp"))); } } --- 99,107 ---- assertEquals(row.size(), 2); assertTrue( ! row.get(0).equals(m_tm.getObjectById("kal")) || ! row.get(0).equals(m_tm.getObjectById("fred"))); assertTrue( ! row.get(1).equals(m_tm.getObjectById("techquila")) || ! row.get(1).equals(m_tm.getObjectById("bigcorp"))); } } *************** *** 113,118 **** ArrayList params = new ArrayList(); params.add(new Variable("ASSOC")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getTopicByID("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getTopicByID("employer"))); p.setParameters(params); c.addPredicate(p); --- 113,118 ---- ArrayList params = new ArrayList(); params.add(new Variable("ASSOC")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getObjectById("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getObjectById("employer"))); p.setParameters(params); c.addPredicate(p); *************** *** 128,138 **** assertNotNull(row); assertEquals(row.size(), 3); ! assertEquals(row.get(0), m_tm.getTopicByID("worksfor")); assertTrue( ! row.get(1).equals(m_tm.getTopicByID("kal")) || ! row.get(1).equals(m_tm.getTopicByID("fred"))); assertTrue( ! row.get(2).equals(m_tm.getTopicByID("techquila")) || ! row.get(2).equals(m_tm.getTopicByID("bigcorp"))); } } --- 128,138 ---- assertNotNull(row); assertEquals(row.size(), 3); ! assertEquals(row.get(0), m_tm.getObjectById("worksfor")); assertTrue( ! row.get(1).equals(m_tm.getObjectById("kal")) || ! row.get(1).equals(m_tm.getObjectById("fred"))); assertTrue( ! row.get(2).equals(m_tm.getObjectById("techquila")) || ! row.get(2).equals(m_tm.getObjectById("bigcorp"))); } } *************** *** 147,151 **** SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(TESTMAP), loc, new LTMBuilder()); m_tm = m_provider.addTopicMap(src); ! assertNotNull(m_tm.getTopicByID("worksfor")); } --- 147,151 ---- SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(TESTMAP), loc, new LTMBuilder()); m_tm = m_provider.addTopicMap(src); ! assertNotNull(m_tm.getObjectById("worksfor")); } *************** *** 156,159 **** --- 156,162 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: SortingTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/SortingTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SortingTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- SortingTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 15,19 **** import junit.framework.TestCase; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.parser.Sorting; import org.tmapiutils.query.tolog.parser.Variable; --- 15,19 ---- import junit.framework.TestCase; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.Sorting; import org.tmapiutils.query.tolog.parser.Variable; *************** *** 158,162 **** private TopicMap newTopicMap() throws Exception { ! Locator loc = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idgen.getID()); return m_provider.createTopicMap(loc); } --- 158,162 ---- private TopicMap newTopicMap() throws Exception { ! Locator loc = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idgen.getObjectId()); return m_provider.createTopicMap(loc); } *************** *** 166,169 **** --- 166,172 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: ProjectionTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/ProjectionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectionTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- ProjectionTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 18,22 **** import junit.framework.TestCase; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; --- 18,22 ---- import junit.framework.TestCase; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; *************** *** 61,67 **** DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getTopicByID("contains")); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINER"), m_tm.getTopicByID("container"))); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINEE"), m_tm.getTopicByID("containee"))); p.setParameters(params); p.initialise(m_tm); --- 61,67 ---- DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getObjectById("contains")); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINER"), m_tm.getObjectById("container"))); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINEE"), m_tm.getObjectById("containee"))); p.setParameters(params); p.initialise(m_tm); *************** *** 88,94 **** assertTrue(row.get(0) instanceof Topic); assertTrue(row.get(1) instanceof Integer); ! if (row.get(0).equals(m_tm.getTopicByID("europe"))) { assertEquals(new Integer(3), row.get(1)); ! } else if (row.get(0).equals(m_tm.getTopicByID("asia"))) { assertEquals(new Integer(2), row.get(1)); } --- 88,94 ---- assertTrue(row.get(0) instanceof Topic); assertTrue(row.get(1) instanceof Integer); ! if (row.get(0).equals(m_tm.getObjectById("europe"))) { assertEquals(new Integer(3), row.get(1)); ! } else if (row.get(0).equals(m_tm.getObjectById("asia"))) { assertEquals(new Integer(2), row.get(1)); } *************** *** 119,122 **** --- 119,125 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: MemoryQueryEvaluatorImplTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/MemoryQueryEvaluatorImplTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MemoryQueryEvaluatorImplTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- MemoryQueryEvaluatorImplTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 18,22 **** import junit.framework.TestCase; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.TologResultsSet; import org.tmapiutils.query.tolog.QueryEvaluator; --- 18,22 ---- import junit.framework.TestCase; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologResultsSet; import org.tmapiutils.query.tolog.QueryEvaluator; *************** *** 148,152 **** assertEquals(3, results.getNumRows()); Object[][] expectedResults = new Object [][] { ! new Object[] { tm.getObjectByID("redblock"), tm.getObjectByID("blueblock") } }; checkResultsSet("simpleQuery", results, 2, 3, expectedResults); --- 148,152 ---- assertEquals(3, results.getNumRows()); Object[][] expectedResults = new Object [][] { ! new Object[] { tm.getObjectById("redblock"), tm.getObjectById("blueblock") } }; checkResultsSet("simpleQuery", results, 2, 3, expectedResults); *************** *** 162,166 **** for (int k = 0; k < expectedRow.length; k++) { if (expectedRow[k] instanceof TopicRef) { ! expectedRow[k] = tm.getObjectByID(((TopicRef)expectedRow[k]).id); } } --- 162,166 ---- for (int k = 0; k < expectedRow.length; k++) { if (expectedRow[k] instanceof TopicRef) { ! expectedRow[k] = tm.getObjectById(((TopicRef)expectedRow[k]).id); } } *************** *** 186,191 **** public void testInlineModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getTopicByID("greenblock"); ! Topic blueblock = tm.getTopicByID("blueblock"); assertNotNull(tm); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); --- 186,191 ---- public void testInlineModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getObjectById("greenblock"); ! Topic blueblock = tm.getObjectById("blueblock"); assertNotNull(tm); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); *************** *** 203,208 **** public void testExternalModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getTopicByID("greenblock"); ! Topic blueblock = tm.getTopicByID("blueblock"); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); qe.addRulesModule(new FileInputStream(new File(m_tologTestDir, "blocks.tl")), "blocks"); --- 203,208 ---- public void testExternalModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getObjectById("greenblock"); ! Topic blueblock = tm.getObjectById("blueblock"); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); qe.addRulesModule(new FileInputStream(new File(m_tologTestDir, "blocks.tl")), "blocks"); *************** *** 223,233 **** TologResultsSet rs = qe.execute("descendant-of(bart, $WHO) ?"); assertEquals(3, rs.getNumRows()); ! Topic homer = tm.getTopicByID("homer"); ! Topic marge = tm.getTopicByID("marge"); ! Topic granpa = tm.getTopicByID("granpa"); for (int i =0 ; i <3; i++) { List row = rs.getRow(i); Topic t = (Topic)row.get(0); ! System.out.println(t.getID()); assertTrue(row.contains(homer) || row.contains(marge) || row.contains(granpa)); } --- 223,233 ---- TologResultsSet rs = qe.execute("descendant-of(bart, $WHO) ?"); assertEquals(3, rs.getNumRows()); ! Topic homer = tm.getObjectById("homer"); ! Topic marge = tm.getObjectById("marge"); ! Topic granpa = tm.getObjectById("granpa"); for (int i =0 ; i <3; i++) { List row = rs.getRow(i); Topic t = (Topic)row.get(0); ! System.out.println(t.getObjectId()); assertTrue(row.contains(homer) || row.contains(marge) || row.contains(granpa)); } *************** *** 246,252 **** TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); ! TologResultsSet rst = qe.execute("select $A from restson($A:upper, %1:lower)?", new Object[] { tm.getTopicByID("redblock")}); assertEquals(1, rst.getNumRows()); ! assertEquals(tm.getTopicByID("yellowblock"), rst.getRow(0).get(0)); } --- 246,252 ---- TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); ! TologResultsSet rst = qe.execute("select $A from restson($A:upper, %1:lower)?", new Object[] { tm.getObjectById("redblock")}); assertEquals(1, rst.getNumRows()); ! assertEquals(tm.getObjectById("yellowblock"), rst.getRow(0).get(0)); } *************** *** 271,275 **** Object o = it.next(); if (o instanceof TopicMapObject) { ! ret.append(((TopicMapObject)o).getID()); } else { ret.append(o.toString()); --- 271,275 ---- Object o = it.next(); if (o instanceof TopicMapObject) { ! ret.append(((TopicMapObject)o).getObjectId()); } else { ret.append(o.toString()); *************** *** 319,322 **** --- 319,325 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: TologParserTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/TologParserTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologParserTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- TologParserTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 249,253 **** TopicMap tm = createTopicMap(); Topic tm4jorg = tm.createTopic(null); ! String id = tm4jorg.getID(); Topic tm4j = tm.createTopic("tm4j"); Topic respfor = tm.createTopic("responsiblefor"); --- 249,253 ---- TopicMap tm = createTopicMap(); Topic tm4jorg = tm.createTopic(null); ! String id = tm4jorg.getObjectId(); Topic tm4j = tm.createTopic("tm4j"); Topic respfor = tm.createTopic("responsiblefor"); *************** *** 312,315 **** --- 312,318 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: TologParserTestBase.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/TologParserTestBase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologParserTestBase.java 6 Mar 2005 17:34:06 -0000 1.1 --- TologParserTestBase.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 12,16 **** import java.io.StringReader; ! import org.tm4j.net.Locator; import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapProvider; --- 12,16 ---- import java.io.StringReader; ! import org.tmapi.core.Locator; import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapProvider; *************** *** 70,74 **** public TopicMap getTopicMapFromLTMString(String str) throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getID()); SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(str), l, new LTMBuilder()); return m_provider.addTopicMap(src); --- 70,74 ---- public TopicMap getTopicMapFromLTMString(String str) throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getObjectId()); SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(str), l, new LTMBuilder()); return m_provider.addTopicMap(src); *************** *** 76,80 **** public TopicMap createTopicMap() throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getID()); return m_provider.createTopicMap(l); } --- 76,80 ---- public TopicMap createTopicMap() throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getObjectId()); return m_provider.createTopicMap(l); } *************** *** 82,85 **** --- 82,88 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import |
