[Javamatch-cvs] javamatch/src/net/sourceforge/javamatch/query/test QuerySetTest.java,1.3,1.4

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

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

Modified Files:
	QuerySetTest.java 
Log Message:
Bug fix: Also include the match value of the required queries

Index: QuerySetTest.java
===================================================================
RCS file: /cvsroot/javamatch/javamatch/src/net/sourceforge/javamatch/query/test/QuerySetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QuerySetTest.java	14 Sep 2004 06:59:37 -0000	1.3
--- QuerySetTest.java	23 Sep 2004 06:04:06 -0000	1.4
***************
*** 99,104 ****
  			QuerySet curQuery = new QuerySet();
  			curQuery.addRequired(new ConstantMatch(1.0f));
  			curQuery.addPreferred(new ConstantMatch(0.3f));
! 			assertEquals(0.15f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
  			fail("unable to match");
--- 99,114 ----
  			QuerySet curQuery = new QuerySet();
  			curQuery.addRequired(new ConstantMatch(1.0f));
+ 			assertEquals(1.0f, curQuery.getMatchValue(new Object()), 0.01f);
+ 		} catch (MatchException me) {
+ 			fail("unable to match");
+ 		}
+     }
+ 
+     public void testRequiredPreferredMatch() {
+ 		try {
+ 			QuerySet curQuery = new QuerySet();
+ 			curQuery.addRequired(new ConstantMatch(1.0f));
  			curQuery.addPreferred(new ConstantMatch(0.3f));
! 			assertEquals(0.65f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
  			fail("unable to match");
***************
*** 106,110 ****
      }
  
!     public void testRequiredMismatch() {
  		try {
  			QuerySet curQuery = new QuerySet();
--- 116,120 ----
      }
  
!     public void testRequiredPreferredMismatch() {
  		try {
  			QuerySet curQuery = new QuerySet();