bzr commit into NDB/Bindings:trunk branch (monty:421)

[Monty Taylor]

#At https://bazaar.launchpad.net/~ndb-bindings/ndb-bindings/trunk

  421 Monty Taylor	2008-06-24
      Made tablename variable consistent. 
modified:
  java/testsuite/ndbj/BasicTest.java
  java/testsuite/ndbj/InsertRetryTest.java
  java/testsuite/ndbj/InvalidSchemaObjectVersionTest.java

=== modified file 'java/testsuite/ndbj/BasicTest.java'
--- a/java/testsuite/ndbj/BasicTest.java	2008-06-24 18:46:26 +0000
+++ b/java/testsuite/ndbj/BasicTest.java	2008-06-24 19:26:24 +0000
@@ -30,7 +30,7 @@ import com.mysql.cluster.ndbj.NdbOperati
 import java.sql.SQLException;
 
 public class BasicTest extends BaseNdbjTestCase {
-    private static final String table_name = "basic_test";
+    private static final String tablename = "t_basic";
 
     public BasicTest(String arg0) {
         super(arg0);
@@ -40,7 +40,7 @@ public class BasicTest extends BaseNdbjT
     public void setUp() throws Exception {
         super.setUp();
 
-        this.createTable(table_name, "(id int, name varchar(32), age int, primary key(id)) engine=ndbcluster");
+        this.createTable(tablename, "(id int, name varchar(32), age int, primary key(id)) engine=ndbcluster");
     }
 
     /**
@@ -48,13 +48,13 @@ public class BasicTest extends BaseNdbjT
      */
     public void testSingleInsertString() throws NdbApiException,SQLException {
         trans = ndb.startTransaction();
-        NdbOperation op = trans.getInsertOperation(table_name);
+        NdbOperation op = trans.getInsertOperation(tablename);
         op.equalInt("id", 1);
         op.setString("name", "Monty");
         trans.execute(ExecType.Commit,AbortOption.AbortOnError,true);
         trans.close();
 
-        String nameVal = (String)this.getSingleValue(table_name, "name", "where id=1");
+        String nameVal = (String)this.getSingleValue(tablename, "name", "where id=1");
         assertEquals("Monty",nameVal);
     }
 
@@ -63,13 +63,13 @@ public class BasicTest extends BaseNdbjT
      */
     public void testSingleInsertInt() throws NdbApiException,SQLException {
         trans = ndb.startTransaction();
-        NdbOperation op = trans.getInsertOperation(table_name);
+        NdbOperation op = trans.getInsertOperation(tablename);
         op.equalInt("id", 1);
         op.setInt("age", 100);
         trans.execute(ExecType.Commit,AbortOption.AbortOnError,false);
         trans.close();
 
-        int nameVal = (Integer)this.getSingleValue(table_name, "age", "where id=1");
+        int nameVal = (Integer)this.getSingleValue(tablename, "age", "where id=1");
         assertEquals(nameVal,100);
     }
 }

=== modified file 'java/testsuite/ndbj/InsertRetryTest.java'
--- a/java/testsuite/ndbj/InsertRetryTest.java	2008-06-24 18:46:26 +0000
+++ b/java/testsuite/ndbj/InsertRetryTest.java	2008-06-24 19:26:24 +0000
@@ -35,11 +35,10 @@ import com.mysql.cluster.ndbj.ExecType;
 
 public class InsertRetryTest extends BaseNdbjTestCase {
 
-    private static final String tablename = "insert_retry_test";
+    private static final String tablename = "t_insert_retry";
     private static final String col1 = "id";
     private static final String col2 = "name";
     private static final String col2Val = "montyµ";
-    private static final int MAX_RETRIES = 3;
     private static final int NUM_INSERTS = 2;
 
     public InsertRetryTest(String arg0) {

=== modified file 'java/testsuite/ndbj/InvalidSchemaObjectVersionTest.java'
--- a/java/testsuite/ndbj/InvalidSchemaObjectVersionTest.java	2008-06-24 18:46:26 +0000
+++ b/java/testsuite/ndbj/InvalidSchemaObjectVersionTest.java	2008-06-24 19:26:24 +0000
@@ -34,7 +34,7 @@ import com.mysql.cluster.ndbj.NdbTable;
 import testsuite.BaseNdbjTestCase;
 
 public class InvalidSchemaObjectVersionTest extends BaseNdbjTestCase {
-    private static final String table_name = "basic_test";
+    private static final String tablename = "t_invalid";
 
     public InvalidSchemaObjectVersionTest(String arg0) {
         super(arg0);
@@ -43,7 +43,7 @@ public class InvalidSchemaObjectVersionT
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        createTable(table_name, "(id int, name varchar(32), " +
+        createTable(tablename, "(id int, name varchar(32), " +
                     " age int, primary key(id)) engine=ndbcluster");
     }
 
@@ -55,18 +55,18 @@ public class InvalidSchemaObjectVersionT
         NdbDictionary dictionary = ndb.getDictionary();
 
         @SuppressWarnings("unused")
-            NdbTable table = dictionary.getTable(table_name);
+            NdbTable table = dictionary.getTable(tablename);
 
         // Drop the table via mysql to avoid the auto-invalidation done by
         // the test framework
-        stmt.executeUpdate("drop table " + table_name);
-        stmt.executeUpdate("create table " + table_name +
+        stmt.executeUpdate("drop table " + tablename);
+        stmt.executeUpdate("create table " + tablename +
                            "(id int, name varchar(32), age int, primary key(id)) " +
                            "engine=ndbcluster");
 
         // setup an operation
         trans = ndb.startTransaction();
-        NdbOperation op = trans.getInsertOperation(table_name);
+        NdbOperation op = trans.getInsertOperation(tablename);
         op.equalInt("id", 1);
         op.setString("name", "Monty");
 
@@ -76,12 +76,12 @@ public class InvalidSchemaObjectVersionT
             fail("SchemaError should be thrown");
         } catch (SchemaError e) {
             // invalidate the DDL cache
-            dictionary.invalidateTable(table_name);
+            dictionary.invalidateTable(tablename);
         }
 
         // verify that we can complete the operation now
         trans = ndb.startTransaction();
-        op = trans.getInsertOperation(table_name);
+        op = trans.getInsertOperation(tablename);
         op.equalInt("id", 1);
         op.setString("name", "Monty");
         trans.execute(ExecType.Commit,AbortOption.AbortOnError,true);