You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2011/05/22 21:13:13 UTC
svn commit: r1126180 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
access/ access/dbsync/ map/ unit/
Author: aadamchik
Date: Sun May 22 19:13:13 2011
New Revision: 1126180
URL: http://svn.apache.org/viewvc?rev=1126180&view=rev
Log:
unit test refactoring
cleanup
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UnitTestDomainQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UnitTestDomainQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UnitTestDomainQueryAction.java?rev=1126180&r1=1126179&r2=1126180&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UnitTestDomainQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UnitTestDomainQueryAction.java Sun May 22 19:13:13 2011
@@ -31,7 +31,6 @@ import org.apache.cayenne.query.Query;
/**
* A DataDomainQueryAction that can be configured to block queries that are not run from
* cache.
- *
*/
public class UnitTestDomainQueryAction extends DataDomainQueryAction {
@@ -54,7 +53,8 @@ public class UnitTestDomainQueryAction e
super.runQueryInTransaction();
}
- protected void checkQueryAllowed(Collection queries) throws AssertionFailedError {
+ protected void checkQueryAllowed(Collection<? extends Query> queries)
+ throws AssertionFailedError {
((UnitTestDomain) domain).checkQueryAllowed(queries);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java?rev=1126180&r1=1126179&r2=1126180&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java Sun May 22 19:13:13 2011
@@ -29,6 +29,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.sql.DataSource;
+
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.MockOperationObserver;
@@ -39,7 +41,6 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneResources;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -51,6 +52,9 @@ public class SchemaUpdateStrategyTest ex
@Inject
private DbAdapter adapter;
+
+ @Inject
+ private DataSource dataSource;
public void testDBGeneratorStrategy() throws Exception {
@@ -258,7 +262,7 @@ public class SchemaUpdateStrategyTest ex
DataNode dataNode = new DataNode();
dataNode.setDataMaps(colection);
dataNode.setAdapter(adapter);
- dataNode.setDataSource(CayenneResources.getResources().getDataSource());
+ dataNode.setDataSource(dataSource);
dataNode.setDataSourceFactory(node.getDataSourceFactory());
dataNode.setSchemaUpdateStrategyName(node.getSchemaUpdateStrategyName());
dataNode.setEntityResolver(new EntityResolver(colection));
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java?rev=1126180&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java Sun May 22 19:13:13 2011
@@ -0,0 +1,57 @@
+/*****************************************************************
+ * 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.map;
+
+import java.util.Collections;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
+
+@UseServerRuntime(ServerCase.DEFAULT_PROJECT)
+public class EntityResolverGenericStackTest extends ServerCase {
+
+ @Inject
+ private EntityResolver resolver;
+
+ public void testObjEntityLookupDuplicates() {
+
+ DataMap generic = resolver.getDataMap("generic");
+ EntityResolver resolver = new EntityResolver(Collections.singleton(generic));
+
+ ObjEntity g1 = resolver.getObjEntity("Generic1");
+ assertNotNull(g1);
+
+ ObjEntity g2 = resolver.getObjEntity("Generic2");
+ assertNotNull(g2);
+
+ assertNotSame(g1, g2);
+ assertNull(resolver.lookupObjEntity(Object.class));
+
+ try {
+ resolver.lookupObjEntity(CayenneDataObject.class);
+ fail("two entities mapped to the same class... resolver must have thrown.");
+ }
+ catch (CayenneRuntimeException e) {
+ // expected
+ }
+ }
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java?rev=1126180&r1=1126179&r2=1126180&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java Sun May 22 19:13:13 2011
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -32,8 +31,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.MockQuery;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.AccessStack;
-import org.apache.cayenne.unit.CayenneResources;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -46,32 +43,6 @@ public class EntityResolverTest extends
@Inject
private DataContext context;
- public void testObjEntityLookupDuplicates() {
- AccessStack stack = CayenneResources
- .getResources()
- .getAccessStack("GenericStack");
-
- DataMap generic = stack.getDataDomain().getDataMap("generic");
- EntityResolver resolver = new EntityResolver(Collections.singleton(generic));
-
- ObjEntity g1 = resolver.getObjEntity("Generic1");
- assertNotNull(g1);
-
- ObjEntity g2 = resolver.getObjEntity("Generic2");
- assertNotNull(g2);
-
- assertNotSame(g1, g2);
- assertNull(resolver.lookupObjEntity(Object.class));
-
- try {
- resolver.lookupObjEntity(CayenneDataObject.class);
- fail("two entities mapped to the same class... resolver must have thrown.");
- }
- catch (CayenneRuntimeException e) {
- // expected
- }
- }
-
public void testGetObjEntity() {
EntityResolver resolver = new EntityResolver(runtime
.getDataDomain()
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java?rev=1126180&r1=1126179&r2=1126180&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java Sun May 22 19:13:13 2011
@@ -20,19 +20,11 @@
package org.apache.cayenne.unit;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.UnitTestDomain;
-/**
- * DataDomain wrapper used for testing a specific Cayenne stack configuration.
- */
public interface AccessStack {
AccessStackAdapter getAdapter(DataNode node);
- UnitTestDomain getDataDomain();
-
- void deleteTestData() throws Exception;
-
void dropSchema() throws Exception;
void createSchema() throws Exception;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java?rev=1126180&r1=1126179&r2=1126180&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java Sun May 22 19:13:13 2011
@@ -99,8 +99,7 @@ public class SimpleAccessStack implement
// use shared data source in all cases but the multi-node...
- if (MultiNodeCase.NODE1.equals(node.getName())
- || MultiNodeCase.NODE2.equals(node.getName())) {
+ if ("map-db1".equals(node.getName()) || "map-db1".equals(node.getName())) {
node.setDataSource(resources.createDataSource());
}
else {
@@ -111,22 +110,6 @@ public class SimpleAccessStack implement
domain.addNode(node);
}
- /**
- * Returns DataDomain for this AccessStack.
- */
- public UnitTestDomain getDataDomain() {
- return domain;
- }
-
- /**
- * Deletes all data from the database tables mentioned in the DataMap.
- */
- public void deleteTestData() throws Exception {
- for (DataNode node : domain.getDataNodes()) {
- deleteTestData(node, node.getDataMaps().iterator().next());
- }
- }
-
/** Drops all test tables. */
public void dropSchema() throws Exception {
for (DataNode node : domain.getDataNodes()) {