Rev 161: Fixed a typo in ndbj.i. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 161
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Fri 2007-09-14 02:30:02 -0700
message:
  Fixed a typo in ndbj.i. 
  Fixed AbortOption and ExecType stuff in testcases.
modified:
  java/ndbj.i                    ndbj.i-20070913223244-5938mztpztyn9sry-1
  java/testsuite/ndbj/BasicTest.java basictest.java-20070529154705-qmbr2wjlqu4mcnay-1
  java/testsuite/ndbj/InsertRetryTest.java
insertretrytest.java-20070517181935-98huwjarzuh25b30-47
  java/testsuite/ndbj/OrderedIndexScanTest.java
orderedindexscantest-20070913200612-yxpzo7ji93xk863r-1
  java/testsuite/ndbj/SelectCountTest.java
selectcounttest.java-20070517181935-98huwjarzuh25b30-61
=== modified file 'java/ndbj.i'
--- a/java/ndbj.i	2007-09-14 07:57:56 +0000
+++ b/java/ndbj.i	2007-09-14 09:30:02 +0000
@@ -315,7 +315,7 @@
 %rename NdbError NdbErrorRef; 
 %rename NdbEventOperation NdbEventOperationRef; 
 %rename NdbEvent NdbEventRef; 
-%rename NdbException NdbExeptionRef; 
+%rename NdbException NdbExceptionRef; 
 %rename NdbFactory NdbFactoryRef; 
 %rename NdbIndexOperation NdbIndexOperationRef; 
 %rename NdbIndexScanOperation NdbIndexScanOperationRef; 

=== modified file 'java/testsuite/ndbj/BasicTest.java'
--- a/java/testsuite/ndbj/BasicTest.java	2007-09-14 07:54:14 +0000
+++ b/java/testsuite/ndbj/BasicTest.java	2007-09-14 09:30:02 +0000
@@ -1,13 +1,13 @@
 package testsuite.ndbj;
 
 import testsuite.BaseNdbjTestCase;
+import com.mysql.cluster.ndbj.AbortOption;
+import com.mysql.cluster.ndbj.ExecType;
 
 import com.mysql.cluster.ndbj.NdbApiException;
 import com.mysql.cluster.ndbj.NdbOperation; 
 import com.mysql.cluster.ndbj.NdbTransaction; 
 import com.mysql.cluster.ndbj.NdbResultSet; 
-import com.mysql.cluster.ndbj.NdbTransaction.ExecType;
-import com.mysql.cluster.ndbj.NdbTransaction.AbortOption;
 import java.sql.SQLException;
 
 import java.io.BufferedReader;

=== modified file 'java/testsuite/ndbj/InsertRetryTest.java'
--- a/java/testsuite/ndbj/InsertRetryTest.java	2007-09-14 07:54:14 +0000
+++ b/java/testsuite/ndbj/InsertRetryTest.java	2007-09-14 09:30:02 +0000
@@ -9,6 +9,9 @@
 import com.mysql.cluster.ndbj.NdbResultSet;
 import com.mysql.cluster.ndbj.NdbTransaction;
 
+import com.mysql.cluster.ndbj.AbortOption;
+import com.mysql.cluster.ndbj.ExecType;
+
 public class InsertRetryTest extends BaseNdbjTestCase {
 
 	protected static final String tablename = "insert_retry_test";
@@ -57,8 +60,7 @@
 					op.setString(col2, setting);
 				}
 
-				trans.execute(NdbTransaction.ExecType.Commit,
-								NdbTransaction.AbortOption.AbortOnError, true);
+				trans.execute(ExecType.Commit,AbortOption.AbortOnError, true);
 
 				done = true;
 				assertTrue(true);
@@ -100,8 +102,7 @@
 					op.setString(col2, setting);
 				}
 
-				trans.execute(NdbTransaction.ExecType.Commit,
-								NdbTransaction.AbortOption.AbortOnError, true);
+				trans.execute(ExecType.Commit,AbortOption.AbortOnError, true);
 
 				done = true;
 				assertTrue(true);
@@ -134,8 +135,7 @@
 				rs[i] = op.resultData();
 			}
 
-			trans.execute(NdbTransaction.ExecType.Commit,
-							NdbTransaction.AbortOption.AbortOnError, true);
+			trans.execute(ExecType.Commit,AbortOption.AbortOnError, true);
 
 			int j=0;
 			for (NdbResultSet r : rs) {
@@ -179,8 +179,7 @@
 					op.setString(col2, setting);
 				}
 
-				trans.execute(NdbTransaction.ExecType.Commit,
-								NdbTransaction.AbortOption.AbortOnError, true);
+				trans.execute(ExecType.Commit,AbortOption.AbortOnError, true);
 
 				done = true;
 				assertTrue(true);
@@ -209,8 +208,7 @@
 				op.equal(col1, i);
 			}
 
-			trans.execute(NdbTransaction.ExecType.Commit,
-							NdbTransaction.AbortOption.AbortOnError, true);
+			trans.execute(ExecType.Commit,AbortOption.AbortOnError, true);
 
 			System.out.println("Finished delete");
 			assertTrue(true);

=== modified file 'java/testsuite/ndbj/OrderedIndexScanTest.java'
--- a/java/testsuite/ndbj/OrderedIndexScanTest.java	2007-09-14 07:54:14 +0000
+++ b/java/testsuite/ndbj/OrderedIndexScanTest.java	2007-09-14 09:30:02 +0000
@@ -7,6 +7,8 @@
 import com.mysql.cluster.ndbj.NdbTransaction;
 import com.mysql.cluster.ndbj.NdbIndexScanOperation;
 import com.mysql.cluster.ndbj.NdbResultSet; 
+import com.mysql.cluster.ndbj.AbortOption;
+import com.mysql.cluster.ndbj.ExecType;
 
 public class OrderedIndexScanTest extends BaseNdbjTestCase {
 
@@ -78,8 +80,8 @@
 			iop.getValue(col2);
 
 			NdbResultSet rs = iop.resultData();
-			trans.execute(NdbTransaction.ExecType.NoCommit, 
-					NdbTransaction.AbortOption.AbortOnError, 
+			trans.execute(ExecType.NoCommit, 
+					AbortOption.AbortOnError, 
 					true);
 
 

=== modified file 'java/testsuite/ndbj/SelectCountTest.java'
--- a/java/testsuite/ndbj/SelectCountTest.java	2007-09-14 07:54:14 +0000
+++ b/java/testsuite/ndbj/SelectCountTest.java	2007-09-14 09:30:02 +0000
@@ -8,6 +8,9 @@
 import com.mysql.cluster.ndbj.NdbOperation;
 import com.mysql.cluster.ndbj.NdbTransaction;
 
+import com.mysql.cluster.ndbj.AbortOption;
+import com.mysql.cluster.ndbj.ExecType;
+
 public class SelectCountTest extends BaseNdbjTestCase {
 
 	protected String col1="id";
@@ -58,8 +61,8 @@
 				op.setString(col2,input);
 			}
 
-		    trans.execute(NdbTransaction.ExecType.Commit,
-			      NdbTransaction.AbortOption.AbortOnError,
+		    trans.execute(ExecType.Commit,
+			      AbortOption.AbortOnError,
 			      true);
 
 		    trans.close();
@@ -87,8 +90,8 @@
 		    	op.equal(col1,i);
 		    }
 
-		    trans.execute(NdbTransaction.ExecType.Commit,
-			      NdbTransaction.AbortOption.AbortOnError,
+		    trans.execute(ExecType.Commit,
+			      AbortOption.AbortOnError,
 			      true);
 
 			System.out.println("Finished delete");