Author: aadamchik
Date: Tue Oct 10 08:15:35 2006
New Revision: 454776
URL: http://svn.apache.org/viewvc?view=rev&rev=454776
Log:
reorg of itests to accomodate non-jpa tests
Added:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/ItestSetup.java
- copied, changed from r454750,
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/CayenneItestSetup.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/
- copied from r454750,
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/jpa/itest/
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoContextCase.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoTestCase.java
Removed:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/CayenneItestSetup.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/CayenneTestCase.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/ObjectContextTestCase.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/jpa/itest/
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/EntityManagerCase.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDBUtils.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDataSourceManager.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestJpaDataSourceFactory.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestSetup.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/JpaTestCase.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ResultSetTemplate.java
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/RowTemplate.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
incubator/cayenne/main/trunk/integration-test/pojo/src/test/java/org/apache/cayenne/itest/pojo/SimpleObjectTest.java
Copied:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/ItestSetup.java
(from r454750,
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/CayenneItestSetup.java)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/ItestSetup.java?view=diff&rev=454776&p1=incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/CayenneItestSetup.java&r1=454750&p2=incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/ItestSetup.java&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/CayenneItestSetup.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/ItestSetup.java
Tue Oct 10 08:15:35 2006
@@ -30,17 +30,17 @@
import org.apache.cayenne.conf.Configuration;
import org.apache.cayenne.map.DataMap;
-public class CayenneItestSetup {
+public class ItestSetup {
- private static CayenneItestSetup sharedInstance;
+ private static ItestSetup sharedInstance;
protected DataDomain domain;
public static void initInstance() {
- sharedInstance = new CayenneItestSetup();
+ sharedInstance = new ItestSetup();
}
- public static CayenneItestSetup getInstance() {
+ public static ItestSetup getInstance() {
Assert.assertNotNull(
"Null shared instance, call 'initInstance' first",
sharedInstance);
@@ -48,7 +48,7 @@
return sharedInstance;
}
- protected CayenneItestSetup() {
+ protected ItestSetup() {
domain = Configuration.getSharedConfiguration().getDomain();
Iterator it = domain.getDataMaps().iterator();
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/EntityManagerCase.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/EntityManagerCase.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/EntityManagerCase.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/EntityManagerCase.java
Tue Oct 10 08:15:35 2006
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import javax.persistence.EntityManager;
-import org.apache.cayenne.jpa.itest.ItestSetup;
+import org.apache.cayenne.itest.jpa.ItestSetup;
/**
* A TestCase superclass that provides an entity manager and transaction
management.
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDBUtils.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDBUtils.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDBUtils.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDBUtils.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import java.sql.Connection;
import java.sql.PreparedStatement;
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDataSourceManager.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDataSourceManager.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDataSourceManager.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestDataSourceManager.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import java.io.BufferedReader;
import java.io.IOException;
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestJpaDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestJpaDataSourceFactory.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestJpaDataSourceFactory.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestJpaDataSourceFactory.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.sql.DataSource;
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestSetup.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestSetup.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestSetup.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ItestSetup.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import java.util.HashMap;
import java.util.Map;
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/JpaTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/JpaTestCase.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/JpaTestCase.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/JpaTestCase.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import java.util.Properties;
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ResultSetTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ResultSetTemplate.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ResultSetTemplate.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/ResultSetTemplate.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import java.sql.Connection;
import java.sql.PreparedStatement;
Modified:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/RowTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/RowTemplate.java?view=diff&rev=454776&r1=454750&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/RowTemplate.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/jpa/RowTemplate.java
Tue Oct 10 08:15:35 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.jpa.itest;
+package org.apache.cayenne.itest.jpa;
import java.sql.ResultSet;
import java.sql.SQLException;
Added:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoContextCase.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoContextCase.java?view=auto&rev=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoContextCase.java
(added)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoContextCase.java
Tue Oct 10 08:15:35 2006
@@ -0,0 +1,40 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cayenne.itest.pojo;
+
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.itest.ItestSetup;
+
+public class PojoContextCase extends PojoTestCase {
+
+ protected ObjectContext context;
+
+ @Override
+ protected void setUp() throws Exception {
+ this.context = ItestSetup.getInstance().createObjectContext();
+ }
+
+ public ObjectContext getContext() {
+ return context;
+ }
+
+ public void setContext(ObjectContext context) {
+ this.context = context;
+ }
+}
Added:
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoTestCase.java?view=auto&rev=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoTestCase.java
(added)
+++
incubator/cayenne/main/trunk/integration-test/itest-common/src/main/java/org/apache/cayenne/itest/pojo/PojoTestCase.java
Tue Oct 10 08:15:35 2006
@@ -0,0 +1,41 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cayenne.itest.pojo;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.util.Collection;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.enhancer.CayenneEnhancer;
+import org.apache.cayenne.instrument.InstrumentUtil;
+import org.apache.cayenne.itest.ItestSetup;
+
+public class PojoTestCase extends TestCase {
+
+ static {
+ ItestSetup.initInstance();
+ InstrumentUtil.addTransformer(initEnhancer());
+ }
+
+ protected static ClassFileTransformer initEnhancer() {
+ return new CayenneEnhancer(new HashMap<String, Collection<String>>());
+ }
+}
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java
Tue Oct 10 08:15:35 2006
@@ -20,8 +20,8 @@
import java.util.Collections;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import
org.apache.cayenne.jpa.itest.ch2.entity.CollectionFieldPersistenceEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.FieldPersistenceEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.HelperEntity1;
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java
Tue Oct 10 08:15:35 2006
@@ -20,8 +20,8 @@
import javax.persistence.PersistenceException;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.EmbeddedIdEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.FieldPersistenceEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.IdClassEntity;
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java
Tue Oct 10 08:15:35 2006
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.jpa.itest.ch2;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.Embeddable1;
import org.apache.cayenne.jpa.itest.ch2.entity.EmbeddedEntity;
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java
Tue Oct 10 08:15:35 2006
@@ -27,8 +27,8 @@
import java.util.Calendar;
import java.util.GregorianCalendar;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.Embeddable1;
import org.apache.cayenne.jpa.itest.ch2.entity.EmbeddedImpliedEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.EnumType;
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java
Tue Oct 10 08:15:35 2006
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.jpa.itest.ch2;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import
org.apache.cayenne.jpa.itest.ch2.entity.CollectionFieldPersistenceEntity;
public class _2_1_7_EntityRelationshipsTest extends EntityManagerCase {
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java
Tue Oct 10 08:15:35 2006
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.jpa.itest.ch2;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.BidiOneToOneOwned;
import org.apache.cayenne.jpa.itest.ch2.entity.BidiOneToOneOwner;
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
Tue Oct 10 08:15:35 2006
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.jpa.itest.ch9;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch9.entity.BasicEntity;
/**
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
Tue Oct 10 08:15:35 2006
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.jpa.itest.ch9;
-import org.apache.cayenne.jpa.itest.EntityManagerCase;
-import org.apache.cayenne.jpa.itest.ItestDBUtils;
+import org.apache.cayenne.itest.jpa.EntityManagerCase;
+import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch9.entity.IdColumnEntity;
import org.apache.cayenne.jpa.itest.ch9.entity.IdEntity;
Modified:
incubator/cayenne/main/trunk/integration-test/pojo/src/test/java/org/apache/cayenne/itest/pojo/SimpleObjectTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/pojo/src/test/java/org/apache/cayenne/itest/pojo/SimpleObjectTest.java?view=diff&rev=454776&r1=454775&r2=454776
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/pojo/src/test/java/org/apache/cayenne/itest/pojo/SimpleObjectTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/pojo/src/test/java/org/apache/cayenne/itest/pojo/SimpleObjectTest.java
Tue Oct 10 08:15:35 2006
@@ -1,8 +1,6 @@
package org.apache.cayenne.itest.pojo;
-import org.apache.cayenne.itest.ObjectContextTestCase;
-
-public class SimpleObjectTest extends ObjectContextTestCase {
+public class SimpleObjectTest extends PojoContextCase {
public void testInsert() throws Exception {
// TODO: andrus, 10/9/2006 - clean up DataContext DataObject
dependency.
