[Javamatch-cvs] javamatch/src/net/sourceforge/javamatch/engine/test MatchEngineTest.java,1.1.1.1,1.2 MatchResultTest.java,1.1.1.1,1.2

[Walter v. I. <it...@us...>]

Update of /cvsroot/javamatch/javamatch/src/net/sourceforge/javamatch/engine/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16889/net/sourceforge/javamatch/engine/test

Modified Files:
	MatchEngineTest.java MatchResultTest.java 
Log Message:
Add listener mechanism for query started / finished callbacks
Added retrieveObject and discardObject, for access to persistent storage

Index: MatchEngineTest.java
===================================================================
RCS file: /cvsroot/javamatch/javamatch/src/net/sourceforge/javamatch/engine/test/MatchEngineTest.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MatchEngineTest.java	3 Sep 2004 08:21:22 -0000	1.1.1.1
--- MatchEngineTest.java	7 Sep 2004 09:41:07 -0000	1.2
***************
*** 66,68 ****
--- 66,125 ----
  		}
  	}
+ 
+ 	public void testAddNullListener() {
+ 		MatchEngine engine = new MatchEngine();
+ 		try {
+ 			engine.addMatchListener(null);
+ 			fail("Shouldn't be able to add a null listener");
+ 		} catch (NullPointerException npe) {
+ 			// should occur
+ 		}
+ 	}
+ 
+ 	public void testAddListenerTwice() {
+ 		MatchEngine engine = new MatchEngine();
+ 		MatchListener listener = new MatchListenerMock();
+ 		engine.addMatchListener(listener);
+ 		try {
+ 			engine.addMatchListener(listener);
+ 			fail("Shouldn't be able to add a listener twice");
+ 		} catch (IllegalArgumentException iae) {
+ 			// should occur
+ 		}
+ 	}
+ 	
+ 	public void testRemoveNullListener() {
+ 		MatchEngine engine = new MatchEngine();
+ 		try {
+ 			engine.removeMatchListener(null);
+ 			fail("Shouldn't be able to remove a null listener");
+ 		} catch (NullPointerException npe) {
+ 			// should occur
+ 		}
+ 	}
+ 
+ 	public void testRemoveNotAddedListener() {
+ 		MatchEngine engine = new MatchEngine();
+ 		MatchListener listener = new MatchListenerMock();
+ 		try {
+ 			engine.removeMatchListener(listener);
+ 			fail("Shouldn't be able to remove a listener that hasn't been added");
+ 		} catch (IllegalArgumentException iae) {
+ 			// should occur
+ 		}
+ 	}
+ 
+ 	public void testStartStopNotification() {
+ 		try {
+ 			MatchEngine engine = new MatchEngine();
+ 			MatchListenerMock listener = new MatchListenerMock();
+ 			listener.expectMatchQueryStarted();
+ 			listener.expectMatchQueryFinished();
+ 			engine.addMatchListener(listener);
+ 			engine.executeQuery(new ConstantMatch(3f), new Vector());
+ 			listener.validate();
+ 		} catch (MatchException me) {
+ 			fail("Should be a valid match");
+ 		}
+ 	}
  }

Index: MatchResultTest.java
===================================================================
RCS file: /cvsroot/javamatch/javamatch/src/net/sourceforge/javamatch/engine/test/MatchResultTest.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MatchResultTest.java	3 Sep 2004 08:21:22 -0000	1.1.1.1
--- MatchResultTest.java	7 Sep 2004 09:41:07 -0000	1.2
***************
*** 27,64 ****
   */
  public class MatchResultTest extends TestCase {
      public MatchResultTest(String name) {
          super(name);
      }
  
  	public void testAddResultItem() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		result.addResultItem(item);
          
  		Iterator resultIterator = result.getResultIterator();
! 		Object returnedItem = resultIterator.next();
! 		assertTrue(item == returnedItem);
  		assertFalse(resultIterator.hasNext());
  	}
  
  	public void testAddTwoResultItems() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		result.addResultItem(item);
! 		ResultItem item2 = new ResultItem();
! 		result.addResultItem(item2);
          
  		Iterator resultIterator = result.getResultIterator();
! 		Object returnedItem = resultIterator.next();
! 		assertTrue(item2 == returnedItem);
! 		returnedItem = resultIterator.next();
! 		assertTrue(item == returnedItem);
  		assertFalse(resultIterator.hasNext());
  	}
  
  	public void testAddNullResultItem() {
! 		MatchResult result = new MatchResult();
  		try {
! 			result.addResultItem(null);
  			fail("Shouldn't be able to add null result");
  		} catch (NullPointerException npe) {
--- 27,67 ----
   */
  public class MatchResultTest extends TestCase {
+ 	private MatchEngine engine;
+ 
      public MatchResultTest(String name) {
          super(name);
+ 		engine = new MatchEngine();
      }
  
  	public void testAddResultItem() {
! 		MatchResult result = new MatchResult(engine);
! 		Object dataObject = new Object();
! 		result.addResultItem(dataObject, 0f);
          
  		Iterator resultIterator = result.getResultIterator();
! 		ResultItem returnedItem = (ResultItem)resultIterator.next();
! 		assertTrue(dataObject == returnedItem.getMatchedObject());
  		assertFalse(resultIterator.hasNext());
  	}
  
  	public void testAddTwoResultItems() {
! 		MatchResult result = new MatchResult(engine);
! 		Object dataObject = new Object();
! 		result.addResultItem(dataObject, 0f);
! 		Object dataObject2 = new Object();
! 		result.addResultItem(dataObject2, 0f);
          
  		Iterator resultIterator = result.getResultIterator();
! 		ResultItem returnedItem = (ResultItem)resultIterator.next();
! 		assertTrue(dataObject2 == returnedItem.getMatchedObject());
! 		returnedItem = (ResultItem)resultIterator.next();
! 		assertTrue(dataObject == returnedItem.getMatchedObject());
  		assertFalse(resultIterator.hasNext());
  	}
  
  	public void testAddNullResultItem() {
! 		MatchResult result = new MatchResult(engine);
  		try {
! 			result.addResultItem(null, 0f);
  			fail("Shouldn't be able to add null result");
  		} catch (NullPointerException npe) {
***************
*** 68,83 ****
  
  	public void testAddSorted123() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 71,78 ----
  
  	public void testAddSorted123() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 88,103 ****
  
  	public void testAddSorted132() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 83,90 ----
  
  	public void testAddSorted132() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.2f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 108,123 ****
  
  	public void testAddSorted213() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 95,102 ----
  
  	public void testAddSorted213() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.3f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 128,143 ****
  
  	public void testAddSorted231() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 107,114 ----
  
  	public void testAddSorted231() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.1f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 148,163 ****
  
  	public void testAddSorted312() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 119,126 ----
  
  	public void testAddSorted312() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 168,183 ****
  
  	public void testAddSorted321() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 131,138 ----
  
  	public void testAddSorted321() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.1f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 188,212 ****
  
  	public void testAddSorted21232() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
! 
  
  		Iterator resultIterator = result.getResultIterator();
--- 143,152 ----
  
  	public void testAddSorted21232() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.2f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 219,262 ****
  
  	public void testAddMax0123456789() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.5f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.6f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.7f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.8f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.9f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 159,173 ----
  
  	public void testAddMax0123456789() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.0f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.4f);
! 		result.addResultItem(new Object(), 0.5f);
! 		result.addResultItem(new Object(), 0.6f);
! 		result.addResultItem(new Object(), 0.7f);
! 		result.addResultItem(new Object(), 0.8f);
! 		result.addResultItem(new Object(), 0.9f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 274,317 ****
  	
  	public void testAddMax9876543210() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.9f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.8f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.7f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.6f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.5f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 185,199 ----
  	
  	public void testAddMax9876543210() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.9f);
! 		result.addResultItem(new Object(), 0.8f);
! 		result.addResultItem(new Object(), 0.7f);
! 		result.addResultItem(new Object(), 0.6f);
! 		result.addResultItem(new Object(), 0.5f);
! 		result.addResultItem(new Object(), 0.4f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.0f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 329,376 ****
  
  	public void testAddMoreThanMax01234567890() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.5f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.6f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.7f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.8f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.9f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 211,226 ----
  
  	public void testAddMoreThanMax01234567890() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.0f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.4f);
! 		result.addResultItem(new Object(), 0.5f);
! 		result.addResultItem(new Object(), 0.6f);
! 		result.addResultItem(new Object(), 0.7f);
! 		result.addResultItem(new Object(), 0.8f);
! 		result.addResultItem(new Object(), 0.9f);
! 		result.addResultItem(new Object(), 0.0f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 388,435 ****
  	
  	public void testAddMoreThanMax01234567891() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.5f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.6f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.7f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.8f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.9f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 238,253 ----
  	
  	public void testAddMoreThanMax01234567891() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.0f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.4f);
! 		result.addResultItem(new Object(), 0.5f);
! 		result.addResultItem(new Object(), 0.6f);
! 		result.addResultItem(new Object(), 0.7f);
! 		result.addResultItem(new Object(), 0.8f);
! 		result.addResultItem(new Object(), 0.9f);
! 		result.addResultItem(new Object(), 0.1f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 447,494 ****
  
  	public void testAddMoreThanMax01234516789() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.5f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.6f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.7f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.8f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.9f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 265,280 ----
  
  	public void testAddMoreThanMax01234516789() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.0f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.4f);
! 		result.addResultItem(new Object(), 0.5f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.6f);
! 		result.addResultItem(new Object(), 0.7f);
! 		result.addResultItem(new Object(), 0.8f);
! 		result.addResultItem(new Object(), 0.9f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 506,557 ****
  
  	public void testAddMoreThanMax012345226789() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.0f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.5f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.6f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.7f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.8f);
! 		result.addResultItem(item);	
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.9f);
! 		result.addResultItem(item);	
  
  		Iterator resultIterator = result.getResultIterator();
--- 292,308 ----
  
  	public void testAddMoreThanMax012345226789() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.0f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.4f);
! 		result.addResultItem(new Object(), 0.5f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.6f);
! 		result.addResultItem(new Object(), 0.7f);
! 		result.addResultItem(new Object(), 0.8f);
! 		result.addResultItem(new Object(), 0.9f);
  
  		Iterator resultIterator = result.getResultIterator();
***************
*** 569,589 ****
  
  	public void testSetMaxNumResultItems() {
! 		MatchResult result = new MatchResult();
  		result.setMaxNumResultItems(3);
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.2f);
! 		result.addResultItem(item);	
! 		
! 		item = new ResultItem();
! 		item.setMatchValue(0.3f);
! 		result.addResultItem(item);
! 
! 		item = new ResultItem();
! 		item.setMatchValue(0.4f);
! 		result.addResultItem(item);	
  		
  		Iterator resultIterator = result.getResultIterator();
--- 320,330 ----
  
  	public void testSetMaxNumResultItems() {
! 		MatchResult result = new MatchResult(engine);
  		result.setMaxNumResultItems(3);
! 		result.addResultItem(new Object(), 0.0f);
! 		result.addResultItem(new Object(), 0.1f);
! 		result.addResultItem(new Object(), 0.2f);
! 		result.addResultItem(new Object(), 0.3f);
! 		result.addResultItem(new Object(), 0.4f);
  		
  		Iterator resultIterator = result.getResultIterator();
***************
*** 595,602 ****
  
  	public void testSetMaxNumResultItemsAfterAdd() {
! 		MatchResult result = new MatchResult();
! 		ResultItem item = new ResultItem();
! 		item.setMatchValue(0.1f);
! 		result.addResultItem(item);
  		try {
  			result.setMaxNumResultItems(3);
--- 336,341 ----
  
  	public void testSetMaxNumResultItemsAfterAdd() {
! 		MatchResult result = new MatchResult(engine);
! 		result.addResultItem(new Object(), 0.1f);
  		try {
  			result.setMaxNumResultItems(3);