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/30 17:30:37 UTC
svn commit: r418312 - in /incubator/tuscany/java/das/rdb/src/test:
java/org/apache/tuscany/das/rdb/test/ resources/
Author: kwilliams
Date: Fri Jun 30 08:30:36 2006
New Revision: 418312
URL: http://svn.apache.org/viewvc?rev=418312&view=rev
Log:
Some clean up of test classes
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
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=418312&r1=418311&r2=418312&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 Fri Jun 30 08:30:36 2006
@@ -101,8 +101,9 @@
// Test ability to propogate generated values back to owning data objects
public void testPropagateIds() throws Exception {
+
DAS das = DAS.FACTORY.createDAS(getConfig("CompanyConfig.xml"), getConnection());
- Command select = das.createCommand("Select * from COMPANY");
+ Command select = das.getCommand("all companies");
DataObject root = select.executeQuery();
// Create a new Company
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=418312&r1=418311&r2=418312&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 Fri Jun 30 08:30:36 2006
@@ -32,20 +32,21 @@
public void testSimpleOCC() throws Exception {
+
DAS das = DAS.FACTORY.createDAS(getConfig("BooksConfig.xml"), getConnection());
//Read a book instance
- Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
+ Command select = das.getCommand("select book 1");
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
//Change a field to mark the instance 'dirty'
book.setInt("QUANTITY", 2);
// Explicitly change OCC column in database to force collision
- Command update = das
- .createCommand("update BOOK set OCC = :OCC where BOOK_ID = 1");
- update.setParameterValue("OCC", new Integer(100));
+ Command update = das.getCommand("update book 1");
+ update.setParameterValue(1, new Integer(100));
update.execute();
+ //Try to apply changes an catch the OCC Exception
try {
das.applyChanges(root);
fail("An OCCException should be thrown");
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=418312&r1=418311&r2=418312&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 Fri Jun 30 08:30:36 2006
@@ -44,22 +44,21 @@
// Uses dynamic SDOs but user provides the model
public void testUserProvidedModelDynamic() throws SQLException, IOException {
- 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");
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomerOrder.xml"), getConnection());
+
+ Command select = das.getCommand("Customer and Orders");
+
+ SDOUtil.registerStaticTypes(CustomerFactory.class);
// Parameterize the command
- select.setParameterValue("ID", new Integer(1));
+ select.setParameterValue(1, new Integer(1));
// Get the graph - DataGraphRoot is from the typed package
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
+ DataObject root = select.executeQuery();
// Modify a customer
- Customer customer = (Customer) root.getCustomers().get(0);
+ Customer customer = (Customer)root.getDataObject("customers[1]");
customer.setLastName("Pavick");
// Modify an order
Modified: incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml?rev=418312&r1=418311&r2=418312&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml Fri Jun 30 08:30:36 2006
@@ -14,9 +14,12 @@
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">
-
- <Table tableName="BOOK">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <Command name="select book 1" SQL="select * from BOOK where BOOK_ID = 1" kind="Select"/>
+ <Command name="update book 1" SQL="update BOOK set OCC = ? where BOOK_ID = 1" kind="Update"/>
+
+ <Table tableName="BOOK">
<Column columnName="BOOK_ID" primaryKey="true"/>
<Column columnName="OCC" collision="true"/>
</Table>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml?rev=418312&r1=418311&r2=418312&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml Fri Jun 30 08:30:36 2006
@@ -23,11 +23,6 @@
<Command name="all departments for company" SQL="select * from COMPANY inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = :ID" kind="Select"/>
<Command name="company by id with departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = :ID" kind="Select"/>
-
-<!--
- <ConnectionProperties dataSource="java:comp/env/jdbc/dastest"/>
--->
-
<Table tableName="COMPANY">
<Column columnName="ID" primaryKey="true" generated="true"/>
Modified: 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=418312&r1=418311&r2=418312&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml Fri Jun 30 08:30:36 2006
@@ -17,7 +17,9 @@
<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">
-
+
+ <Command name="Customer and Orders" SQL="SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?" kind="Select"/>
+
<Table tableName="CUSTOMER" typeName="Customer">
<Column columnName="ID" primaryKey="true"/>
</Table>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org