From 1e449470d0d813b4eb3a361081237c9f4cde3222 Mon Sep 17 00:00:00 2001
From: niharlcp1 <niharlcp1>
Date: Fri, 12 Dec 2008 12:54:31 +0000
Subject: [PATCH] Test Script for Predicate

---
 test/dbapi/Predicate/andpredicate1.c    | 2 +-
 test/dbapi/Predicate/exp.test003        | 2 +-
 test/dbapi/Predicate/exp.test003a       | 2 +-
 test/dbapi/Predicate/exp.test003b       | 2 +-
 test/dbapi/Predicate/exp.test003c       | 2 +-
 test/dbapi/Predicate/exp.test004        | 2 +-
 test/dbapi/Predicate/exp.test004a       | 2 +-
 test/dbapi/Predicate/exp.test004b       | 2 +-
 test/dbapi/Predicate/exp.test004c       | 2 +-
 test/dbapi/Predicate/exp.test005        | 2 +-
 test/dbapi/Predicate/exp.test005a       | 2 +-
 test/dbapi/Predicate/exp.test005b       | 2 +-
 test/dbapi/Predicate/exp.test005c       | 2 +-
 test/dbapi/Predicate/exp.test006        | 2 +-
 test/dbapi/Predicate/exp.test006a       | 2 +-
 test/dbapi/Predicate/exp.test006b       | 2 +-
 test/dbapi/Predicate/exp.test006c       | 2 +-
 test/dbapi/Predicate/notandpredicate1.c | 2 +-
 test/dbapi/Predicate/notorpredicate1.c  | 2 +-
 test/dbapi/Predicate/orpredicate1.c     | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/dbapi/Predicate/andpredicate1.c b/test/dbapi/Predicate/andpredicate1.c
index 97516e6b..924b20a0 100644
--- a/test/dbapi/Predicate/andpredicate1.c
+++ b/test/dbapi/Predicate/andpredicate1.c
@@ -67,7 +67,7 @@ int main()
     Condition cond3;
     cond3.setTerm(p4.getPredicate(), OpAnd, p5.getPredicate());
     table->setCondition(&cond3);
-    printf("Predicate: f1 <4 AND f2 >2 \n");
+    printf("Predicate: f1 <4 AND f1 >2 \n");
     conn.startTransaction();
     execAndPrint(table);
     conn.commit();
diff --git a/test/dbapi/Predicate/exp.test003 b/test/dbapi/Predicate/exp.test003
index e8002624..249740a3 100644
--- a/test/dbapi/Predicate/exp.test003
+++ b/test/dbapi/Predicate/exp.test003
@@ -4,6 +4,6 @@ Predicate: f1 ==4 AND f2 >3
 tuple value is 4 4 4 4 4
 Predicate: f1 ==4 AND f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 AND f2 >2 
+Predicate: f1 <4 AND f1 >2 
 tuple value is 3 3 3 3 3
 Predicate: f1 <4 AND f2 >3 
diff --git a/test/dbapi/Predicate/exp.test003a b/test/dbapi/Predicate/exp.test003a
index d71151d6..21d93215 100644
--- a/test/dbapi/Predicate/exp.test003a
+++ b/test/dbapi/Predicate/exp.test003a
@@ -5,6 +5,6 @@ Predicate: f1 ==4 AND f2 >3
 tuple value is 4 4 4 4 4
 Predicate: f1 ==4 AND f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 AND f2 >2 
+Predicate: f1 <4 AND f1 >2 
 tuple value is 3 3 3 3 3
 Predicate: f1 <4 AND f2 >3 
diff --git a/test/dbapi/Predicate/exp.test003b b/test/dbapi/Predicate/exp.test003b
index 309f0007..a5185fa9 100644
--- a/test/dbapi/Predicate/exp.test003b
+++ b/test/dbapi/Predicate/exp.test003b
@@ -5,6 +5,6 @@ Predicate: f1 ==4 AND f2 >3
 tuple value is 4 4 4 4 4
 Predicate: f1 ==4 AND f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 AND f2 >2 
+Predicate: f1 <4 AND f1 >2 
 tuple value is 3 3 3 3 3
 Predicate: f1 <4 AND f2 >3 
diff --git a/test/dbapi/Predicate/exp.test003c b/test/dbapi/Predicate/exp.test003c
index 39c3d75c..798f6c02 100644
--- a/test/dbapi/Predicate/exp.test003c
+++ b/test/dbapi/Predicate/exp.test003c
@@ -6,6 +6,6 @@ Predicate: f1 ==4 AND f2 >3
 tuple value is 4 4 4 4 4
 Predicate: f1 ==4 AND f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 AND f2 >2 
+Predicate: f1 <4 AND f1 >2 
 tuple value is 3 3 3 3 3
 Predicate: f1 <4 AND f2 >3 
diff --git a/test/dbapi/Predicate/exp.test004 b/test/dbapi/Predicate/exp.test004
index 0e549bcb..09ea9d97 100644
--- a/test/dbapi/Predicate/exp.test004
+++ b/test/dbapi/Predicate/exp.test004
@@ -20,7 +20,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 AND f2 >2) 
+Predicate: NOT( f1 <4 AND f1 >2) 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test004a b/test/dbapi/Predicate/exp.test004a
index 40bb745b..b970b095 100644
--- a/test/dbapi/Predicate/exp.test004a
+++ b/test/dbapi/Predicate/exp.test004a
@@ -21,7 +21,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 AND f2 >2) 
+Predicate: NOT( f1 <4 AND f1 >2) 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test004b b/test/dbapi/Predicate/exp.test004b
index 4e3f4e14..4fc30b78 100644
--- a/test/dbapi/Predicate/exp.test004b
+++ b/test/dbapi/Predicate/exp.test004b
@@ -21,7 +21,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 AND f2 >2) 
+Predicate: NOT( f1 <4 AND f1 >2) 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test004c b/test/dbapi/Predicate/exp.test004c
index a564fb56..136aa582 100644
--- a/test/dbapi/Predicate/exp.test004c
+++ b/test/dbapi/Predicate/exp.test004c
@@ -22,7 +22,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 AND f2 >2) 
+Predicate: NOT( f1 <4 AND f1 >2) 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test005 b/test/dbapi/Predicate/exp.test005
index 27f30a7e..35379255 100644
--- a/test/dbapi/Predicate/exp.test005
+++ b/test/dbapi/Predicate/exp.test005
@@ -9,7 +9,7 @@ tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
 Predicate: f1 ==4 OR f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 OR f2 >2 
+Predicate: f1 <4 OR f1 >2 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test005a b/test/dbapi/Predicate/exp.test005a
index e66a642a..d4562d75 100644
--- a/test/dbapi/Predicate/exp.test005a
+++ b/test/dbapi/Predicate/exp.test005a
@@ -10,7 +10,7 @@ tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
 Predicate: f1 ==4 OR f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 OR f2 >2 
+Predicate: f1 <4 OR f1 >2 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test005b b/test/dbapi/Predicate/exp.test005b
index 4e33aff6..1cef0824 100644
--- a/test/dbapi/Predicate/exp.test005b
+++ b/test/dbapi/Predicate/exp.test005b
@@ -10,7 +10,7 @@ tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
 Predicate: f1 ==4 OR f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 OR f2 >2 
+Predicate: f1 <4 OR f1 >2 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test005c b/test/dbapi/Predicate/exp.test005c
index a9093c03..75657971 100644
--- a/test/dbapi/Predicate/exp.test005c
+++ b/test/dbapi/Predicate/exp.test005c
@@ -11,7 +11,7 @@ tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
 Predicate: f1 ==4 OR f2 ==4 
 tuple value is 4 4 4 4 4
-Predicate: f1 <4 OR f2 >2 
+Predicate: f1 <4 OR f1 >2 
 tuple value is 0 0 0 0 0
 tuple value is 1 1 1 1 1
 tuple value is 2 2 2 2 2
diff --git a/test/dbapi/Predicate/exp.test006 b/test/dbapi/Predicate/exp.test006
index 2ddb4529..09b8c6fc 100644
--- a/test/dbapi/Predicate/exp.test006
+++ b/test/dbapi/Predicate/exp.test006
@@ -15,7 +15,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 OR f2 >2) 
+Predicate: NOT( f1 <4 OR f1 >2) 
 Predicate: NOT( f1 <4 OR f2 >3) 
 Predicate: ( f1 <4 OR (NOT(f2 >3)) 
 tuple value is 0 0 0 0 0
diff --git a/test/dbapi/Predicate/exp.test006a b/test/dbapi/Predicate/exp.test006a
index 29a0e6ac..d8c9bd74 100644
--- a/test/dbapi/Predicate/exp.test006a
+++ b/test/dbapi/Predicate/exp.test006a
@@ -16,7 +16,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 OR f2 >2) 
+Predicate: NOT( f1 <4 OR f1 >2) 
 Predicate: NOT( f1 <4 OR f2 >3) 
 Predicate: ( f1 <4 OR (NOT(f2 >3)) 
 tuple value is 0 0 0 0 0
diff --git a/test/dbapi/Predicate/exp.test006b b/test/dbapi/Predicate/exp.test006b
index ad519667..46fd4e09 100644
--- a/test/dbapi/Predicate/exp.test006b
+++ b/test/dbapi/Predicate/exp.test006b
@@ -16,7 +16,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 OR f2 >2) 
+Predicate: NOT( f1 <4 OR f1 >2) 
 Predicate: NOT( f1 <4 OR f2 >3) 
 Predicate: ( f1 <4 OR (NOT(f2 >3)) 
 tuple value is 0 0 0 0 0
diff --git a/test/dbapi/Predicate/exp.test006c b/test/dbapi/Predicate/exp.test006c
index 89505780..c3715638 100644
--- a/test/dbapi/Predicate/exp.test006c
+++ b/test/dbapi/Predicate/exp.test006c
@@ -17,7 +17,7 @@ tuple value is 6 6 6 6 6
 tuple value is 7 7 7 7 7
 tuple value is 8 8 8 8 8
 tuple value is 9 9 9 9 9
-Predicate: NOT( f1 <4 OR f2 >2) 
+Predicate: NOT( f1 <4 OR f1 >2) 
 Predicate: NOT( f1 <4 OR f2 >3) 
 Predicate: ( f1 <4 OR (NOT(f2 >3)) 
 tuple value is 0 0 0 0 0
diff --git a/test/dbapi/Predicate/notandpredicate1.c b/test/dbapi/Predicate/notandpredicate1.c
index b606268b..28392e9c 100644
--- a/test/dbapi/Predicate/notandpredicate1.c
+++ b/test/dbapi/Predicate/notandpredicate1.c
@@ -68,7 +68,7 @@ int main()
     cond3.setTerm(p4.getPredicate(), OpAnd, p5.getPredicate());
     cond3a.setTerm(cond3.getPredicate(), OpNot);
     table->setCondition(&cond3a);
-    printf("Predicate: NOT( f1 <4 AND f2 >2) \n");
+    printf("Predicate: NOT( f1 <4 AND f1 >2) \n");
     conn.startTransaction();
     execAndPrint(table);
     conn.commit();
diff --git a/test/dbapi/Predicate/notorpredicate1.c b/test/dbapi/Predicate/notorpredicate1.c
index a9923b52..0f4c13eb 100644
--- a/test/dbapi/Predicate/notorpredicate1.c
+++ b/test/dbapi/Predicate/notorpredicate1.c
@@ -68,7 +68,7 @@ int main()
     cond3.setTerm(p4.getPredicate(), OpOr, p5.getPredicate());
     cond3a.setTerm(cond3.getPredicate(), OpNot);
     table->setCondition(&cond3a);
-    printf("Predicate: NOT( f1 <4 OR f2 >2) \n");
+    printf("Predicate: NOT( f1 <4 OR f1 >2) \n");
     conn.startTransaction();
     execAndPrint(table);
     conn.commit();
diff --git a/test/dbapi/Predicate/orpredicate1.c b/test/dbapi/Predicate/orpredicate1.c
index c83b9b38..1e1e4611 100644
--- a/test/dbapi/Predicate/orpredicate1.c
+++ b/test/dbapi/Predicate/orpredicate1.c
@@ -65,7 +65,7 @@ int main()
     Condition cond3;
     cond3.setTerm(p4.getPredicate(), OpOr, p5.getPredicate());
     table->setCondition(&cond3);
-    printf("Predicate: f1 <4 OR f2 >2 \n");
+    printf("Predicate: f1 <4 OR f1 >2 \n");
     conn.startTransaction();
     execAndPrint(table);
     conn.commit();
-- 
2.11.4.GIT