Author: kentam
Date: Mon Oct 11 11:25:41 2004
New Revision: 54606
Modified:
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
Log:
Contributor: Hoi Lam
Modified DB Control test cases, so they don't share any database tables. This
will eliminate any chance of
test cases affecting each other in the event of an error that prohibits the
test cases from cleaning up.
Modified:
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
(original)
+++
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
Mon Oct 11 11:25:41 2004
@@ -45,6 +45,14 @@
public Report doCreateTable()
{
+ try
+ {
+ testDBControl.dropTable();
+ }
+ catch (Exception ignore)
+ {
+ }
+
Report report=new Report();
try
{
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
Mon Oct 11 11:25:41 2004
@@ -18,13 +18,13 @@
public class ResultSetExtractorTest extends TestCase
{
- private static final String DROP_TABLE = "DROP TABLE CAR";
- private static final String CREATE_TABLE = "CREATE TABLE CAR ( ID INT
PRIMARY KEY NOT NULL, " +
+ private static final String DROP_TABLE = "DROP TABLE EXTRACTOR_TEST_CAR";
+ private static final String CREATE_TABLE = "CREATE TABLE
EXTRACTOR_TEST_CAR ( ID INT PRIMARY KEY NOT NULL, " +
"MAKE VARCHAR(20), MODEL VARCHAR(20), CYCL INT)";
- private static final String INSERT_HONDA = "INSERT INTO CAR VALUES (1,
'HONDA', 'CIVIC', 4)";
- private static final String INSERT_TOYOTA = "INSERT INTO CAR VALUES (2,
'TOYOTA', 'CAMRY', 6)";
- private static final String SELECT_HONDA = "SELECT * FROM CAR WHERE MAKE =
'HONDA'";
- private static final String SELECT_ALL = "SELECT * FROM CAR ORDER BY MAKE";
+ private static final String INSERT_HONDA = "INSERT INTO EXTRACTOR_TEST_CAR
VALUES (1, 'HONDA', 'CIVIC', 4)";
+ private static final String INSERT_TOYOTA = "INSERT INTO
EXTRACTOR_TEST_CAR VALUES (2, 'TOYOTA', 'CAMRY', 6)";
+ private static final String SELECT_HONDA = "SELECT * FROM
EXTRACTOR_TEST_CAR WHERE MAKE = 'HONDA'";
+ private static final String SELECT_ALL = "SELECT * FROM EXTRACTOR_TEST_CAR
ORDER BY MAKE";
private Connection con;
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
Mon Oct 11 11:25:41 2004
@@ -75,7 +75,7 @@
try {
int rowsInserted = insertRow(this.firstName, this.lastName,
this.title);
assertEquals(1, rowsInserted);
- String sql = "DELETE FROM EMPLOYEE WHERE ID=?";
+ String sql = "DELETE FROM SQLTEST_EMPLOYEE WHERE ID=?";
Object[] values = {this.id};
SQLParameter[] params = {new SQLParameter("1")};
SQLStatement stmt = new SQLStatement(sql, params);
@@ -101,7 +101,7 @@
int rowsInserted = insertRow(this.firstName, this.lastName,
this.title);
assertEquals(1, rowsInserted);
- String sql = "UPDATE EMPLOYEE SET FNAME=? WHERE ID=?";
+ String sql = "UPDATE SQLTEST_EMPLOYEE SET FNAME=? WHERE ID=?";
Object[] values = {this.id, this.newFirstName};
SQLParameter[] params = { new SQLParameter("2"), new
SQLParameter("1")};
SQLStatement stmt = new SQLStatement(sql, params);
@@ -124,7 +124,7 @@
private int insertRow(String fName, String lName, String title) throws
Exception
{
- String sql = "INSERT INTO EMPLOYEE (ID, FNAME, LNAME, TITLE) VALUES
(?,?,?,?)";
+ String sql = "INSERT INTO SQLTEST_EMPLOYEE (ID, FNAME, LNAME, TITLE)
VALUES (?,?,?,?)";
Object[] values = {++this.id, fName, lName, title};
SQLParameter[] params = { new SQLParameter("1"), new SQLParameter("2"),
new SQLParameter("3"), new SQLParameter("4")};
@@ -146,7 +146,7 @@
ResultSet rs = null;
try {
- String sql = "SELECT * FROM EMPLOYEE WHERE fName=? and lName=?";
+ String sql = "SELECT * FROM SQLTEST_EMPLOYEE WHERE fName=? and
lName=?";
String[] values = {fName, lName};
SQLParameter[] params = { new SQLParameter("1"), new
SQLParameter("2")};
@@ -173,7 +173,7 @@
ResultSet rs = null;
try {
- String sql = "SELECT * FROM EMPLOYEE WHERE ID=?";
+ String sql = "SELECT * FROM SQLTEST_EMPLOYEE WHERE ID=?";
Object[] values = {new Integer(this.id)};
SQLParameter[] params = { new SQLParameter("1")};
@@ -208,7 +208,7 @@
}
private void createTable() {
- String sql = "CREATE TABLE EMPLOYEE ( ID INT PRIMARY KEY NOT NULL, " +
+ String sql = "CREATE TABLE SQLTEST_EMPLOYEE ( ID INT PRIMARY KEY NOT
NULL, " +
"FNAME VARCHAR(20), LNAME VARCHAR(20), TITLE VARCHAR(15))";
PreparedStatement ps = null;
@@ -224,7 +224,7 @@
}
private void dropTable() {
- String sql = "DROP TABLE EMPLOYEE";
+ String sql = "DROP TABLE SQLTEST_EMPLOYEE";
PreparedStatement ps = null;
try {
SQLStatement stmt = new SQLStatement(sql);
