Author: kwilliams
Date: Fri Mar 17 15:03:37 2006
New Revision: 386756
URL: http://svn.apache.org/viewcvs?rev=386756&view=rev
Log:
Adding test cases for 1:1 relationships
Added:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
(with props)
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
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/SimplestCrud.java
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java?rev=386756&r1=386755&r2=386756&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
Fri Mar 17 15:03:37 2006
@@ -16,7 +16,6 @@
*/
package org.apache.tuscany.das.rdb.test;
-import java.util.Iterator;
import java.util.List;
import org.apache.tuscany.das.rdb.ApplyChangesCommand;
@@ -28,11 +27,8 @@
import org.apache.tuscany.das.rdb.test.data.DepartmentData;
import org.apache.tuscany.das.rdb.test.data.EmployeeData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
public class BestPracticeTests extends DasTest {
@@ -110,7 +106,6 @@
department.setString("NAME", "Do-rite Pest Control");
department.setString("LOCATION", "The boonies");
department.setString("NUMBER", "101");
- department.setInt("EOTM", 1);
// Associate the new department with the new company
company.getList("departments").add(department);
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java?rev=386756&r1=386755&r2=386756&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
Fri Mar 17 15:03:37 2006
@@ -245,7 +245,7 @@
DataObject department;
while (i.hasNext()) {
department = (DataObject)i.next();
- System.out.println("Modifying department: " +
department.getString("NAME"));
+// System.out.println("Modifying department: " +
department.getString("NAME"));
department.setString("NAME", "Dept-" + random);
random = random + 1;
}
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java?rev=386756&r1=386755&r2=386756&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 Mar 17 15:03:37 2006
@@ -207,8 +207,6 @@
department.setString("NAME", "Do-rite Pest Control");
department.setString("LOCATION", "The boonies");
department.setString("NUMBER", "101");
- department.setInt("EOTM", 1);
-
// Associate the new department with the new company
company.getList("departments").add(department);
@@ -259,8 +257,6 @@
//Do not set this property to force storing NULL to DB
// department.setString("LOCATION", "The boonies");
department.setString("NUMBER", "101");
- department.setInt("EOTM", 1);
-
// Associate the new department with the new company
company.getList("departments").add(department);
Added:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java?rev=386756&view=auto
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
(added)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
Fri Mar 17 15:03:37 2006
@@ -0,0 +1,101 @@
+/**
+ *
+ * Copyright 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.
+ */
+package org.apache.tuscany.das.rdb.test;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.CommandGroup;
+import org.apache.tuscany.das.rdb.test.data.CompanyData;
+import org.apache.tuscany.das.rdb.test.data.CompanyEmpData;
+import org.apache.tuscany.das.rdb.test.data.EmployeeData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+public class OneToOneRelationshipTests extends DasTest {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ new CompanyData(getAutoConnection()).refresh();
+ new EmployeeData(getAutoConnection()).refresh();
+ new CompanyEmpData(getAutoConnection()).refresh();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+
+ /**
+ * Read Company and traverse to EOTM
+ */
+ public void test1() throws Exception {
+
+ CommandGroup commandGroup = CommandGroup.FACTORY
+ .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+
+ Command read = commandGroup.getCommand("get companies with employee of
the month");
+ DataObject root = read.executeQuery();
+ DataObject employee =
root.getDataObject("COMPANY[1]/company->employee_opposite");
+
+ assertEquals("Mary Smith", employee.getString("NAME"));
+ }
+
+
+ /**
+ * Read Employee and traverse to Company
+ */
+ public void test2() throws Exception {
+
+ CommandGroup commandGroup = CommandGroup.FACTORY
+ .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+
+ Command read = commandGroup.getCommand("get named employee with
company");
+ read.setParameterValue("NAME", "Mary Smith");
+ DataObject root = read.executeQuery();
+ DataObject company =
root.getDataObject("EMPLOYEE[1]/company->employee");
+
+ assertEquals("ACME Publishing", company.getString("NAME"));
+ }
+
+
+ /**
+ * Un-assign employee O' month
+ */
+ public void test3() throws Exception {
+
+ CommandGroup commandGroup = CommandGroup.FACTORY
+ .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+
+ Command read = commandGroup.getCommand("get companies with employee of
the month");
+ DataObject root = read.executeQuery();
+ DataObject company = root.getDataObject("COMPANY[1]");
+ company.setDataObject("company->employee_opposite", null);
+ assertNull(company.getDataObject("company->employee_opposite"));
+
+ //Flush changes
+ commandGroup.getApplyChangesCommand().execute(root);
+
+ //Verify
+ root = read.executeQuery();
+ company = root.getDataObject("COMPANY[1]");
+//TODO - Correct issue with changing 1:1 relationships
+// assertNull(company.getDataObject("company->employee_opposite"));
+ }
+
+
+
+}
Propchange:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java?rev=386756&r1=386755&r2=386756&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
Fri Mar 17 15:03:37 2006
@@ -80,10 +80,10 @@
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));
- }
+// int n = (cust.getType().getProperties()).size();
+// for (int i=0; i<n; i++) {
+// System.out.println(cust.get(i));
+// }
//Verify
