summaryrefslogtreecommitdiff
path: root/connectivity/qa
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-11 15:58:09 +0200
committerNoel Grandin <noel@peralex.com>2014-08-14 10:59:48 +0200
commitac5954d7c540f34702033d7d951d1d16cb96730a (patch)
tree310ba9698a10c74662de0714db683f932de32b0c /connectivity/qa
parent89c0a2b2f65beeb6f42d3334662100a13169a8d6 (diff)
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
Diffstat (limited to 'connectivity/qa')
-rw-r--r--connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java3
-rw-r--r--connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java63
-rw-r--r--connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java9
-rw-r--r--connectivity/qa/connectivity/tools/FlatFileDatabase.java1
4 files changed, 0 insertions, 76 deletions
diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
index 8ff5cc48ee84..09f7cac22716 100644
--- a/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
@@ -55,9 +55,6 @@ public class DBaseSqlTests extends SubTestCase
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 0 < 1");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 2 > 1");
execute(xRowRes,"1,1+1,'a' + 'b' FROM \"biblio\" \"biblio\" where 2 > 1");
- // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where (0 = 0) is true");
- // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where not (0 = 0) is not true");
- // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 1 between 0 and 2");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where not \"Identifier\" is NULL");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where \"Identifier\" is not NULL");
execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where \"Identifier\" = \"Identifier\"");
diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index 65bf5cfb4e72..6982395671a0 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -71,8 +71,6 @@ public class DatabaseMetaData {
public void test(){
- // try {
-
try{
ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null);
while ( rs.next() )
@@ -99,66 +97,5 @@ public class DatabaseMetaData {
} catch(Exception e){
}
- //testMethod("getTypeInfo", zclass,empty,17);
-/*
- Class[] zclass = new Class[]{};
- Object[] empty = new Object[]{};
- testMethod("getCatalogs", zclass,empty,1);
-
- testMethod("getSchemas", zclass,empty,2);
- testMethod("getTableTypes", zclass,empty,1);
- Class[] a4 = new Class[4];
- Object[] o4 = new Object[4];
- a4[0] = Class.forName("java.lang.Object");
- a4[1] = Class.forName("java.lang.String");
- a4[2] = Class.forName("java.lang.String");
- a4[3] = Class.forName("java.lang.String");
-
- o4[0] = null;
- o4[1] = null;
- o4[2] = null;
- o4[3] = "%";
- testMethod("getColumnPrivileges", a4,o4,7);
- testMethod("getColumns", a4,o4,18);
- testMethod("getProcedureColumns", a4,o4,13);
- testMethod("getColumns", a4,o4,18);
-
- Class[] a3 = new Class[3];
- Object[] o3 = new Object[3];
- a3[0] = Class.forName("java.lang.Object");
- a3[1] = Class.forName("java.lang.String");
- a3[2] = Class.forName("java.lang.String");
-
- o3[0] = null;
- o3[1] = null;
- o3[2] = "%";
-
- testMethod("getExportedKeys", a3,o3,14);
- testMethod("getImportedKeys", a3,o3,14);
- testMethod("getPrimaryKeys", a3,o3,14);
- testMethod("getProcedures", a3,o3,5);
- testMethod("getTablePrivileges", a3,o3,6);
- testMethod("getVersionColumns", a3,o3,7);
- // testMethod("getCrossReference", a3,o3,14);
-
- } catch( java.lang.ClassNotFoundException ex) {
- assure("ClassNotFoundException: " + ex.getMessage() ,false);
- }
- */
- }
-/*
- public com.sun.star.sdbc.XResultSet getCrossReference(Object obj, String str, String str2, Object obj3, String str4, String str5) {
- }
- public com.sun.star.sdbc.XResultSet getIndexInfo(Object obj, String str, String str2, boolean param, boolean param4) {
}
-
- public com.sun.star.sdbc.XResultSet getTables(Object obj, String str, String str2, String[] str3) {
- }
-
- public com.sun.star.sdbc.XResultSet getUDTs(Object obj, String str, String str2, int[] values) {
- }
-
- public com.sun.star.sdbc.XResultSet getBestRowIdentifier(Object obj, String str, String str2, int param, boolean param4) throws com.sun.star.sdbc.SQLException {
- }
- */
}
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index c8c28162f3f7..57ce3f95372e 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -136,8 +136,6 @@ public class TestCacheSize {
sStatement = null;
cConnection = null;
- //Class.forName("org.hsqldb.jdbcDriver");
-
if (filedb) {
cConnection = drv.connect(url,info);
@@ -147,9 +145,6 @@ public class TestCacheSize {
sStatement.execute("SET LOGSIZE " + 0);
sStatement.execute("SHUTDOWN");
cConnection.close();
-// props.setProperty("hsqldb.cache_scale", "" + cacheScale);
-// props.setProperty("hsqldb.cache_size_scale",
- //"" + cacheSizeScale);
}
} catch (Exception e) {
e.printStackTrace();
@@ -255,7 +250,6 @@ public class TestCacheSize {
System.out.println("multi key table");
}
-// sStatement.execute("CREATE INDEX idx3 ON tempTEST (zip);");
System.out.println("Setup time: " + sw.elapsedTime());
fillUpBigTable(filler, randomgen);
@@ -339,9 +333,6 @@ public class TestCacheSize {
}
}
-// sStatement.execute("INSERT INTO test SELECT * FROM temptest;");
-// sStatement.execute("DROP TABLE temptest;");
-// sStatement.execute(ddl7);
System.out.println("Total insert: " + i);
System.out.println("Insert time: " + sw.elapsedTime() + " rps: "
+ (i * 1000 / (sw.elapsedTime() + 1)));
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
index 31f263a1196b..4a292c009234 100644
--- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -73,7 +73,6 @@ class FlatFileDatabase extends AbstractDatabase
documentFile.delete();
m_tableFileLocation = new File(documentFile.getParent() + File.separator + documentFile.getName().replace(".odb", "") + File.separator );
m_tableFileLocation.mkdir();
- //subPath.deleteOnExit();
m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
final String path = URLHelper.getFileURLFromSystemPath( m_tableFileLocation.getPath() );