svnno****@sourc*****
svnno****@sourc*****
2009年 4月 8日 (水) 21:51:34 JST
Revision: 3194
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3194
Author: daisuke_m
Date: 2009-04-08 21:51:34 +0900 (Wed, 08 Apr 2009)
Log Message:
-----------
refactor
Modified Paths:
--------------
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/DatabaseTest.java
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/TestDatabaseInstanceTest.java
-------------- 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-08 12:29:04 UTC (rev 3193)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/DatabaseTest.java 2009-04-08 12:51:34 UTC (rev 3194)
@@ -19,9 +19,12 @@
package org.jiemamy;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -118,15 +121,17 @@
logger.info("== Database: " + testDatabase.name());
// FIXME Oracleのdialectが整備されるまでskip
- if (testDatabase == TestDatabaseInstance.Oracle) {
- logger.warn(testDatabase.name() + " skip");
- return;
- }
- // skip処理ここまで
+ assumeThat(testDatabase, is(not(TestDatabaseInstance.Oracle)));
Jiemamy jiemamy = builder.getBuiltModel();
- doDatabaseTest(testDatabase, jiemamy);
+ try {
+ doDatabaseTest(testDatabase, jiemamy);
+ } catch (Exception e) {
+ String message = "failed on " + testDatabase.name() + " with " + builder.name();
+ logger.error(message, e);
+ fail(message);
+ }
}
/**
@@ -141,11 +146,7 @@
logger.info("== Database: " + testDatabase.name());
// FIXME Oracleのdialectが整備されるまでskip
- if (testDatabase == TestDatabaseInstance.Oracle) {
- logger.warn(testDatabase.name() + " skip");
- return;
- }
- // skip処理ここまで
+ assumeThat(testDatabase, is(not(TestDatabaseInstance.Oracle)));
Jiemamy jiemamy = Jiemamy.newInstance();
InputStream in = null;
@@ -156,7 +157,13 @@
IOUtils.closeQuietly(in);
}
- doDatabaseTest(testDatabase, jiemamy);
+ try {
+ doDatabaseTest(testDatabase, jiemamy);
+ } catch (Exception e) {
+ String message = "failed on " + testDatabase.name() + " with " + file.getAbsolutePath();
+ logger.error(message, e);
+ fail(message);
+ }
}
/**
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/TestDatabaseInstanceTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/TestDatabaseInstanceTest.java 2009-04-08 12:29:04 UTC (rev 3193)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/TestDatabaseInstanceTest.java 2009-04-08 12:51:34 UTC (rev 3194)
@@ -21,6 +21,7 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
import java.io.File;
@@ -59,13 +60,13 @@
/**
* 全てのテストDBに接続できること。
*
- * @param db テストDB
+ * @param testDatabase テストDB
* @throws Exception 例外が発生した場合
*/
@Theory
- public void test01_全てのテストDBに接続できること(TestDatabaseInstance db) throws Exception {
- logger.info(db.name());
- DatabaseConnectionConfig config = db.getConfig();
+ public void test01_全てのテストDBに接続できること(TestDatabaseInstance testDatabase) throws Exception {
+ logger.info(testDatabase.name());
+ DatabaseConnectionConfig config = testDatabase.getConfig();
Properties props = new Properties();
props.setProperty("user", config.getUsername());
props.setProperty("password", config.getPassword());
@@ -82,8 +83,9 @@
assertThat(connection, is(notNullValue()));
logger.info("success");
} catch (Exception e) {
- logger.error("failed", e);
- throw e;
+ String message = "failed on " + testDatabase.name();
+ logger.error(message, e);
+ fail(message);
} finally {
JmIOUtil.closeQuietly(connection);
}