[Javamatch-cvs] javamatch/src/net/sourceforge/javamatch/query/test QuerySetTest.java,NONE,1.1 TestAll.java,1.3,1.4 MatchListStub.java,1.1.1.1,NONE MatchListTest.java,1.1.1.1,NONE OrListTest.java,1.1.1.1,NONE

[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-serv30020/query/test

Modified Files:
	TestAll.java 
Added Files:
	QuerySetTest.java 
Removed Files:
	MatchListStub.java MatchListTest.java OrListTest.java 
Log Message:
Replace MatchList, AndList, OrList with QuerySet

--- OrListTest.java DELETED ---

--- MatchListTest.java DELETED ---

Index: TestAll.java
===================================================================
RCS file: /cvsroot/javamatch/javamatch/src/net/sourceforge/javamatch/query/test/TestAll.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestAll.java	13 Sep 2004 08:45:48 -0000	1.3
--- TestAll.java	13 Sep 2004 11:32:19 -0000	1.4
***************
*** 33,38 ****
      public static TestSuite suite() {
          TestSuite suite = new TestSuite();
!         suite.addTestSuite(OrListTest.class);
!         suite.addTestSuite(MatchListTest.class);
          suite.addTestSuite(NumericQueryTest.class);
          suite.addTestSuite(NumberEqualsTest.class);
--- 33,37 ----
      public static TestSuite suite() {
          TestSuite suite = new TestSuite();
!         suite.addTestSuite(QuerySetTest.class);
          suite.addTestSuite(NumericQueryTest.class);
          suite.addTestSuite(NumberEqualsTest.class);

--- MatchListStub.java DELETED ---

--- NEW FILE: QuerySetTest.java ---
/* JavaMatch: Matching engine for Java runtime data structures
 * Copyright (C) 2004 Walter van Iterson
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
package net.sourceforge.javamatch.query.test;

import junit.framework.*;
import net.sourceforge.javamatch.engine.*;
import net.sourceforge.javamatch.query.*;

/**
 * Class QuerySetTest tests the QuerySet functionality
 */
public class QuerySetTest extends TestCase {
    public QuerySetTest(String name) {
        super(name);
    }

    public void testAddNullRequiredQuery() {
        QuerySet curQuery = new QuerySet();
		try {
			curQuery.addRequiredQuery(null);
			fail("Shouldn't be able to add null required Query");
		} catch (NullPointerException npe) {
			// should occur
		}
    }

	public void testTwoPassRequired() {
        QuerySet curQuery = new QuerySet();
		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());
	}
	
	public void testNoTwoPassRequired() {
        QuerySet curQuery = new QuerySet();
        curQuery.addRequiredQuery(new ConstantMatch(0.4f));
        curQuery.addRequiredQuery(new ConstantMatch(0.3f));
		assertFalse(curQuery.isTwoPass());
	}


    public void testAddNullPreferredQuery() {
        QuerySet curQuery = new QuerySet();
		try {
			curQuery.addPreferredQuery(null);
			fail("Shouldn't be able to add null preferred Query");
		} catch (NullPointerException npe) {
			// should occur
		}
    }

    public void testAddNullWeightedPreferredQuery() {
        QuerySet curQuery = new QuerySet();
		try {
			curQuery.addPreferredQuery(null, 1f);
			fail("Shouldn't be able to add null preferred Query");
		} catch (NullPointerException npe) {
			// should occur
		}
    }

	public void testTwoPassPreferred() {
        QuerySet curQuery = new QuerySet();
		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());
	}
	
	public void testNoTwoPassPreferred() {
        QuerySet curQuery = new QuerySet();
        curQuery.addPreferredQuery(new ConstantMatch(0.4f));
        curQuery.addPreferredQuery(new ConstantMatch(0.3f));
		assertFalse(curQuery.isTwoPass());
	}

    public void testRequiredMatch() {
		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) {
			fail("unable to match");
		}
    }

    public void testRequiredMismatch() {
		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) {
			fail("unable to match");
		}
    }

    public void testSingleValuePreferred() {
		try {
			QuerySet curQuery = new QuerySet();
			curQuery.addPreferredQuery(new ConstantMatch(0.3f));
			assertEquals(0.3f, curQuery.getMatchValue(new Object()), 0.01f);
		} catch (MatchException me) {
			fail("unable to match");
		}
    }

    public void testSingleWeighedValuePreferred() {
		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) {
			fail("unable to match");
		}
    }

    public void testDoubleValuePreferred() {
		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) {
			fail("unable to match");
		}
    }
    
    public void testDoubleWeighedValuePreferred() {
		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) {
			fail("unable to match");
		}
    }
}