------------------------------------------------------------
revno: 114
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Mon 2007-05-07 01:04:32 -0700
message:
Fixed Java test programs to use createNdb instead of new Ndb().
Started renaming namespace issues in NDB/J test programs. We pass one test!
modified:
java/test.java test.java-20070130002924-gcvhapmvh0lu1pkd-4
java/test/BaseJDBC.java basejdbc.java-20070323205223-onh2m4zlrx63va8u-2
java/test/ClusterConfigurator.java
clusterconfigurator.-20070323205223-onh2m4zlrx63va8u-3
java/test/ClusterConfiguratorBase.java
clusterconfiguratorb-20070323205223-onh2m4zlrx63va8u-4
java/test/InsertRetryTest.java insertretrytest.java-20070323205223-onh2m4zlrx63va8u-5
java/test/Latin1InsertReadTest.java
latin1insertreadtest-20070323205223-onh2m4zlrx63va8u-6
java/test/LockingBugJDBC.java lockingbugjdbc.java-20070323205223-onh2m4zlrx63va8u-7
java/test/Makefile.in makefile.in-20070323205223-onh2m4zlrx63va8u-9
java/test/MultiPartPrimaryKeyStringTest.java
multipartprimarykeys-20070323205223-onh2m4zlrx63va8u-10
java/test/NdbBlobTest.java ndbblobtest.java-20070323205223-onh2m4zlrx63va8u-11
java/test/NdbIndexScanOperationUtf8Latin1Test.java
ndbindexscanoperatio-20070323205223-onh2m4zlrx63va8u-12
java/test/NdbOperationByteLongTest.java
ndboperationbytelong-20070323205223-onh2m4zlrx63va8u-13
java/test/NdbOperationIDTest.java
ndboperationidtest.j-20070323205223-onh2m4zlrx63va8u-14
java/test/NdbOperationMultiPartPrimaryKeyTest.java
ndboperationmultipar-20070323205223-onh2m4zlrx63va8u-15
java/test/NdbOperationSetNullTest.java
ndboperationsetnullt-20070323205223-onh2m4zlrx63va8u-16
java/test/NdbOperationTest.java ndboperationtest.jav-20070323205223-onh2m4zlrx63va8u-17
java/test/NdbOperationsFailedTest.java
ndboperationsfailedt-20070323205223-onh2m4zlrx63va8u-18
java/test/NdbScanFilterTest.java ndbscanfiltertest.ja-20070323205223-onh2m4zlrx63va8u-19
java/test/NdbScanTest.java ndbscantest.java-20070323205223-onh2m4zlrx63va8u-20
java/test/NdbTest.java ndbtest.java-20070323205223-onh2m4zlrx63va8u-21
java/test/NdbTimeStampOperationTest.java
ndbtimestampoperatio-20070323205223-onh2m4zlrx63va8u-22
java/test/NullSetTest.java nullsettest.java-20070323205223-onh2m4zlrx63va8u-23
java/test/SelectCountTest.java selectcounttest.java-20070323205223-onh2m4zlrx63va8u-24
java/test/Utf8InsertReadTest.java
utf8insertreadtest.j-20070323205223-onh2m4zlrx63va8u-25
java/testasync.java test2.java-20070305174931-p3qddjy9i6h6y1f3-4
java/testdirasync.java testdirasync.java-20070505081526-30y7xsbok35xemlg-2
=== modified file 'java/test.java'
--- a/java/test.java 2007-05-06 03:22:10 +0000
+++ b/java/test.java 2007-05-07 08:04:32 +0000
@@ -106,7 +106,7 @@
System.exit(-1);
}
- Ndb myNdb = new Ndb(connection,"test" ) ;
+ Ndb myNdb = connection.createNdb( "test" ) ;
if (myNdb.init(4)==-1) {
System.out.println(myNdb.getNdbError().getMessage());
=== modified file 'java/test/BaseJDBC.java'
--- a/java/test/BaseJDBC.java 2007-03-23 20:52:34 +0000
+++ b/java/test/BaseJDBC.java 2007-05-07 08:04:32 +0000
@@ -1,4 +1,4 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.io.File;
import java.io.FileInputStream;
@@ -6,11 +6,11 @@
import java.io.InputStream;
import java.lang.reflect.Field;
-import com.mysql.storage.ndb.ndbapi.Ndb;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbFactory;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnection;
+import com.mysql.cluster.ndbapi.Ndb;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbFactory;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbClusterConnection;
import junit.framework.TestCase;
import java.sql.Connection;
=== modified file 'java/test/ClusterConfigurator.java'
--- a/java/test/ClusterConfigurator.java 2007-03-23 20:52:34 +0000
+++ b/java/test/ClusterConfigurator.java 2007-05-07 08:04:32 +0000
@@ -1,4 +1,4 @@
- package com.mysql.storage.ndb.ndbapi.test;
+ package com.mysql.cluster.ndbapi.test;
import java.io.File;
import java.io.FileInputStream;
@@ -10,11 +10,11 @@
import java.sql.Statement;
import java.util.Properties;
-import com.mysql.storage.ndb.ndbapi.Ndb;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnection;
-import com.mysql.storage.ndb.ndbapi.NdbFactory;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.Ndb;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbClusterConnection;
+import com.mysql.cluster.ndbapi.NdbFactory;
+import com.mysql.cluster.ndbapi.NdbTransaction;
public class ClusterConfigurator
{
=== modified file 'java/test/ClusterConfiguratorBase.java'
--- a/java/test/ClusterConfiguratorBase.java 2007-03-23 20:52:34 +0000
+++ b/java/test/ClusterConfiguratorBase.java 2007-05-07 08:04:32 +0000
@@ -1,4 +1,4 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.io.File;
import java.io.FileInputStream;
@@ -10,11 +10,11 @@
import java.sql.Statement;
import java.util.Properties;
-import com.mysql.storage.ndb.ndbapi.Ndb;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnection;
-import com.mysql.storage.ndb.ndbapi.NdbFactory;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.Ndb;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbClusterConnection;
+import com.mysql.cluster.ndbapi.NdbFactory;
+import com.mysql.cluster.ndbapi.NdbTransaction;
public class ClusterConfiguratorBase
{
=== modified file 'java/test/InsertRetryTest.java'
--- a/java/test/InsertRetryTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/InsertRetryTest.java 2007-05-07 08:04:32 +0000
@@ -1,14 +1,14 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.util.Random;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbApiTemporaryException;
-import com.mysql.storage.ndb.ndbapi.NdbApiUserErrorPermanentException;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbApiTemporaryException;
+import com.mysql.cluster.ndbapi.NdbApiUserErrorPermanentException;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class InsertRetryTest extends BaseJDBC {
=== modified file 'java/test/Latin1InsertReadTest.java'
--- a/java/test/Latin1InsertReadTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/Latin1InsertReadTest.java 2007-05-07 08:04:32 +0000
@@ -1,16 +1,16 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.util.Random;
import junit.framework.AssertionFailedError;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbApiTemporaryException;
-import com.mysql.storage.ndb.ndbapi.NdbApiUserErrorPermanentException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbApiTemporaryException;
+import com.mysql.cluster.ndbapi.NdbApiUserErrorPermanentException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class Latin1InsertReadTest extends BaseJDBC {
=== modified file 'java/test/LockingBugJDBC.java'
--- a/java/test/LockingBugJDBC.java 2007-03-23 20:52:34 +0000
+++ b/java/test/LockingBugJDBC.java 2007-05-07 08:04:32 +0000
@@ -1,18 +1,18 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.util.Random;
-import com.mysql.storage.ndb.ndbapi.Ndb;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnection;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation.BoundType;
-import com.mysql.storage.ndb.ndbapi.NdbOperation.LockMode;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction.AbortOption;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction.ExecType;
+import com.mysql.cluster.ndbapi.Ndb;
+import com.mysql.cluster.ndbapi.NdbClusterConnection;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation.BoundType;
+import com.mysql.cluster.ndbapi.NdbOperation.LockMode;
+import com.mysql.cluster.ndbapi.NdbTransaction.AbortOption;
+import com.mysql.cluster.ndbapi.NdbTransaction.ExecType;
import junit.framework.TestCase;
=== modified file 'java/test/Makefile.in'
--- a/java/test/Makefile.in 2007-03-23 20:52:34 +0000
+++ b/java/test/Makefile.in 2007-05-07 08:04:32 +0000
@@ -7,7 +7,7 @@
mkdir_p = @mkdir_p@
docs_outdir = @prefix@/@DOCS_OUTDIR@
BUILD_DIR=@top_srcdir@/@CLASSES_DIR@
-PACKAGE_DIR=com/mysql/storage/ndb/ndbapi/
+PACKAGE_DIR=com/mysql/cluster/ndbapi/
INC=$(TOP_DIR)include/ndbapi/
DOCS_DIR=$(TOP_DIR)docs/ndbapi/
@@ -15,7 +15,7 @@
JAVAC = @JAVAC@
JAVAH = @JAVAH@
-NDBJ_PACKAGE=com.mysql.storage.ndb.ndbapi.test
+NDBJ_PACKAGE=com.mysql.cluster.ndbapi.test
.SUFFIXES: .java .class .cpp
=== modified file 'java/test/MultiPartPrimaryKeyStringTest.java'
--- a/java/test/MultiPartPrimaryKeyStringTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/MultiPartPrimaryKeyStringTest.java 2007-05-07 08:04:32 +0000
@@ -1,13 +1,13 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbScanFilter;
-import com.mysql.storage.ndb.ndbapi.NdbScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbScanFilter;
+import com.mysql.cluster.ndbapi.NdbScanOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
/**
*
=== modified file 'java/test/NdbBlobTest.java'
--- a/java/test/NdbBlobTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbBlobTest.java 2007-05-07 08:04:32 +0000
@@ -1,13 +1,13 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbBlob;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnectionPermanentException;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnectionTemporaryException;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbBlob;
+import com.mysql.cluster.ndbapi.NdbClusterConnectionPermanentException;
+import com.mysql.cluster.ndbapi.NdbClusterConnectionTemporaryException;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
/**
* With the mysql client, do the following:
@@ -54,7 +54,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testInsertBlob() {
try {
@@ -165,7 +165,7 @@
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testGetNdbBlobRSUnknownLength() {
NdbBlob b = null;
@@ -215,7 +215,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testGetNdbBlobRSKnownLength() {
NdbBlob blob = null;
@@ -263,7 +263,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testReadBlobUnknownLength() {
try {
@@ -309,7 +309,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testReadBlobHandleKnownLength() {
try {
@@ -357,7 +357,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testUpdateBlob() {
@@ -403,7 +403,7 @@
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.getNdbBlobHandle(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.getNdbBlobHandle(int)'
*/
public final void testInsertDeleteBlob() {
try {
=== modified file 'java/test/NdbIndexScanOperationUtf8Latin1Test.java'
--- a/java/test/NdbIndexScanOperationUtf8Latin1Test.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbIndexScanOperationUtf8Latin1Test.java 2007-05-07 08:04:32 +0000
@@ -1,13 +1,13 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbScanFilter;
-import com.mysql.storage.ndb.ndbapi.NdbScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbScanFilter;
+import com.mysql.cluster.ndbapi.NdbScanOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
/**
*
=== modified file 'java/test/NdbOperationByteLongTest.java'
--- a/java/test/NdbOperationByteLongTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbOperationByteLongTest.java 2007-05-07 08:04:32 +0000
@@ -1,10 +1,10 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
import junit.framework.TestCase;
@@ -34,7 +34,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.equal(String, byte[])'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.equal(String, byte[])'
*/
public void testInsertAndReadBytesAndLong() {
try {
=== modified file 'java/test/NdbOperationIDTest.java'
--- a/java/test/NdbOperationIDTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbOperationIDTest.java 2007-05-07 08:04:32 +0000
@@ -1,12 +1,12 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.sql.Timestamp;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class NdbOperationIDTest extends BaseJDBC {
=== modified file 'java/test/NdbOperationMultiPartPrimaryKeyTest.java'
--- a/java/test/NdbOperationMultiPartPrimaryKeyTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbOperationMultiPartPrimaryKeyTest.java 2007-05-07 08:04:32 +0000
@@ -1,10 +1,10 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
/**
*
=== modified file 'java/test/NdbOperationSetNullTest.java'
--- a/java/test/NdbOperationSetNullTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbOperationSetNullTest.java 2007-05-07 08:04:32 +0000
@@ -1,9 +1,9 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class NdbOperationSetNullTest extends BaseJDBC {
@@ -25,7 +25,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.setNull(String)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.setNull(String)'
*/
public final void testSetNullString() {
try {
@@ -120,7 +120,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.setNull(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.setNull(int)'
*/
public final void testSetNullInt() {
try {
=== modified file 'java/test/NdbOperationTest.java'
--- a/java/test/NdbOperationTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbOperationTest.java 2007-05-07 08:04:32 +0000
@@ -1,12 +1,12 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.sql.Timestamp;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class NdbOperationTest extends BaseJDBC {
=== modified file 'java/test/NdbOperationsFailedTest.java'
--- a/java/test/NdbOperationsFailedTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbOperationsFailedTest.java 2007-05-07 08:04:32 +0000
@@ -1,11 +1,11 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.sql.Timestamp;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class NdbOperationsFailedTest extends BaseJDBC {
@@ -101,7 +101,7 @@
/*
* Test method for
- * 'com.mysql.storage.ndb.ndbapi.NdbTransaction.getNextFailedOperation(NdbOperation)'
+ * 'com.mysql.cluster.ndbapi.NdbTransaction.getNextFailedOperation(NdbOperation)'
*/
public void testInsertDuplicateGetNextFailedOperation() {
=== modified file 'java/test/NdbScanFilterTest.java'
--- a/java/test/NdbScanFilterTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbScanFilterTest.java 2007-05-07 08:04:32 +0000
@@ -1,17 +1,17 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbScanFilter;
-import com.mysql.storage.ndb.ndbapi.NdbScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
-import com.mysql.storage.ndb.ndbapi.NdbOperation.LockMode;
-import com.mysql.storage.ndb.ndbapi.NdbScanFilter.BinaryCondition;
-import com.mysql.storage.ndb.ndbapi.NdbScanFilter.Group;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction.AbortOption;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction.ExecType;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbScanFilter;
+import com.mysql.cluster.ndbapi.NdbScanOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbOperation.LockMode;
+import com.mysql.cluster.ndbapi.NdbScanFilter.BinaryCondition;
+import com.mysql.cluster.ndbapi.NdbScanFilter.Group;
+import com.mysql.cluster.ndbapi.NdbTransaction.AbortOption;
+import com.mysql.cluster.ndbapi.NdbTransaction.ExecType;
=== modified file 'java/test/NdbScanTest.java'
--- a/java/test/NdbScanTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbScanTest.java 2007-05-07 08:04:32 +0000
@@ -1,12 +1,12 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbScanFilter;
-import com.mysql.storage.ndb.ndbapi.NdbScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbScanFilter;
+import com.mysql.cluster.ndbapi.NdbScanOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
/**
*
@@ -99,7 +99,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbScanOperation.readTuples(LockMode,
int, int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbScanOperation.readTuples(LockMode, int,
int)'
*/
public final void testReadTuplesStrPK() {
try {
=== modified file 'java/test/NdbTest.java'
--- a/java/test/NdbTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbTest.java 2007-05-07 08:04:32 +0000
@@ -1,4 +1,4 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.io.UnsupportedEncodingException;
import java.sql.Timestamp;
@@ -7,20 +7,20 @@
import java.util.Random;
import java.util.concurrent.CyclicBarrier;
-import com.mysql.storage.ndb.ndbapi.Ndb;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbBaseOperation;
-import com.mysql.storage.ndb.ndbapi.NdbBlob;
-import com.mysql.storage.ndb.ndbapi.NdbClusterConnection;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbIndexScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
-import com.mysql.storage.ndb.ndbapi.NdbOperation.LockMode;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction.AbortOption;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction.ExecType;
+import com.mysql.cluster.ndbapi.Ndb;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbBaseOperation;
+import com.mysql.cluster.ndbapi.NdbBlob;
+import com.mysql.cluster.ndbapi.NdbClusterConnection;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbIndexScanOperation;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbScanOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbOperation.LockMode;
+import com.mysql.cluster.ndbapi.NdbTransaction.AbortOption;
+import com.mysql.cluster.ndbapi.NdbTransaction.ExecType;
public class NdbTest extends BaseJDBC {
=== modified file 'java/test/NdbTimeStampOperationTest.java'
--- a/java/test/NdbTimeStampOperationTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NdbTimeStampOperationTest.java 2007-05-07 08:04:32 +0000
@@ -1,17 +1,17 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.sql.Date;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbApiTimeStampOutOfBoundsException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbScanOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbApiTimeStampOutOfBoundsException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbScanOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
/**
*
=== modified file 'java/test/NullSetTest.java'
--- a/java/test/NullSetTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/NullSetTest.java 2007-05-07 08:04:32 +0000
@@ -1,9 +1,9 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class NullSetTest extends BaseJDBC {
@@ -25,7 +25,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.setNull(String)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.setNull(String)'
*/
public final void testSetNullString() {
try {
@@ -120,7 +120,7 @@
}
/*
- * Test method for 'com.mysql.storage.ndb.ndbapi.NdbOperation.setNull(int)'
+ * Test method for 'com.mysql.cluster.ndbapi.NdbOperation.setNull(int)'
*/
public final void testSetNullInt() {
try {
=== modified file 'java/test/SelectCountTest.java'
--- a/java/test/SelectCountTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/SelectCountTest.java 2007-05-07 08:04:32 +0000
@@ -1,12 +1,12 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import junit.framework.AssertionFailedError;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class SelectCountTest extends BaseJDBC {
=== modified file 'java/test/Utf8InsertReadTest.java'
--- a/java/test/Utf8InsertReadTest.java 2007-03-23 20:52:34 +0000
+++ b/java/test/Utf8InsertReadTest.java 2007-05-07 08:04:32 +0000
@@ -1,16 +1,16 @@
-package com.mysql.storage.ndb.ndbapi.test;
+package com.mysql.cluster.ndbapi.test;
import java.util.Random;
import junit.framework.AssertionFailedError;
-import com.mysql.storage.ndb.ndbapi.NdbApiException;
-import com.mysql.storage.ndb.ndbapi.NdbApiTemporaryException;
-import com.mysql.storage.ndb.ndbapi.NdbApiUserErrorPermanentException;
-import com.mysql.storage.ndb.ndbapi.NdbError;
-import com.mysql.storage.ndb.ndbapi.NdbOperation;
-import com.mysql.storage.ndb.ndbapi.NdbTransaction;
-import com.mysql.storage.ndb.ndbapi.NdbResultSet;
+import com.mysql.cluster.ndbapi.NdbApiException;
+import com.mysql.cluster.ndbapi.NdbApiTemporaryException;
+import com.mysql.cluster.ndbapi.NdbApiUserErrorPermanentException;
+import com.mysql.cluster.ndbapi.NdbError;
+import com.mysql.cluster.ndbapi.NdbOperation;
+import com.mysql.cluster.ndbapi.NdbTransaction;
+import com.mysql.cluster.ndbapi.NdbResultSet;
public class Utf8InsertReadTest extends BaseJDBC {
=== modified file 'java/testasync.java'
--- a/java/testasync.java 2007-05-05 08:15:29 +0000
+++ b/java/testasync.java 2007-05-07 08:04:32 +0000
@@ -98,7 +98,7 @@
System.exit(-1);
}
- Ndb myNdb = new Ndb(connection,"test" ) ;
+ Ndb myNdb = connection.createNdb( "test" ) ;
if (myNdb.init(4)==-1) {
System.out.println(myNdb.getNdbError().getMessage());
=== modified file 'java/testdirasync.java'
--- a/java/testdirasync.java 2007-05-05 08:15:29 +0000
+++ b/java/testdirasync.java 2007-05-07 08:04:32 +0000
@@ -98,7 +98,7 @@
System.exit(-1);
}
- Ndb myNdb = new Ndb(connection,"test" ) ;
+ Ndb myNdb = connection.createNdb( "test" ) ;
if (myNdb.init(4)==-1) {
System.out.println(myNdb.getNdbError().getMessage());
| Thread |
|---|
| • Rev 114: Fixed Java test programs to use createNdb instead of new Ndb(). in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge | Monty Taylor | 7 May |
