svn commit: r1103018 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java

[aa...@apache.org]

Author: aadamchik
Date: Sat May 14 10:46:32 2011
New Revision: 1103018

URL: http://svn.apache.org/viewvc?rev=1103018&view=rev
Log:
CAY-1564 CayenneCase unit tests conversion(4)

    patch by Dzmitry Kazimirchyk - DbGeneratorTest

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java?rev=1103018&r1=1103017&r2=1103018&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java Sat May 14 10:46:32 2011
@@ -19,67 +19,74 @@
 
 package org.apache.cayenne.access;
 
+import org.apache.cayenne.configuration.server.ServerRuntime;
+import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
 
-/**
- * Test cases for DbGenerator.
- * 
- */
-public class DbGeneratorTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class DbGeneratorTest extends ServerCase {
 
-    protected DbGenerator gen;
+    @Inject
+    private DbAdapter adapter;
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    @Inject
+    private ServerRuntime runtime;
+
+    private DbGenerator generator;
 
-        gen = new DbGenerator(getNode().getAdapter(), getDomain().getDataMap("testmap"));
+    @Override
+    protected void setUpAfterInjection() throws Exception {
+        generator = new DbGenerator(adapter, runtime
+                .getDataDomain()
+                .getDataMap("testmap"));
     }
 
     public void testAdapter() throws Exception {
-        assertSame(getNode().getAdapter(), gen.getAdapter());
+        assertSame(adapter, generator.getAdapter());
     }
 
     public void testPkFilteringLogic() throws Exception {
-        DataMap map = getDomain().getDataMap("testmap");
+        DataMap map = runtime.getDataDomain().getDataMap("testmap");
         DbEntity artistExhibit = map.getDbEntity("ARTIST_EXHIBIT");
         DbEntity exhibit = map.getDbEntity("EXHIBIT");
 
         // sanity check
         assertNotNull(artistExhibit);
         assertNotNull(exhibit);
-        assertNotNull(gen.dbEntitiesRequiringAutoPK);
+        assertNotNull(generator.dbEntitiesRequiringAutoPK);
 
         // real test
-        assertTrue(gen.dbEntitiesRequiringAutoPK.contains(exhibit));
-        assertFalse(gen.dbEntitiesRequiringAutoPK.contains(artistExhibit));
+        assertTrue(generator.dbEntitiesRequiringAutoPK.contains(exhibit));
+        assertFalse(generator.dbEntitiesRequiringAutoPK.contains(artistExhibit));
     }
 
     public void testCreatePkSupport() throws Exception {
-        assertTrue(gen.shouldCreatePKSupport());
-        gen.setShouldCreatePKSupport(false);
-        assertFalse(gen.shouldCreatePKSupport());
+        assertTrue(generator.shouldCreatePKSupport());
+        generator.setShouldCreatePKSupport(false);
+        assertFalse(generator.shouldCreatePKSupport());
 
     }
 
     public void testShouldCreateTables() throws Exception {
-        assertTrue(gen.shouldCreateTables());
-        gen.setShouldCreateTables(false);
-        assertFalse(gen.shouldCreateTables());
+        assertTrue(generator.shouldCreateTables());
+        generator.setShouldCreateTables(false);
+        assertFalse(generator.shouldCreateTables());
     }
 
     public void testDropPkSupport() throws Exception {
 
-        assertFalse(gen.shouldDropPKSupport());
-        gen.setShouldDropPKSupport(true);
-        assertTrue(gen.shouldDropPKSupport());
+        assertFalse(generator.shouldDropPKSupport());
+        generator.setShouldDropPKSupport(true);
+        assertTrue(generator.shouldDropPKSupport());
     }
 
     public void testShouldDropTables() throws Exception {
-        assertFalse(gen.shouldDropTables());
-        gen.setShouldDropTables(true);
-        assertTrue(gen.shouldDropTables());
+        assertFalse(generator.shouldDropTables());
+        generator.setShouldDropTables(true);
+        assertTrue(generator.shouldDropTables());
     }
 }