Split check and test functionality... if and check now take tests as children, adds all, any, none and not as building blocks

3 files changed, 17 insertions, 16 deletions

diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam
index 068394f..3e63abb 100644
--- a/project2/sql/Jamfile.jam
+++ b/project2/sql/Jamfile.jam
@@ -32,7 +32,7 @@ cpp-pch pch : pch.hpp :
 	;
 lib p2sql :
 	pch
-	sqlCheck.cpp sqlWriter.cpp sqlTask.cpp sqlMergeTask.cpp sqlRows.cpp sqlCache.cpp sqlVariableBinder.cpp tablepatch.cpp rdbmsDataSource.cpp
+	sqlTest.cpp sqlWriter.cpp sqlTask.cpp sqlMergeTask.cpp sqlRows.cpp sqlCache.cpp sqlVariableBinder.cpp tablepatch.cpp rdbmsDataSource.cpp
 	sqlHandleAsVariableType.cpp
 	../../libdbpp//dbpp
 	:
diff --git a/project2/sql/sqlCheck.cpp b/project2/sql/sqlTest.cpp
index b1d369c..3cf25b7 100644
--- a/project2/sql/sqlCheck.cpp
+++ b/project2/sql/sqlTest.cpp
@@ -1,5 +1,5 @@
 #include <pch.hpp>
-#include "sqlCheck.h"
+#include "sqlTest.h"
 #include "scriptLoader.h"
 #include "selectcommand.h"
 #include "column.h"
@@ -9,12 +9,13 @@
 #include <boost/foreach.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
-DECLARE_LOADER("sqlcheck", SqlCheck);
+DECLARE_LOADER("sqltest", SqlTest);
 
 class CantCompareNulls : public std::exception { };
 
-SqlCheck::SqlCheck(ScriptNodePtr p) :
-	ParamChecker(p),
+SqlTest::SqlTest(ScriptNodePtr p) :
+	SourceObject(p),
+	Test(p),
 	dataSource(p, "datasource"),
 	filter(p, "filter", ""),
 	testOp(p, "testOp", "=="),
@@ -23,12 +24,12 @@ SqlCheck::SqlCheck(ScriptNodePtr p) :
 {
 }
 
-SqlCheck::~SqlCheck()
+SqlTest::~SqlTest()
 {
 }
 
 void
-SqlCheck::loadComplete(const CommonObjects * co)
+SqlTest::loadComplete(const CommonObjects * co)
 {
 	db = co->dataSource<RdbmsDataSource>(dataSource());
 }
@@ -86,7 +87,7 @@ class HandleDoCompare : public DB::HandleField {
 		std::string testOp;
 };
 bool
-SqlCheck::performCheck() const
+SqlTest::passes() const
 {
 	boost::shared_ptr<DB::SelectCommand> query = boost::shared_ptr<DB::SelectCommand>(
 			db->getWritable().newSelectCommand(sqlCommand.getSqlFor(filter())));
diff --git a/project2/sql/sqlCheck.h b/project2/sql/sqlTest.h
index 86492dc..f722424 100644
--- a/project2/sql/sqlCheck.h
+++ b/project2/sql/sqlTest.h
@@ -1,20 +1,20 @@
-#ifndef SQLCHECK_H
-#define SQLCHECK_H
+#ifndef SQLTEST_H
+#define SQLTEST_H
 
-#include "paramChecker.h"
+#include "test.h"
 #include "sqlWriter.h"
 
 namespace DB { class SelectCommand; }
 class RdbmsDataSource;
 
-/// Project2 component to check the value of a variable against an RDBMS data source
-class SqlCheck : public ParamChecker {
+/// Project2 component to test the value of a variable against an RDBMS data source
+class SqlTest : public Test {
 	public:
-		SqlCheck(ScriptNodePtr p);
-		virtual ~SqlCheck();
+		SqlTest(ScriptNodePtr p);
+		virtual ~SqlTest();
 
 		virtual void loadComplete(const CommonObjects *);
-		bool performCheck() const;
+		bool passes() const;
 
 		const Variable dataSource;
 		const Variable filter;