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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	QuerySetTest.java 
Log Message:
Remove "Query" from addRequired and addPreferred

Index: QuerySetTest.java
===================================================================
RCS file: /cvsroot/javamatch/javamatch/src/net/sourceforge/javamatch/query/test/QuerySetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QuerySetTest.java	13 Sep 2004 11:32:19 -0000	1.1
--- QuerySetTest.java	13 Sep 2004 13:39:24 -0000	1.2
***************
*** 33,37 ****
          QuerySet curQuery = new QuerySet();
  		try {
! 			curQuery.addRequiredQuery(null);
  			fail("Shouldn't be able to add null required Query");
  		} catch (NullPointerException npe) {
--- 33,37 ----
          QuerySet curQuery = new QuerySet();
  		try {
! 			curQuery.addRequired(null);
  			fail("Shouldn't be able to add null required Query");
  		} catch (NullPointerException npe) {
***************
*** 44,50 ****
  		MatchMock match = new MatchMock();
  		match.setTwoPass(true);
!         curQuery.addRequiredQuery(match);
!         curQuery.addRequiredQuery(new ConstantMatch(0.4f));
!         curQuery.addRequiredQuery(new ConstantMatch(0.3f));
  		assertTrue(curQuery.isTwoPass());
  	}
--- 44,50 ----
  		MatchMock match = new MatchMock();
  		match.setTwoPass(true);
!         curQuery.addRequired(match);
!         curQuery.addRequired(new ConstantMatch(0.4f));
!         curQuery.addRequired(new ConstantMatch(0.3f));
  		assertTrue(curQuery.isTwoPass());
  	}
***************
*** 52,57 ****
  	public void testNoTwoPassRequired() {
          QuerySet curQuery = new QuerySet();
!         curQuery.addRequiredQuery(new ConstantMatch(0.4f));
!         curQuery.addRequiredQuery(new ConstantMatch(0.3f));
  		assertFalse(curQuery.isTwoPass());
  	}
--- 52,57 ----
  	public void testNoTwoPassRequired() {
          QuerySet curQuery = new QuerySet();
!         curQuery.addRequired(new ConstantMatch(0.4f));
!         curQuery.addRequired(new ConstantMatch(0.3f));
  		assertFalse(curQuery.isTwoPass());
  	}
***************
*** 61,65 ****
          QuerySet curQuery = new QuerySet();
  		try {
! 			curQuery.addPreferredQuery(null);
  			fail("Shouldn't be able to add null preferred Query");
  		} catch (NullPointerException npe) {
--- 61,65 ----
          QuerySet curQuery = new QuerySet();
  		try {
! 			curQuery.addPreferred(null);
  			fail("Shouldn't be able to add null preferred Query");
  		} catch (NullPointerException npe) {
***************
*** 71,75 ****
          QuerySet curQuery = new QuerySet();
  		try {
! 			curQuery.addPreferredQuery(null, 1f);
  			fail("Shouldn't be able to add null preferred Query");
  		} catch (NullPointerException npe) {
--- 71,75 ----
          QuerySet curQuery = new QuerySet();
  		try {
! 			curQuery.addPreferred(null, 1f);
  			fail("Shouldn't be able to add null preferred Query");
  		} catch (NullPointerException npe) {
***************
*** 82,88 ****
  		MatchMock match = new MatchMock();
  		match.setTwoPass(true);
!         curQuery.addPreferredQuery(match);
!         curQuery.addPreferredQuery(new ConstantMatch(0.4f));
!         curQuery.addPreferredQuery(new ConstantMatch(0.3f));
  		assertTrue(curQuery.isTwoPass());
  	}
--- 82,88 ----
  		MatchMock match = new MatchMock();
  		match.setTwoPass(true);
!         curQuery.addPreferred(match);
!         curQuery.addPreferred(new ConstantMatch(0.4f));
!         curQuery.addPreferred(new ConstantMatch(0.3f));
  		assertTrue(curQuery.isTwoPass());
  	}
***************
*** 90,95 ****
  	public void testNoTwoPassPreferred() {
          QuerySet curQuery = new QuerySet();
!         curQuery.addPreferredQuery(new ConstantMatch(0.4f));
!         curQuery.addPreferredQuery(new ConstantMatch(0.3f));
  		assertFalse(curQuery.isTwoPass());
  	}
--- 90,95 ----
  	public void testNoTwoPassPreferred() {
          QuerySet curQuery = new QuerySet();
!         curQuery.addPreferred(new ConstantMatch(0.4f));
!         curQuery.addPreferred(new ConstantMatch(0.3f));
  		assertFalse(curQuery.isTwoPass());
  	}
***************
*** 98,103 ****
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addRequiredQuery(new ConstantMatch(1.0f));
! 			curQuery.addPreferredQuery(new ConstantMatch(0.3f));
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
--- 98,103 ----
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addRequired(new ConstantMatch(1.0f));
! 			curQuery.addPreferred(new ConstantMatch(0.3f));
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
***************
*** 109,114 ****
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addRequiredQuery(new ConstantMatch(0.9f));
! 			curQuery.addPreferredQuery(new ConstantMatch(0.3f));
  			assertEquals(0.0f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
--- 109,114 ----
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addRequired(new ConstantMatch(0.9f));
! 			curQuery.addPreferred(new ConstantMatch(0.3f));
  			assertEquals(0.0f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
***************
*** 120,124 ****
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferredQuery(new ConstantMatch(0.3f));
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
--- 120,124 ----
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferred(new ConstantMatch(0.3f));
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
***************
*** 130,134 ****
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferredQuery(new ConstantMatch(0.3f), 0.1f);
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
--- 130,134 ----
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferred(new ConstantMatch(0.3f), 0.1f);
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
***************
*** 140,145 ****
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferredQuery(new ConstantMatch(0.3f));
! 			curQuery.addPreferredQuery(new ConstantMatch(0.2f));
  			assertEquals(0.25f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
--- 140,145 ----
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferred(new ConstantMatch(0.3f));
! 			curQuery.addPreferred(new ConstantMatch(0.2f));
  			assertEquals(0.25f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
***************
*** 151,156 ****
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferredQuery(new ConstantMatch(0.5f));
! 			curQuery.addPreferredQuery(new ConstantMatch(0.2f), 2f);
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {
--- 151,156 ----
  		try {
  			QuerySet curQuery = new QuerySet();
! 			curQuery.addPreferred(new ConstantMatch(0.5f));
! 			curQuery.addPreferred(new ConstantMatch(0.2f), 2f);
  			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
  		} catch (MatchException me) {