テスト修正

git-svn-id: http://svn.sourceforge.jp/svnroot/ea2ddl/trunk/ea2ddl@55 136db618-7844-41ca-8ac1-fb3fd040db1d

diff --git a/ea2ddl-dao/pom.xml b/ea2ddl-dao/pom.xml
index 5eb6857..c93f471 100644 (file)
--- a/ea2ddl-dao/pom.xml
+++ b/ea2ddl-dao/pom.xml
@@ -14,11 +14,6 @@
 
        <dependencies>
                <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ea2ddl-common</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
                        <groupId>org.seasar.container</groupId>
                        <artifactId>s2-extension</artifactId>
                </dependency>
@@ -38,18 +33,22 @@
                <dependency>
                        <groupId>org.apache.geronimo.specs</groupId>
                        <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.geronimo.specs</groupId>
                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.geronimo.specs</groupId>
                        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.geronimo.specs</groupId>
                        <artifactId>geronimo-jta_1.1_spec</artifactId>
+                       <scope>provided</scope>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java b/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
index fe3cd8f..7198ef7 100644 (file)
--- a/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
+++ b/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
@@ -2,12 +2,9 @@ package jp.sourceforge.ea2ddl.dao.exbhv;
 \r
 import javax.persistence.EntityNotFoundException;\r
 \r
-import jp.sourceforge.ea2ddl.common.config.Config;\r
 import jp.sourceforge.ea2ddl.dao.cbean.TPackageCB;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TPackage;\r
 \r
-import org.seasar.framework.container.annotation.tiger.Binding;\r
-\r
 /**\r
  * The behavior of t_package.\r
  * <p>\r
@@ -18,12 +15,6 @@ import org.seasar.framework.container.annotation.tiger.Binding;
  * @author DBFlute(AutoGenerator)\r
  */\r
 public class TPackageBhv extends jp.sourceforge.ea2ddl.dao.bsbhv.BsTPackageBhv {\r
-       private Config _config;\r
-\r
-       @Binding\r
-       public void setConfig(Config config) {\r
-               _config = config;\r
-       }\r
 \r
        /**\r
         * パッケージツリーから対象のパッケージオブジェクトを検索する。\r

diff --git a/ea2ddl-dao/src/main/resources/dbflute.dicon b/ea2ddl-dao/src/main/resources/dbflute.dicon
index d711116..905a00a 100644 (file)
--- a/ea2ddl-dao/src/main/resources/dbflute.dicon
+++ b/ea2ddl-dao/src/main/resources/dbflute.dicon
@@ -4,7 +4,6 @@
 \r
 <components namespace="dbflute">\r
     <include path="j2ee.dicon"/>\r
-    <include path="app-config.dicon"/>\r
 \r
     <!-- S2Dao component. -->\r
     <component class="jp.sourceforge.ea2ddl.dao.allcommon.s2dao.S2DaoMetaDataFactoryImpl">\r

diff --git a/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java b/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java
index 47b6186..d98bada 100644 (file)
--- a/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java
+++ b/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java
@@ -1,11 +1,10 @@
 package jp.sourceforge.ea2ddl.dao.exbhv;\r
 \r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertTrue;\r
 \r
 import java.util.List;\r
 \r
 import jp.sourceforge.ea2ddl.dao.exentity.TObject;\r
-import jp.sourceforge.ea2ddl.dao.exentity.TPackage;\r
 \r
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
@@ -20,14 +19,14 @@ public class TObjectBhvTest {
        TPackageBhv _pkgBhv;\r
 \r
        @Test\r
-       public void testSelectEntityInteger() {\r
-               fail("まだ実装されていません");\r
+       public void testSelectList() {\r
+               final List<TObject> tableList = _bhv.selectList("ビュー/クラスビュー/ER図/EXAMPLEDB", "table", null);\r
+               assertTrue(0 < tableList.size());\r
        }\r
 \r
        @Test\r
-       public void testSelectListByStereotype() {\r
-               final TPackage pkg = _pkgBhv.selectPackage("クラスビュー/ER図/SIMPLEDB");\r
-               final List<TObject> tables = _bhv.selectListByStereotype(pkg, "table");\r
+       public void testSelectList_Note() {\r
+               final List<TObject> noteList = _bhv.selectList("ビュー/クラスビュー/ER図/EXAMPLEDB", null, "Note");\r
+               assertTrue(0 < noteList.size());\r
        }\r
-\r
 }\r

diff --git a/ea2ddl-dao/src/test/resources/app-config.dicon b/ea2ddl-dao/src/test/resources/app-config.dicon
deleted file mode 100644 (file)
index 958db57..0000000
--- a/ea2ddl-dao/src/test/resources/app-config.dicon
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" \r
-       "http://www.seasar.org/dtd/components24.dtd">\r
-<components>\r
-       <component name="config"\r
-               class="jp.sourceforge.ea2ddl.common.config.impl.ConfigImpl">\r
-               <initMethod name="load">\r
-                       <arg>"app.properties"</arg>\r
-               </initMethod>\r
-       </component>\r
-</components>
\ No newline at end of file

diff --git a/ea2ddl-dao/src/test/resources/app.dicon b/ea2ddl-dao/src/test/resources/app.dicon
index 29fc770..537aaf6 100644 (file)
--- a/ea2ddl-dao/src/test/resources/app.dicon
+++ b/ea2ddl-dao/src/test/resources/app.dicon
@@ -2,7 +2,6 @@
 <!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" \r
        "http://www.seasar.org/dtd/components24.dtd">\r
 <components>\r
-  <include path="app-config.dicon"/>\r
   <include path="aop.dicon"/>\r
   <include path="dbflute.dicon"/>\r
 </components>\r

diff --git a/ea2ddl-dao/src/test/resources/app.properties b/ea2ddl-dao/src/test/resources/app.properties
deleted file mode 100644 (file)
index 8df53b4..0000000
--- a/ea2ddl-dao/src/test/resources/app.properties
+++ /dev/null
@@ -1 +0,0 @@
-root.package.name=\u30d3\u30e5\u30fc
\ No newline at end of file

diff --git a/ea2ddl-dao/src/main/resources/jdbc.dicon b/ea2ddl-dao/src/test/resources/jdbc.dicon
similarity index 100%
rename from ea2ddl-dao/src/main/resources/jdbc.dicon
rename to ea2ddl-dao/src/test/resources/jdbc.dicon