You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/06/26 18:51:06 UTC
svn commit: r417233 [2/3] - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/
main/java/org/apache/tuscany/das/rdb/config/wrapper/
main/java/org/apache/tuscany/das/rdb/generator/impl/
main/java/org/apache/tuscany/das/rdb/gra...
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java Mon Jun 26 09:51:03 2006
@@ -67,10 +67,9 @@
ConfigHelper helper = new ConfigHelper();
helper.addUpdateStatement("update CUSTOMER set LASTNAME = :LASTNAME, ADDRESS = :ADDRESS where ID = :ID", "CUSTOMER");
- DAS das = DAS.FACTORY.createDAS(helper.getConfig());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
//Read customer 1
- Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
DataObject root = select.executeQuery();
DataObject customer = (DataObject) root.get( "CUSTOMER[1]" );
@@ -79,8 +78,7 @@
customer.set( "LASTNAME", "Pavick" );
- //Build apply changes command
- das.setConnection(getConnection());
+ //Build apply changes command
das.applyChanges(root);
//Verify changes
@@ -97,10 +95,9 @@
throws Exception
{
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD.xml"), getConnection());
//Read customer 1
- Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
DataObject root = select.executeQuery();
DataObject customer = (DataObject) root.get( "CUSTOMER[1]" );
@@ -108,8 +105,7 @@
//Modify customer
customer.set( "LASTNAME", "Pavick" );
- //Build apply changes command
- das.setConnection(getConnection());
+ //Build apply changes command
das.applyChanges(root);
//Verify changes
@@ -127,10 +123,9 @@
throws Exception
{
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Read customer with particular ID
- Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
DataObject root = select.executeQuery();
DataObject customer = root.getDataObject( "CUSTOMER[1]" );
@@ -138,8 +133,7 @@
//Modify customer
customer.set( "LASTNAME", "Pavick" );
- //Build apply changes command
- das.setConnection(getConnection());
+ //Build apply changes command
das.applyChanges(root);
//Verify the change
@@ -155,10 +149,9 @@
public void testReadModifyApply3()
throws Exception
{
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMapping.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMapping.xml"),getConnection());
//Read customer with particular ID
- Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
DataObject root = select.executeQuery();
DataObject customer = (DataObject) root.get( "CUSTOMER[1]" );
@@ -166,8 +159,7 @@
//Modify customer
customer.set( "LASTNAME", "Pavick" );
- //Build apply changes command
- das.setConnection(getConnection());
+ //Build apply changes command
das.applyChanges(root);
//Verify the change
@@ -184,10 +176,9 @@
throws Exception
{
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMapping.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMapping.xml"),getConnection());
//Read some customers
- Command select = das.createCommand( "Select * from CUSTOMER where LASTNAME = 'Williams'" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where LASTNAME = 'Williams'" );
DataObject root = select.executeQuery();
DataObject cust1 = (DataObject) root.getList( "CUSTOMER" ).get( 0 );
@@ -211,13 +202,11 @@
cust4.set( "ADDRESS", "5528 Wells Fargo Drive" );
cust4.set( "LASTNAME", "Gerkin" );
- //Build apply changes command
- das.setConnection(getConnection());
+ //Build apply changes command
das.applyChanges(root);
//Verify deletes
- select = das.createCommand( "Select * from CUSTOMER where ID = :ID" );
- select.setConnection( getConnection() );
+ select = das.createCommand( "Select * from CUSTOMER where ID = :ID" );
select.setParameterValue( "ID", new Integer( cust2ID ) );
root = select.executeQuery();
assertTrue( root.getList( "CUSTOMER" ).isEmpty() );
@@ -243,11 +232,10 @@
public void testReadModifyApplyWithAssumedID() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Read customer with particular ID
Command select = das
- .createCommand("Select * from CUSTOMER");
- select.setConnection(getConnection());
+ .createCommand("Select * from CUSTOMER");
DataObject root = select.executeQuery();
DataObject customer = root.getDataObject("CUSTOMER[1]");
@@ -263,8 +251,7 @@
newCustomer.set("LASTNAME", "NewCustomer");
newCustomer.setInt("ID", 9000);
- //Build apply changes command
- das.setConnection(getConnection());
+ //Build apply changes command
das.applyChanges(root);
//Verify the change
@@ -277,10 +264,10 @@
public void testReadModifyApplyWithAssumedIDFailure() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command select = das
.createCommand("Select * from ORDERDETAILS");
- select.setConnection(getConnection());
+
DataObject root = select.executeQuery();
DataObject od = root.getDataObject("ORDERDETAILS[1]");
@@ -292,8 +279,7 @@
//Flush changes -- This should fail because Order Details does not have a column that
// we can assume to be an ID
- try {
- das.setConnection(getConnection());
+ try {
das.applyChanges(root);
} catch (RuntimeException ex) {
assertTrue(ex.getMessage().contains("changed in the DataGraph but is not present in the Config"));
@@ -302,10 +288,9 @@
}
public void testReadModifyApplyWithAssumedIDFailure2() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command select = das
- .createCommand("Select * from ORDERDETAILS");
- select.setConnection(getConnection());
+ .createCommand("Select * from ORDERDETAILS");
DataObject root = select.executeQuery();
DataObject od = root.getDataObject("ORDERDETAILS[1]");
@@ -314,8 +299,7 @@
//Flush changes -- This should fail because Order Details does not have a column that
// we can assume to be an ID
- try {
- das.setConnection(getConnection());
+ try {
das.applyChanges(root);
} catch (RuntimeException ex) {
assertTrue(ex.getMessage().contains("changed in the DataGraph but is not present in the Config"));
@@ -323,10 +307,9 @@
}
public void testReadModifyApplyWithAssumedIDFailure3() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command select = das
- .createCommand("Select * from ORDERDETAILS");
- select.setConnection(getConnection());
+ .createCommand("Select * from ORDERDETAILS");
DataObject root = select.executeQuery();
DataObject od = root.createDataObject("ORDERDETAILS");
@@ -334,9 +317,7 @@
//Modify customer
od.setInt("PRODUCTID", 72);
od.setInt("ORDERID", 500);
-
-
- das.setConnection(getConnection());
+
//Flush changes -- This should fail because Order Details does not have a column that
// we can assume to be an ID
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java Mon Jun 26 09:51:03 2006
@@ -68,15 +68,13 @@
// managedserverid, timestamp) values (316405209, 316405209, '2005-11-23
// 19:29:52.636')";
String sql = "insert into conmgt.serverstatus (managedserverid, timestamp) values (316405209, '2005-11-23 19:29:52.636')";
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand(sql);
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand(sql);
insert.execute();
// Verify
Command select = das
- .createCommand("Select * from conmgt.serverstatus where statusid = 316405209");
- select.setConnection(getConnection());
+ .createCommand("Select * from conmgt.serverstatus where statusid = 316405209");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("conmgt.serverstatus").size());
@@ -92,16 +90,14 @@
// String sql = "insert into conmgt.serverstatus (managedserverid,
// timestamp) values (316405209, '2005-11-23 19:29:52.636')";
String sql = "insert into conmgt.serverstatus (managedserverid, timestamp) values (:serverid, :timestamp)";
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand(sql);
insert.setParameterValue("serverid", new Integer(316405209));
- insert.setParameterValue("timestamp", "2005-11-23 19:29:52.636");
- insert.setConnection(getConnection());
+ insert.setParameterValue("timestamp", "2005-11-23 19:29:52.636");
insert.execute();
// Verify
- Command select = das.createCommand("Select * from conmgt.serverstatus");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from conmgt.serverstatus");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("SERVERSTATUS").size());
@@ -110,8 +106,7 @@
public void testWASDefect330118() throws Exception {
// Create the group and set common connection
- DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"));
- das.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
// Read all customers and add one
Command read = das.getCommand("all customers");
@@ -144,18 +139,16 @@
*
*/
public void testYingChen12162005() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das
- .createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
- insert.setConnection(getConnection());
+ .createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", "Williams");
insert.setParameterValue("ADDRESS", null);
insert.execute();
// Verify
- Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
@@ -168,8 +161,7 @@
public void testYingChen12162005Workaraound() throws Exception {
// Create the group and set common connection
- DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfig.xml"));
- das.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfig.xml"),getConnection());
Command insert = das.getCommand("insert customer");
insert.setParameterValue("ID", new Integer(10));
@@ -193,9 +185,8 @@
* that the parameter type is set.
*/
public void testDiltonsNullParameterBug1() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", null);
insert.setParameterType("LASTNAME", SDODataTypes.STRING);
@@ -203,8 +194,7 @@
insert.execute();
//Verify
- Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
@@ -216,9 +206,8 @@
* Error by not setting a parameter
*/
public void testDiltonsNullParameterBug2() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setParameterValue("ID", new Integer(10));
// insert.setParameterValue("LASTNAME", null);
insert.setParameterValue("ADDRESS", "5528 Wells Fargo Dr");
@@ -236,17 +225,15 @@
* Set parameter to empty string
*/
public void testDiltonsNullParameterBug3() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", "");
insert.setParameterValue("ADDRESS", "5528 Wells Fargo Dr");
insert.execute();
//Verify
- Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
@@ -294,11 +281,10 @@
ConfigHelper helper = new ConfigHelper();
helper.addUpdateStatement("update CUSTOMER set LASTNAME = :LASTNAME where ID = :ID", "CUSTOMER");
- DAS das = DAS.FACTORY.createDAS(helper.getConfig());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
//Read customer 1
- Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
DataObject root = select.executeQuery();
DataObject customer = (DataObject) root.get( "CUSTOMER[1]" );
@@ -331,10 +317,9 @@
public void testReadModifyApply1()
throws Exception
{
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD2.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerMappingWithCUD2.xml"), getConnection());
//Read customer 1
- Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
- select.setConnection( getConnection() );
+ Command select = das.createCommand( "Select * from CUSTOMER where ID = 1" );
DataObject root = select.executeQuery();
DataObject customer = (DataObject) root.get( "CUSTOMER[1]" );
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java Mon Jun 26 09:51:03 2006
@@ -16,11 +16,11 @@
*/
package org.apache.tuscany.das.rdb.test;
+import java.sql.Connection;
+
import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.ConfigHelper;
import org.apache.tuscany.das.rdb.DAS;
-import org.apache.tuscany.das.rdb.test.company.CompanyFactory;
-import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
import org.apache.tuscany.das.rdb.test.data.BookData;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.data.OrderData;
@@ -28,9 +28,6 @@
import org.apache.tuscany.das.rdb.test.framework.DasTest;
import org.apache.tuscany.sdo.util.SDOUtil;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
-
public class ExceptionTests extends DasTest {
public ExceptionTests() {
@@ -52,27 +49,27 @@
}
public void testMissingConnection() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
+ DAS das = DAS.FACTORY.createDAS((Connection)null);
+
try {
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
readCustomers.executeQuery();
fail("RuntimeException should be thrown");
- } catch (RuntimeException ex) {
- assertEquals("A DASConnection object must be specified before executing the query.", ex.getMessage());
+ } catch (RuntimeException ex) {
+ assertEquals("No connection has been provided and no data source has been specified", ex.getMessage());
}
}
public void testMissingMapping() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
- readCustomers.setConnection(getConnection());
- SDOUtil.registerStaticTypes(CompanyFactory.class);
- readCustomers.setDataObjectModel(TypeHelper.INSTANCE.getType(DataGraphRoot.class));
+ SDOUtil.registerStaticTypes(CustomerFactory.class);
+ DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomer.xml"), getConnection());
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
try {
- readCustomers.executeQuery();
+ readCustomers.executeQuery();
+
fail("Exception should be thrown");
} catch (RuntimeException ex) {
assertEquals("An SDO Type with name CUSTOMER was not found", ex.getMessage());
@@ -85,8 +82,7 @@
*/
public void testEmptyStream() throws Exception {
try {
- DAS das = DAS.FACTORY.createDAS(getConfig("NonExistingFile.xml"));
- // das.createCommand("select * from CUSTOMER where ID = 1", getConfig("NonExistingFile.xml"));
+ DAS.FACTORY.createDAS(getConfig("NonExistingFile.xml"));
fail("Error should be thrown");
} catch (RuntimeException e) {
assertEquals(
@@ -109,17 +105,16 @@
}
}
+
public void testReadOrdersAndDetails2() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("InvalidConfig1.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("InvalidConfig1.xml"), getConnection());
Command read = das
.createCommand(
- "SELECT * FROM ANORDER LEFT JOIN ORDERDETAILS ON ANORDER.ID = ORDERDETAILS.ORDERID ORDER BY ANORDER.ID",
- getConfig("InvalidConfig1.xml"));
- read.setConnection(getConnection());
+ "SELECT * FROM ANORDER LEFT JOIN ORDERDETAILS ON ANORDER.ID = ORDERDETAILS.ORDERID ORDER BY ANORDER.ID");
try {
- DataObject root = read.executeQuery();
+ read.executeQuery();
} catch ( Exception ex ) {
assertEquals("The parent table (xxx) in relationship ORDERDETAILS was not found.", ex.getMessage());
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java Mon Jun 26 09:51:03 2006
@@ -47,16 +47,14 @@
// Test insert into row with generated ID
public void testInsert() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into COMPANY (NAME) values (:NAME)");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into COMPANY (NAME) values (:NAME)");
insert.setParameterValue("NAME", "AAA Rental");
insert.execute();
// Verify insert
// Verify
- Command select = das.createCommand("Select ID, NAME from COMPANY");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select ID, NAME from COMPANY");
DataObject root = select.executeQuery();
assertEquals(4, root.getList("COMPANY").size());
@@ -67,9 +65,8 @@
// Test back to back insertions with the same command
public void testInsert2() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into COMPANY (NAME) values (:NAME)");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into COMPANY (NAME) values (:NAME)");
insert.setParameterValue("NAME", "AAA Rental");
insert.execute();
@@ -79,8 +76,7 @@
// Verify insert
// Verify
- Command select = das.createCommand("Select ID, NAME from COMPANY");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select ID, NAME from COMPANY");
DataObject root = select.executeQuery();
assertEquals(5, root.getList("COMPANY").size());
@@ -89,16 +85,14 @@
// Test ability to retrieve and utilize the generated key
public void testInsert3() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into COMPANY (NAME) values (:NAME)");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into COMPANY (NAME) values (:NAME)");
insert.setParameterValue("NAME", "AAA Rental");
insert.execute();
Integer key = (Integer) insert.getParameterValue("generated_key");
// Verify insert
- Command select = das.createCommand("Select ID, NAME from COMPANY where ID = :ID");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select ID, NAME from COMPANY where ID = :ID");
select.setParameterValue("ID", key);
DataObject root = select.executeQuery();
assertEquals(key, root.get("COMPANY[1]/ID"));
@@ -107,9 +101,8 @@
// Test ability to propogate generated values back to owning data objects
public void testPropagateIds() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"));
- Command select = das.createCommand("Select * from COMPANY");
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
+ Command select = das.createCommand("Select * from COMPANY");
DataObject root = select.executeQuery();
// Create a new Company
@@ -119,16 +112,14 @@
// verify pre-condition (id is not there until after flush)
assertNull(company.get("ID"));
- // Flush changes
- das.setConnection(getConnection());
+ // Flush changes
das.applyChanges(root);
// Save the id
Integer id = (Integer) company.get("ID");
// Verify the change
- select = das.createCommand("Select * from COMPANY where ID = :ID");
- select.setConnection(getConnection());
+ select = das.createCommand("Select * from COMPANY where ID = :ID");
select.setParameterValue("ID", id);
root = select.executeQuery();
assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
@@ -139,10 +130,8 @@
* Same as above but metadata provided by XML config file
*/
public void testPropagateIdsXML() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyMapping.xml"));
- Command select = das.createCommand("Select * from COMPANY",
- getConfig("basicCompanyMapping.xml"));
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyMapping.xml"), getConnection());
+ Command select = das.createCommand("Select * from COMPANY");
DataObject root = select.executeQuery();
// Create a new Company
@@ -153,16 +142,14 @@
// verify pre-condition (id is not there until after flush)
assertNull(company.get("ID"));
- // Flush changes
- das.setConnection(getConnection());
+ // Flush changes
das.applyChanges(root);
// Save the id
Integer id = (Integer) company.get("ID");
// Verify the change
- select = das.createCommand("Select * from COMPANY where ID = :ID");
- select.setConnection(getConnection());
+ select = das.createCommand("Select * from COMPANY where ID = :ID");
select.setParameterValue("ID", id);
root = select.executeQuery();
assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
@@ -175,12 +162,10 @@
*/
public void testFlushCreateHeirarchy() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"), getConnection());
String selectCompanys = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID";
- Command select = das.createCommand(selectCompanys,
- getConfig("basicCompanyDepartmentMapping.xml"));
- select.setConnection(getConnection());
+ Command select = das.createCommand(selectCompanys);
DataObject root = select.executeQuery();
// Create a new Company
@@ -198,8 +183,7 @@
// Associate the new department with the new company
company.getList("departments").add(department);
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
// Save the id
@@ -208,8 +192,7 @@
// Verify the change
String selectString = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID WHERE COMPANY.ID = :ID";
- select = das.createCommand(selectString);
- select.setConnection(getConnection());
+ select = das.createCommand(selectString);
select.setParameterValue("ID", id);
root = select.executeQuery();
assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
@@ -224,10 +207,8 @@
String selectCompanys = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID";
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"));
- Command select = das.createCommand(selectCompanys,
- getConfig("basicCompanyDepartmentMapping.xml"));
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCompanyDepartmentMapping.xml"), getConnection());
+ Command select = das.createCommand(selectCompanys);
DataObject root = select.executeQuery();
// Create a new Company
@@ -246,8 +227,7 @@
// Associate the new department with the new company
company.getList("departments").add(department);
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
// Save the id
@@ -256,8 +236,7 @@
// Verify the change
String selectString = "SELECT * FROM COMPANY LEFT JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID WHERE COMPANY.ID = :ID";
- select = das.createCommand(selectString);
- select.setConnection(getConnection());
+ select = das.createCommand(selectString);
select.setParameterValue("ID", id);
root = select.executeQuery();
assertEquals("Do-rite Pest Control", root.getDataObject("COMPANY[1]").getString("NAME"));
@@ -266,9 +245,8 @@
// Test that error is thrown when no key has been generated (as in a select)
public void testRead() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command select = das.createCommand("Select * from COMPANY");
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command select = das.createCommand("Select * from COMPANY");
select.executeQuery();
try {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java Mon Jun 26 09:51:03 2006
@@ -39,10 +39,9 @@
public void testSingleTableMerge() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command select = das
- .createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= :ID");
- select.setConnection(getConnection());
+ .createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= :ID");
select.setParameterValue("ID", "3");
DataObject graph1 = select.executeQuery();
assertEquals(3, graph1.getList("CUSTOMER").size());
@@ -59,10 +58,9 @@
}
public void testSingleTableMergeThreeGraphs() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command select = das
- .createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= :ID");
- select.setConnection(getConnection());
+ .createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where ID <= :ID");
select.setParameterValue("ID", "3");
DataObject graph1 = select.executeQuery();
assertEquals(3, graph1.getList("CUSTOMER").size());
@@ -89,13 +87,11 @@
public void testMultiTableMerge2() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
//Read some customers and related orders
Command select = das.createCommand(
- "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID", getConfig("CustomersOrdersConfig.xml"));
- select.setConnection(getConnection());
-
- select.setConnection(getConnection());
+ "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID");
+
select.setParameterValue("ID", new Integer(1));
DataObject graph1 = select.executeQuery();
@@ -126,21 +122,19 @@
}
public void testMultiTableAppendSingleTable2() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
//Read some customers and related orders
Command select = das.createCommand(
- "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID", getConfig("CustomersOrdersConfig.xml"));
- select.setConnection(getConnection());
-
- select.setConnection(getConnection());
+ "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID");
+
select.setParameterValue("ID", new Integer(1));
DataObject graph1 = select.executeQuery();
DataObject customer = (DataObject)graph1.getList("CUSTOMER").get(0);
assertEquals(2, customer.getList("orders").size());
- Command select2 = das.createCommand("select * from ANORDER");
- select2.setConnection(getConnection());
+ DAS das2 = DAS.FACTORY.createDAS(getConnection());
+ Command select2 = das2.createCommand("select * from ANORDER");
DataObject graph2 = select2.executeQuery();
assertEquals(4, graph2.getList("ANORDER").size());
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java Mon Jun 26 09:51:03 2006
@@ -49,11 +49,10 @@
*/
public void testRead() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("customerMapping.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("customerMapping.xml"), getConnection());
// Read a customer
Command select = das.createCommand(
- "SELECT * FROM CUSTOMER WHERE CUSTOMER.ID = 1", getConfig("customerMapping.xml"));
- select.setConnection(getConnection());
+ "SELECT * FROM CUSTOMER WHERE CUSTOMER.ID = 1");
DataObject root = select.executeQuery();
DataObject customer = root.getDataObject("Customer[1]");
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java Mon Jun 26 09:51:03 2006
@@ -32,10 +32,9 @@
public void testSimpleOCC() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfig.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfig.xml"), getConnection());
//Read a book instance
- Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
//Change a field to mark the instance 'dirty'
@@ -43,13 +42,11 @@
// Explicitly change OCC column in database to force collision
Command update = das
- .createCommand("update BOOK set OCC = :OCC where BOOK_ID = 1");
- update.setConnection(getConnection());
+ .createCommand("update BOOK set OCC = :OCC where BOOK_ID = 1");
update.setParameterValue("OCC", new Integer(100));
update.execute();
- try {
- das.setConnection(getConnection());
+ try {
das.applyChanges(root);
fail("An OCCException should be thrown");
} catch (RuntimeException ex) {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java Mon Jun 26 09:51:03 2006
@@ -45,9 +45,8 @@
public void test1() throws Exception {
DAS das = DAS.FACTORY
- .createDAS(getConfig("CompanyEmployeeConfig.xml"));
- das.setConnection(getConnection());
-
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
+
Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
DataObject employee = root.getDataObject("COMPANY[1]/company->employee_opposite");
@@ -62,8 +61,7 @@
public void test2() throws Exception {
DAS das = DAS.FACTORY
- .createDAS(getConfig("CompanyEmployeeConfig.xml"));
- das.setConnection(getConnection());
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
Command read = das.getCommand("get named employee with company");
read.setParameterValue("NAME", "Mary Smith");
@@ -80,8 +78,7 @@
public void test3() throws Exception {
DAS das = DAS.FACTORY
- .createDAS(getConfig("CompanyEmployeeConfig.xml"));
- das.setConnection(getConnection());
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
@@ -104,8 +101,7 @@
public void test4() throws Exception {
DAS das = DAS.FACTORY
- .createDAS(getConfig("CompanyEmployeeConfig.xml"));
- das.setConnection(getConnection());
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
@@ -129,8 +125,7 @@
public void test5() throws Exception {
DAS das = DAS.FACTORY
- .createDAS(getConfig("CompanyEmployeeConfig.xml"));
- das.setConnection(getConnection());
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"), getConnection());
Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java Mon Jun 26 09:51:03 2006
@@ -48,12 +48,10 @@
}
public void testInsert() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("cityStates.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("cityStates.xml"), getConnection());
Command select = das
.createCommand(
- "Select * from STATES inner join CITIES on STATES.ID = CITIES.STATE_ID",
- getConfig("cityStates.xml"));
- select.setConnection(getConnection());
+ "Select * from STATES inner join CITIES on STATES.ID = CITIES.STATE_ID");
DataObject root = select.executeQuery();
int numberOfStates = root.getList("STATES").size();
@@ -69,11 +67,9 @@
georgia.setString("NAME", "GA");
georgia.getList("cities").add(atlanta);
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
-
- select.setConnection(getConnection());
+
root = select.executeQuery();
assertEquals(numberOfCities + 1, root.getList("CITIES").size());
assertEquals(numberOfStates + 1, root.getList("STATES").size());
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java Mon Jun 26 09:51:03 2006
@@ -38,10 +38,9 @@
}
public void testPaging() throws SQLException {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Build command to read all customers
- Command custCommand = das.createCommand("select * from CUSTOMER order by ID");
- custCommand.setConnection(getConnection());
+ Command custCommand = das.createCommand("select * from CUSTOMER order by ID");
//Create a pager with the command
Pager pager = new PagerImpl(custCommand, 2);
@@ -71,13 +70,10 @@
public void testRandomPage() throws SQLException {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Build the select command
Command select = das
- .createCommand("select * from CUSTOMER order by ID");
-
- //Parameterize the command
- select.setConnection(getConnection());
+ .createCommand("select * from CUSTOMER order by ID");
//Create a pager
Pager pager = new PagerImpl(select, 2);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java Mon Jun 26 09:51:03 2006
@@ -41,9 +41,8 @@
}
public void testPartialUpdate() throws SQLException {
- DAS das = DAS.FACTORY.createDAS();
- Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
- readCustomers.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
// Read
DataObject root = readCustomers.executeQuery();
@@ -52,13 +51,11 @@
// Verify
assertEquals(1, customer.getInt("ID"));
- Command update = das.createCommand("update CUSTOMER set LASTNAME = 'modified' where ID = 1");
- update.setConnection(getConnection());
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = 'modified' where ID = 1");
update.execute();
customer.setString("ADDRESS", "main street");
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
root = readCustomers.executeQuery();
@@ -71,9 +68,8 @@
}
public void testPartialInsert() throws SQLException {
- DAS das = DAS.FACTORY.createDAS();
- Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
- readCustomers.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
// Read
DataObject root = readCustomers.executeQuery();
@@ -84,12 +80,10 @@
newCust.set("ADDRESS", "5528 Wells Fargo Drive");
// Purposely do not set lastname to let it default to 'Garfugengheist'
// newCust.set("LASTNAME", "Gerkin" );
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
- Command readNewCust = das.createCommand("select * from CUSTOMER where ID = 100");
- readNewCust.setConnection(getConnection());
+ Command readNewCust = das.createCommand("select * from CUSTOMER where ID = 100");
root = readNewCust.executeQuery();
// If partial insert was not used, LASTNAME would not be
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java Mon Jun 26 09:51:03 2006
@@ -51,10 +51,9 @@
java.sql.Connection c = getConnection();
try {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(c);
// Read customer 1
- Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
- select.setConnection(c);
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
DataObject root = select.executeQuery();
DataObject customer = (DataObject) root.get("CUSTOMER[1]");
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java Mon Jun 26 09:51:03 2006
@@ -47,10 +47,9 @@
* config associaed with the applychanges command
*/
public void test_1() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
// Read a book instance
- Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
// Change a field to mark the instance 'dirty'
@@ -72,19 +71,17 @@
// Create config programmatically
ConfigHelper helper = new ConfigHelper();
helper.addPrimaryKey("BOOK.BOOK_ID");
- DAS das = DAS.FACTORY.createDAS(helper.getConfig());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
// Read a book instance
- Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
// Change a field to mark the instance 'dirty'
book.setInt("QUANTITY", 2);
// Flush the change
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
// Verify
@@ -105,9 +102,8 @@
// Create relationship config programmatically
ConfigHelper helper = new ConfigHelper();
helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID");
- DAS das = DAS.FACTORY.createDAS(helper.getConfig());
- Command select = das.createCommand(statement);
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+ Command select = das.createCommand(statement);
DataObject root = select.executeQuery();
DataObject customer = root.getDataObject("CUSTOMER[1]");
@@ -128,9 +124,8 @@
helper.addTable("BOOK", "Book");
helper.addPrimaryKey("Book.BOOK_ID");
- DAS das = DAS.FACTORY.createDAS(helper.getConfig());
- Command select = das.createCommand(statement);
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+ Command select = das.createCommand(statement);
select.setParameterValue("ID", new Integer(1));
DataObject root = select.executeQuery();
@@ -139,8 +134,7 @@
newBook.setString("NAME", "Ant Colonies of the Old World");
newBook.setInt("BOOK_ID", 1001);
root.getList("Book").add(newBook);
-
- das.setConnection(getConnection());
+
das.applyChanges(root);
//Verify
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java Mon Jun 26 09:51:03 2006
@@ -43,9 +43,8 @@
public void testReadTableInfo() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command select = das.createCommand("SELECT * from SYSIBM.SYSTABLES WHERE TYPE = 'T'");
- select.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command select = das.createCommand("SELECT * from SYSIBM.SYSTABLES WHERE TYPE = 'T'");
DataObject root = select.executeQuery();
DataObject table = (DataObject)root.get("SYSTABLES[1]");
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java Mon Jun 26 09:51:03 2006
@@ -34,8 +34,7 @@
public void testReadEngineParts() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("PartsConfig.xml"));
- das.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("PartsConfig.xml"), getConnection());
//Table definition
//CREATE TABLE PART (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), QUANTITY INT, PARENT_ID INT );
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java Mon Jun 26 09:51:03 2006
@@ -51,10 +51,9 @@
String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
- DAS das = DAS.FACTORY.createDAS(getConfig("customerOrderRelationshipMapping.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("customerOrderRelationshipMapping.xml"), getConnection());
// Read some customers and related orders
- Command select = das.createCommand(statement, getConfig("customerOrderRelationshipMapping.xml"));
- select.setConnection(getConnection());
+ Command select = das.createCommand(statement);
DataObject root = select.executeQuery();
DataObject customer = root.getDataObject("CUSTOMER[1]");
@@ -69,13 +68,11 @@
*/
public void testRelationshipModification2() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerOrderMapping.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerOrderMapping.xml"), getConnection());
// Read some customers and related orders
Command select = das
.createCommand(
- "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID",
- getConfig("basicCustomerOrderMapping.xml"));
- select.setConnection(getConnection());
+ "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID");
DataObject root = select.executeQuery();
@@ -94,16 +91,13 @@
cust1.getList("orders").add(order);
- // Flush changes
- das.setConnection(getConnection());
+ // Flush changes
das.applyChanges(root);
// verify cust1 relationship updates
select = das
.createCommand(
- "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID",
- getConfig("basicCustomerOrderMapping.xml"));
- select.setConnection(getConnection());
+ "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID");
select.setParameterValue("ID", cust1ID);
root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java Mon Jun 26 09:51:03 2006
@@ -46,12 +46,9 @@
*/
public void testReadSingle() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfigWithIDConverter.xml"));
- das.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfigWithIDConverter.xml"),getConnection());
// Create and initialize command to read customers
- Command readCustomers = das.getCommand("literal");
-
- readCustomers.setConnection(getConnection());
+ Command readCustomers = das.getCommand("literal");
// Read
DataObject root = readCustomers.executeQuery();
@@ -74,10 +71,9 @@
// Using literals in the select forces invalid resultset metadata
String sqlString = "Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer";
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
// Create and initialize command to read customers
- Command readCustomers = das.createCommand(sqlString);
- readCustomers.setConnection(getConnection());
+ Command readCustomers = das.createCommand(sqlString);
// Read
DataObject root = readCustomers.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java Mon Jun 26 09:51:03 2006
@@ -57,9 +57,8 @@
public void testReadSingle() throws Exception {
//Create and initialize command to read customers
- DAS das = DAS.FACTORY.createDAS();
- Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
- readCustomers.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
//Read
DataObject root = readCustomers.executeQuery();
@@ -73,21 +72,12 @@
*/
public void testReadSingle2() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Create and initialize command to read customers
- Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
- readCustomers.setConnection(getConnection());
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
//Read
- DataObject root = readCustomers.executeQuery();
-
- DataObject cust = root.getDataObject("CUSTOMER[1]");
-
-// int n = (cust.getType().getProperties()).size();
-// for (int i=0; i<n; i++) {
-// System.out.println(cust.get(i));
-// }
-
+ DataObject root = readCustomers.executeQuery();
//Verify
assertEquals(1, root.getInt("CUSTOMER[1]/ID"));
@@ -98,10 +88,9 @@
* Same as above but tests tolerance of white space in provided SQL
*/
public void testReadSingleWithWhiteSpace() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Create and initialize command to read customers
- Command readCustomers = das.createCommand(" select * from CUSTOMER where ID = 1");
- readCustomers.setConnection(getConnection());
+ Command readCustomers = das.createCommand(" select * from CUSTOMER where ID = 1");
//Read
DataObject root = readCustomers.executeQuery();
@@ -115,11 +104,10 @@
*/
public void testReadMultiple() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Create and initialize command to read customers
Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = 'Williams'");
- readCustomers.setConnection(getConnection());
-
+
//Read
DataObject root = readCustomers.executeQuery();
@@ -132,10 +120,9 @@
* LASTNAME value is provided via a parameter
*/
public void testReadMultipleWithParameters() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Create and initialize command to read customers
- Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = :LASTNAME");
- readCustomers.setConnection(getConnection());
+ Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = :LASTNAME");
//Parameterize the command
readCustomers.setParameterValue("LASTNAME", "Williams");
@@ -146,14 +133,12 @@
}
public void testInsert() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command insert = das.createCommand("insert into CUSTOMER values (10, 'Williams', '5528 Wells Fargo Dr')");
- insert.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into CUSTOMER values (10, 'Williams', '5528 Wells Fargo Dr')");
insert.execute();
//Verify
- Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
@@ -161,9 +146,8 @@
}
public void testInsertWithParameters() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
- insert.setConnection(getConnection());
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", "Williams");
insert.setParameterValue("ADDRESS", "5528 Wells Fargo Dr");
@@ -171,7 +155,6 @@
//Verify
Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
- select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
@@ -180,16 +163,14 @@
public void testDelete() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Verify pre-condition
- Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
//Create and execute the delete command
- Command delete = das.createCommand("delete from CUSTOMER where ID = 1");
- delete.setConnection(getConnection());
+ Command delete = das.createCommand("delete from CUSTOMER where ID = 1");
delete.execute();
//Verify delete by reusing the original select command
@@ -200,15 +181,13 @@
public void testUpdate() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Verify pre-condition
- Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
- Command update = das.createCommand("update CUSTOMER set LASTNAME = 'Pavick' where ID = 1");
- update.setConnection(getConnection());
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = 'Pavick' where ID = 1");
update.execute();
//Verify update - reuse select command
@@ -218,15 +197,13 @@
}
public void testUpdateWithParameters() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Verify pre-condition
- Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
- Command update = das.createCommand("update CUSTOMER set LASTNAME = :LASTNAME where ID = :ID");
- update.setConnection(getConnection());
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = :LASTNAME where ID = :ID");
update.setParameterValue("LASTNAME", "Pavick");
update.setParameterValue("ID", new Integer(1));
update.execute();
@@ -238,15 +215,13 @@
}
public void testUpdateWithParmarkers() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Verify pre-condition
- Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
- Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
- update.setConnection(getConnection());
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
update.setParameterValue(1, "Pavick");
update.setParameterValue(2, new Integer(1));
update.execute();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java Mon Jun 26 09:51:03 2006
@@ -19,8 +19,6 @@
import org.apache.tuscany.das.rdb.Command;
import org.apache.tuscany.das.rdb.DAS;
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.SDODataTypes;
import org.apache.tuscany.das.rdb.test.data.CompanyData;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.data.OrderData;
@@ -46,9 +44,8 @@
// Call a simple stored proc to read all companies
public void testGetCompanies() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command read = das.createCommand("{call GETALLCOMPANIES()}");
- read.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command read = das.createCommand("{call GETALLCOMPANIES()}");
DataObject root = read.executeQuery();
//Verify
@@ -58,10 +55,9 @@
}
public void testGetNamedCompany() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command read = das.createCommand("{call GETNAMEDCOMPANY(?)}");
-
- read.setConnection(getConnection());
+
read.setParameterValue(1, "MegaCorp");
DataObject root = read.executeQuery();
@@ -70,11 +66,10 @@
}
public void testGetNamedCompanyByName() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command read = das
.createCommand("{call GETNAMEDCOMPANY(:NAME)}");
-
- read.setConnection(getConnection());
+
read.setParameterValue("NAME", "MegaCorp");
DataObject root = read.executeQuery();
@@ -84,9 +79,8 @@
// Retreive heirarchy using a stored proc ... new programming model
public void testGetCustomersAndOrder() throws Exception {
- DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"));
- Command read = das.createCommand("{call getCustomerAndOrders(?)}", getConfig("CustomersOrdersConfig.xml"));
- read.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"), getConnection());
+ Command read = das.createCommand("{call getCustomerAndOrders(?)}");
read.setParameterValue(1, new Integer(1));
DataObject root = read.executeQuery();
@@ -105,11 +99,9 @@
* in the out parameter
*/
public void testGetNamedCustomers() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command read =das.createCommand("{call GETNAMEDCUSTOMERS(?,?)}");
- read.setConnection(getConnection());
- read.setParameterValue(1, "Williams");
- read.addParameter(2, Parameter.OUT, SDODataTypes.INTEGER);
+ DAS das = DAS.FACTORY.createDAS(getConfig("storedProcTest.xml"), getConnection());
+ Command read = das.getCommand("getNamedCustomers");
+ read.setParameterValue(1, "Williams");
DataObject root = read.executeQuery();
Integer customersRead = (Integer) read.getParameterValue(2);
@@ -125,15 +117,13 @@
// Simplest possible SP write
public void testDelete() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
- Command delete = das.createCommand("{call DELETECUSTOMER(?)}");
- delete.setConnection(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command delete = das.createCommand("{call DELETECUSTOMER(?)}");
delete.setParameterValue(1, new Integer(1));
delete.execute();
// Verify DELETE
- Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
DataObject root = select.executeQuery();
assertTrue(root.getList("CUSTOMER").isEmpty());
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java Mon Jun 26 09:51:03 2006
@@ -31,7 +31,6 @@
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
public class TopDown extends DasTest {
@@ -45,21 +44,15 @@
// Uses dynamic SDOs but user provides the model
public void testUserProvidedModelDynamic() throws SQLException, IOException {
- DAS das = DAS.FACTORY.createDAS(getConfig("1xM_mapping_no_cud.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomerOrder.xml"), getConnection());
// Build the select command
Command select = das
.createCommand(
- "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID",
- getConfig("1xM_mapping_no_cud.xml"));
+ "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID");
- SDOUtil.registerStaticTypes(CustomerFactory.class);
-
-// Set the object model
- select.setDataObjectModel(TypeHelper.INSTANCE.getType(DataGraphRoot.class));
-
+ SDOUtil.registerStaticTypes(CustomerFactory.class);
- // Parameterize the command
- select.setConnection(getConnection());
+ // Parameterize the command
select.setParameterValue("ID", new Integer(1));
// Get the graph - DataGraphRoot is from the typed package
@@ -74,7 +67,6 @@
order.setProduct("Kitchen Sink 001");
// Flush changes
- das.setConnection(getConnection());
das.applyChanges((DataObject) root);
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java Mon Jun 26 09:51:03 2006
@@ -44,10 +44,9 @@
* Read various types.
*/
public void testRead() throws Exception {
- DAS das = DAS.FACTORY.createDAS();
+ DAS das = DAS.FACTORY.createDAS(getConnection());
//Read customer 1
- Command select = das.createCommand("Select * from TYPETEST where ID = 1");
- select.setConnection(getConnection());
+ Command select = das.createCommand("Select * from TYPETEST where ID = 1");
DataObject root = select.executeQuery();
DataObject types = (DataObject)root.get("TYPETEST[1]");
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java Mon Jun 26 09:51:03 2006
@@ -50,11 +50,12 @@
t.setTableName("CUSTOMER");
t.setTypeName("Customer");
mapping.getTable().add(t);
+
+ mapping.setDataObjectModel("org.apache.tuscany.das.rdb.test.customer.DataGraphRoot");
}
public ReadCustomersStaticTypesCommand() {
- super(sqlString, mapping, null);
- setDataObjectModel(TypeHelper.INSTANCE.getType(DataGraphRoot.class));
+ super(sqlString, mapping, null);
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java Mon Jun 26 09:51:03 2006
@@ -37,7 +37,6 @@
public class DasTest extends TestCase {
public static Connection connection = null;
- private boolean usingDefaultSetup = false;
/**
* Tears down the fixture, for example, close a network connection. This
@@ -83,9 +82,7 @@
* TODO - refactor to avoid this hackiness ... could move this logic to its own
* class that is then invoked by DatabaseSetUp
*/
- private void defaultSetup() {
-
- usingDefaultSetup = true;
+ private void defaultSetup() {
// DatabaseSetup setUp = new DB2Setup(this);
DatabaseSetup setUp = new DerbySetup(this);
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java Mon Jun 26 09:51:03 2006
@@ -47,12 +47,12 @@
" DELETE FROM CUSTOMER WHERE ID = theId ";
- String createGetNamedCustomers =
- "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), OUT theCount INTEGER ) " +
- " BEGIN " +
- " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; " +
- " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); " +
- " END ";
+// String createGetNamedCustomers =
+// "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), OUT theCount INTEGER ) " +
+// " BEGIN " +
+// " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; " +
+// " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); " +
+// " END ";
String createGetCustomerAndOrders =
" CREATE PROCEDURE `dastest`.`GETCUSTOMERANDORDERS` (theId INT) " +
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java Mon Jun 26 09:51:03 2006
@@ -27,8 +27,6 @@
import org.apache.tuscany.das.rdb.test.framework.DasTest;
import org.apache.tuscany.sdo.util.SDOUtil;
-import commonj.sdo.helper.TypeHelper;
-
/**
*/
@@ -41,15 +39,11 @@
public void testRead() throws Exception {
InputStream mapping = getClass().getClassLoader().getResourceAsStream("basicStaticCustomer.xml");
- DAS das = DAS.FACTORY.createDAS(mapping);
+ DAS das = DAS.FACTORY.createDAS(mapping, getConnection());
SDOUtil.registerStaticTypes(CustomerFactory.class);
- Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = :LASTNAME");
- select.setConnection(getConnection());
- select.setParameterValue("LASTNAME", "Williams");
- TypeHelper helper = TypeHelper.INSTANCE;
-
- select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+ Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = :LASTNAME");
+ select.setParameterValue("LASTNAME", "Williams");
DataGraphRoot root = (DataGraphRoot) select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml Mon Jun 26 09:51:03 2006
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table tableName="CUSTOMER" typeName="Customer">
<Column columnName="ID" propertyName="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml Mon Jun 26 09:51:03 2006
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table tableName="CUSTOMER">
<Column columnName="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml Mon Jun 26 09:51:03 2006
@@ -14,7 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+dataObjectModel="org.apache.tuscany.das.rdb.test.customer.DataGraphRoot">
<Table tableName="CUSTOMER" typeName="Customer">
<Column columnName="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml?rev=417233&r1=417232&r2=417233&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml Mon Jun 26 09:51:03 2006
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" dataObjectModel="org.apache.tuscany.das.rdb.test.company.DatagraphRoot">
<Table tableName="COMPANY" typeName="CompanyType">
<Column columnName="ID" primaryKey="true"/>
Added: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml?rev=417233&view=auto
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml (added)
+++ incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml Mon Jun 26 09:51:03 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+dataObjectModel="org.apache.tuscany.das.rdb.test.customer.DataGraphRoot">
+
+
+</Config>
Propchange: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml?rev=417233&view=auto
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml (added)
+++ incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml Mon Jun 26 09:51:03 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+dataObjectModel="org.apache.tuscany.das.rdb.test.customer.DataGraphRoot">
+
+ <Table tableName="CUSTOMER" typeName="Customer">
+ <Column columnName="ID" primaryKey="true"/>
+ </Table>
+ <Table tableName="ANORDER" typeName="AnOrder">
+ <Column columnName="ID" primaryKey="true"/>
+ <Column columnName="CUSTOMER_ID"/>
+ </Table>
+
+ <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
+ <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
+ </Relationship>
+
+</Config>
Propchange: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org