[Reasoner4j-user] SF.net SVN: reasoner4j:[40] trunk/reasoner4j/src

[<luc...@us...>]

Revision: 40
          http://reasoner4j.svn.sourceforge.net/reasoner4j/?rev=40&view=rev
Author:   luc_peuvrier
Date:     2010-12-25 04:05:44 +0000 (Sat, 25 Dec 2010)

Log Message:
-----------
test failure correction

Modified Paths:
--------------
    trunk/reasoner4j/src/main/java/net/sf/reasoner4j/rete/entity/AssertedPremiseTable.java
    trunk/reasoner4j/src/test/java/net/sf/reasoner4j/TestReasoner.java

Modified: trunk/reasoner4j/src/main/java/net/sf/reasoner4j/rete/entity/AssertedPremiseTable.java
===================================================================
--- trunk/reasoner4j/src/main/java/net/sf/reasoner4j/rete/entity/AssertedPremiseTable.java	2010-12-25 03:54:07 UTC (rev 39)
+++ trunk/reasoner4j/src/main/java/net/sf/reasoner4j/rete/entity/AssertedPremiseTable.java	2010-12-25 04:05:44 UTC (rev 40)
@@ -169,8 +169,12 @@
 			object = iterator.next();
 			assert object != null : "object must be defined";
 		}
-		knowledgeBase.removeFact(new CauseIdentifiedFact<T>(subject, predicate,
-				object, ruleIdentifier), false);
+		final IFact<T> fact = new Fact<T>(subject, predicate, object);
+		if (factSetListener != null) {
+			factSetListener.retracted(fact);
+		}
+		knowledgeBase.removeFact(new CauseIdentifiedFact<T>(fact,
+				ruleIdentifier), false);
 	}
 
 	@SuppressWarnings("unchecked")

Modified: trunk/reasoner4j/src/test/java/net/sf/reasoner4j/TestReasoner.java
===================================================================
--- trunk/reasoner4j/src/test/java/net/sf/reasoner4j/TestReasoner.java	2010-12-25 03:54:07 UTC (rev 39)
+++ trunk/reasoner4j/src/test/java/net/sf/reasoner4j/TestReasoner.java	2010-12-25 04:05:44 UTC (rev 40)
@@ -67,6 +67,7 @@
 
 	private static final String REPLACE_FLAG = "r";
 	private Set<IFact<String>> expectedFactSet;
+	private String rscTestFileName;
 
 	@Override
 	protected void tearDown() throws Exception {
@@ -81,7 +82,7 @@
 				testListInputStream));
 		String line;
 		while ((line = reader.readLine()) != null) {
-			final String rscTestFileName = line.trim();
+			rscTestFileName = line.trim();
 			final InputStream testFileInputStream = ClassLoader
 					.getSystemResourceAsStream("test_def/" + rscTestFileName);
 			test(testFileInputStream);
@@ -147,8 +148,8 @@
 						currentRule = null;
 					}
 				} else {
-					throw new ReasonerException("\"" + line
-							+ "\" is bad identifier");
+					throw new ReasonerException(rscTestFileName + "test: \""
+							+ line + "\" is bad identifier");
 				}
 			}
 		}
@@ -177,7 +178,6 @@
 					.getType())) {
 				((AssertedPremiseTable<String>) premiseTable)
 						.setFactSetListener(this);
-				// premiseTable.addListener(this);
 			}
 		}
 	}
@@ -192,21 +192,21 @@
 		final Iterator<IFact<String>> iterator = kbFactSet.iterator();
 		while (iterator.hasNext()) {
 			final IFact<String> kbFact = iterator.next();
-			assertTrue("unexpected fact " + kbFact + " in kb",
-					expectedFactSet.contains(kbFact));
+			assertTrue(rscTestFileName + "test: unexpected fact " + kbFact
+					+ " in kb", expectedFactSet.contains(kbFact));
 		}
 		for (IFact<String> expectedFact : expectedFactSet) {
-			assertTrue("missing fact " + expectedFact + " in fact set",
-					kbFactSet.contains(expectedFact));
-			assertTrue("missing fact " + expectedFact + " in kb",
-					kb.contains(expectedFact));
+			assertTrue(rscTestFileName + "test: missing fact " + expectedFact
+					+ " in fact set", kbFactSet.contains(expectedFact));
+			assertTrue(rscTestFileName + "test: missing fact " + expectedFact
+					+ " in kb", kb.contains(expectedFact));
 		}
 	}
 
 	private IFact<String> createFact(final String[] definition) {
 		if (definition.length != 4) {
-			throw new ReasonerException("bad definition "
-					+ Arrays.toString(definition));
+			throw new ReasonerException(rscTestFileName
+					+ "test: bad definition " + Arrays.toString(definition));
 		}
 		return new Fact<String>(definition[1], definition[2], definition[3]);
 	}


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