svnno****@sourc*****
svnno****@sourc*****
2009年 9月 19日 (土) 05:15:25 JST
Revision: 3617
http://sourceforge.jp/projects/jiemamy/svn/view?view=rev&revision=3617
Author: daisuke_m
Date: 2009-09-19 05:15:25 +0900 (Sat, 19 Sep 2009)
Log Message:
-----------
せっかくの integration test なのに Mock を使っていたｗ
本番用実装クラスを使うように修正。
Modified Paths:
--------------
hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/DatabaseTest.java
hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamyDomSerializerTest.java
hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java
hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java
zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/mock/MockServiceLocator.java
Modified: hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/DatabaseTest.java
===================================================================
--- hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/DatabaseTest.java 2009-09-18 20:11:56 UTC (rev 3616)
+++ hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/DatabaseTest.java 2009-09-18 20:15:25 UTC (rev 3617)
@@ -59,7 +59,6 @@
import org.jiemamy.composer.importer.DefaultDatabaseImportConfig;
import org.jiemamy.dialect.Dialect;
import org.jiemamy.internal.test.TestModelBuilders;
-import org.jiemamy.internal.test.mock.MockServiceLocator;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.sql.SqlStatement;
import org.jiemamy.serializer.JiemamySerializer;
@@ -180,7 +179,7 @@
// FIXME Oracleのdialectが整備されるまでskip
assumeThat(testDatabase, is(not(TestDatabaseInstance.Oracle)));
- Jiemamy jiemamy = Jiemamy.newInstance(new MockServiceLocator());
+ Jiemamy jiemamy = Jiemamy.newInstance();
InputStream in = null;
try {
in = FileUtils.openInputStream(file);
@@ -223,8 +222,8 @@
public void test03_往復テスト_XRXR(File file) throws Exception {
String baseName = FilenameUtils.getBaseName(file.getName());
- Jiemamy jiemamy1 = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
- Jiemamy jiemamy2 = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
+ Jiemamy jiemamy1 = Jiemamy.newInstance(new Artemis(new ArtemisView()));
+ Jiemamy jiemamy2 = Jiemamy.newInstance(new Artemis(new ArtemisView()));
JiemamySerializer serializer1 = jiemamy1.getSerializer();
JiemamySerializer serializer2 = jiemamy2.getSerializer();
@@ -358,7 +357,7 @@
}
private Jiemamy readDatabase(TestDatabaseInstance testDatabase) throws Exception {
- Jiemamy jiemamy = Jiemamy.newInstance(new MockServiceLocator());
+ Jiemamy jiemamy = Jiemamy.newInstance();
JiemamyFactory factory = jiemamy.getFactory();
RootModel rootModel = factory.getRootModel();
rootModel.setDialectClassName(testDatabase.getDialectClassName());
Modified: hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamyDomSerializerTest.java
===================================================================
--- hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamyDomSerializerTest.java 2009-09-18 20:11:56 UTC (rev 3616)
+++ hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamyDomSerializerTest.java 2009-09-18 20:15:25 UTC (rev 3617)
@@ -24,7 +24,6 @@
import org.jiemamy.Artemis;
import org.jiemamy.ArtemisView;
import org.jiemamy.Jiemamy;
-import org.jiemamy.internal.test.mock.MockServiceLocator;
/**
* {@link JiemamyDomSerializer}のテストクラス。
@@ -40,7 +39,7 @@
*/
@Before
public void setUp() throws Exception {
- jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
+ jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisView()));
serializer = jiemamy.getSerializer();
}
Modified: hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java
===================================================================
--- hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java 2009-09-18 20:11:56 UTC (rev 3616)
+++ hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java 2009-09-18 20:15:25 UTC (rev 3617)
@@ -42,8 +42,8 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.dialect.postgresql.PostgresqlDialect;
import org.jiemamy.internal.test.ViewTestModelBuilder;
-import org.jiemamy.internal.test.mock.MockDialect;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.RootModel;
@@ -91,7 +91,7 @@
public void test01_シリアライズする() throws Exception {
SmartXpath smartXpath = new SmartXpath(jiemamy);
ViewTestModelBuilder mb = new ViewTestModelBuilder(jiemamy);
- mb.build();
+ mb.build(PostgresqlDialect.class.getName());
JiemamyFactory factory = jiemamy.getFactory();
RootModel rootModel = factory.getRootModel();
ByteArrayOutputStream out = null;
@@ -109,7 +109,7 @@
Document document = documentBuilder.parse(new ByteArrayInputStream(result.getBytes(CharEncoding.UTF_8)));
// RootModel基本プロパティのチェック
- assertThat(document, hasXPath("/jiemamy/dialect", is(MockDialect.class.getName())));
+ assertThat(document, hasXPath("/jiemamy/dialect", is(PostgresqlDialect.class.getName())));
assertThat(document, hasXPath("/jiemamy/schemaName", is("FOO")));
// assertThat(document, hasXPath("/jiemamy/beginScript", is("BEGIN;")));
// assertThat(document, hasXPath("/jiemamy/endScript", is("COMMIT;")));
Modified: hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java
===================================================================
--- hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java 2009-09-18 20:11:56 UTC (rev 3616)
+++ hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java 2009-09-18 20:15:25 UTC (rev 3617)
@@ -50,7 +50,6 @@
import org.jiemamy.JiemamyFactory;
import org.jiemamy.internal.test.CoreTestModelBuilder;
import org.jiemamy.internal.test.ViewTestModelBuilder;
-import org.jiemamy.internal.test.mock.MockServiceLocator;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.AttributeModel;
import org.jiemamy.model.attribute.ColumnRef;
@@ -86,7 +85,7 @@
*/
@Test
public void test01_とりあえずXMLに書き込んでみる() throws Exception {
- Jiemamy jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
+ Jiemamy jiemamy = Jiemamy.newInstance(new Artemis(new ArtemisView()));
CoreTestModelBuilder mb = new ViewTestModelBuilder(jiemamy);
mb.build();
JiemamyFactory factory = jiemamy.getFactory();
@@ -200,8 +199,8 @@
*/
@Test
public void test03_往復テスト1_RXRX() throws Exception {
- Jiemamy jiemamy1 = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
- Jiemamy jiemamy2 = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
+ Jiemamy jiemamy1 = Jiemamy.newInstance(new Artemis(new ArtemisView()));
+ Jiemamy jiemamy2 = Jiemamy.newInstance(new Artemis(new ArtemisView()));
JiemamySerializer serializer1 = jiemamy1.getSerializer();
JiemamySerializer serializer2 = jiemamy2.getSerializer();
Validator validator = new AllValidator();
@@ -255,8 +254,8 @@
*/
@Test
public void test04_往復テスト2_XRXR() throws Exception {
- Jiemamy jiemamy1 = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
- Jiemamy jiemamy2 = Jiemamy.newInstance(new Artemis(new ArtemisView()), new MockServiceLocator());
+ Jiemamy jiemamy1 = Jiemamy.newInstance(new Artemis(new ArtemisView()));
+ Jiemamy jiemamy2 = Jiemamy.newInstance(new Artemis(new ArtemisView()));
JiemamySerializer serializer1 = jiemamy1.getSerializer();
JiemamySerializer serializer2 = jiemamy2.getSerializer();
Validator validator = new AllValidator();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-09-18 20:11:56 UTC (rev 3616)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-09-18 20:15:25 UTC (rev 3617)
@@ -491,6 +491,16 @@
}
}
+ // FIXME テストクラスから実行されると、サービスロケータによってserviceを読み込めない。
+ // このtryブロックがなければMySqlEmitterTestがコケる。なぜだろうか。
+ try {
+ @SuppressWarnings("unchecked")
+ T result = (T) Class.forName(fqcn).newInstance();
+ return result;
+ } catch (Exception e2) {
+ // ignore
+ }
+
throw new ClassNotFoundException(fqcn);
}
Modified: zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/mock/MockServiceLocator.java
===================================================================
--- zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/mock/MockServiceLocator.java 2009-09-18 20:11:56 UTC (rev 3616)
+++ zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/mock/MockServiceLocator.java 2009-09-18 20:15:25 UTC (rev 3617)
@@ -34,16 +34,6 @@
try {
return super.getService(clazz, fqcn);
} catch (ClassNotFoundException e) {
- // テストクラスから実行されると、サービスロケータによってserviceを読み込めない。
- // このtryブロックがなければMySqlEmitterTestがコケる。なぜだろうか。
- try {
- @SuppressWarnings("unchecked")
- T result = (T) Class.forName(fqcn).newInstance();
- return result;
- } catch (Exception e2) {
- // ignore
- }
-
if (Dialect.class.isAssignableFrom(clazz)) {
if (MockDialect.class.getName().equals(fqcn)) {
@SuppressWarnings("unchecked")
@@ -53,7 +43,7 @@
} else if (ScriptEngine.class.isAssignableFrom(clazz)) {
if (MockScriptEngine.class.getName().equals(fqcn)) {
@SuppressWarnings("unchecked")
- T result = (T) new MockDialect();
+ T result = (T) new MockScriptEngine();
return result;
}
}