svnno****@sourc*****
svnno****@sourc*****
2009年 4月 18日 (土) 21:14:24 JST
Revision: 3312 http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3312 Author: daisuke_m Date: 2009-04-18 21:14:24 +0900 (Sat, 18 Apr 2009) Log Message: ----------- テスト用データファイルを追加。 donated by Yuroyoro Modified Paths: -------------- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/DatabaseTest.java Added Paths: ----------- artemis/trunk/jiemamy-artemis-test/src/test/resources/datafiles/multiPk.jer -------------- next part -------------- Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/DatabaseTest.java =================================================================== --- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/DatabaseTest.java 2009-04-18 12:05:19 UTC (rev 3311) +++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/DatabaseTest.java 2009-04-18 12:14:24 UTC (rev 3312) @@ -128,14 +128,14 @@ /** * テストモデルビルダのDB適用と読み出しテスト。 * - * @param builder テスト対象データファイル + * @param builder テスト対象データ * @param testDatabase テストDB * @throws Exception 例外が発生した場合 */ @Theory public void test01_テストモデルビルダのDB適用と読み出しテスト(TestModelBuilders builder, TestDatabaseInstance testDatabase) throws Exception { - logger.info("== Database: " + testDatabase.name()); + logger.info("======== START: " + builder.name() + " on " + testDatabase.name()); // FIXME Oracleのdialectが整備されるまでskip assumeThat(testDatabase, is(not(TestDatabaseInstance.Oracle))); @@ -170,6 +170,7 @@ */ @Theory public void test02_テストデータファイルのDB適用と読み出しテスト(File file, TestDatabaseInstance testDatabase) throws Exception { + logger.info("======== START: " + FilenameUtils.getName(file.getAbsolutePath()) + " on " + testDatabase.name()); logger.info("== Database: " + testDatabase.name()); // FIXME Oracleのdialectが整備されるまでskip Added: artemis/trunk/jiemamy-artemis-test/src/test/resources/datafiles/multiPk.jer =================================================================== --- artemis/trunk/jiemamy-artemis-test/src/test/resources/datafiles/multiPk.jer (rev 0) +++ artemis/trunk/jiemamy-artemis-test/src/test/resources/datafiles/multiPk.jer 2009-04-18 12:14:24 UTC (rev 3312) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jiemamy xmlns="http://jiemamy.org/xml/ns/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1feff228-d805-4460-8c07-5be71dc2afa6" version="0.2-SNAPSHOT" xsi:schemaLocation="http://jiemamy.org/xml/ns/core ../../main/resources/jiemamy-core.xsd http://jiemamy.org/xml/ns/view ../../main/resources/jiemamy-view.xsd"> + <dialect>org.jiemamy.dialect.mysql.MySqlDialect</dialect> + <domains/> + <entities> + <table id="f9f46e4b-dab8-45e8-8555-8a8b7139a4b6"> + <name>TEST_MULTI_PK</name> + <attributes> + <column id="57b19be6-e776-412d-acae-75eafd9f8848"> + <name>ID</name> + <dataType> + <typeCategory>VARCHAR</typeCategory> + <typeName>VARCHAR</typeName> + <adapter class="org.jiemamy.model.datatype.adapter.SizedDataTypeAdapter"> + <size>13</size> + </adapter> + </dataType> + <notNull id="5173ec86-11d9-4b8b-8955-f77d902312ee"/> + </column> + <primaryKey id="78dbaa50-4247-4e2e-b700-27dfa371191f"> + <columnRefs> + <columnRef ref="57b19be6-e776-412d-acae-75eafd9f8848"/> + <columnRef ref="22a65a2e-e8e6-4489-902e-bcd80c94f48b"/> + </columnRefs> + </primaryKey> + <column id="22a65a2e-e8e6-4489-902e-bcd80c94f48b"> + <name>STATUS</name> + <dataType> + <typeCategory>CHARACTER</typeCategory> + <typeName>CHARACTER</typeName> + <adapter class="org.jiemamy.model.datatype.adapter.SizedDataTypeAdapter"> + <size>1</size> + </adapter> + </dataType> + <defaultValue>0</defaultValue> + <notNull id="2049a5a1-cdb4-479a-b035-6db4a0827649"/> + </column> + <column id="096f3c23-bc25-40fb-891a-980dc2514ff8"> + <name>CREATE_DT</name> + <dataType> + <typeCategory>TIMESTAMP</typeCategory> + <typeName>TIMESTAMP</typeName> + </dataType> + </column> + <column id="9b050834-c694-4b50-afcc-1e62fe003cb7"> + <name>UPDATE_DT</name> + <dataType> + <typeCategory>TIMESTAMP</typeCategory> + <typeName>TIMESTAMP</typeName> + </dataType> + </column> + <column id="29ec0ba2-7bc9-4c9c-82e7-905d0bbe1d1f"> + <name>VERSION</name> + <dataType> + <typeCategory>INTEGER</typeCategory> + <typeName>BIGINT</typeName> + </dataType> + </column> + </attributes> + <indexes/> + </table> + </entities> + <dataSets/> + <view:diagramPresentations xmlns:view="http://jiemamy.org/xml/ns/view"> + <view:diagramPresentation id="a3585ac6-ba17-4a6b-a95f-e8a9f5c68219"> + <name>default</name> + <view:mode>PHYSICAL</view:mode> + <view:level>ATTRTYPE</view:level> + <view:nodeProfiles> + <view:nodeProfile id="4bf81ef1-fa52-4afb-856c-9748ea90f2af"> + <view:nodeObjectRef ref="f9f46e4b-dab8-45e8-8555-8a8b7139a4b6"/> + <view:boundary height="-1" width="-1" x="140" y="79"/> + </view:nodeProfile> + </view:nodeProfiles> + <view:connectionProfiles/> + </view:diagramPresentation> + </view:diagramPresentations> +</jiemamy>