インタフェース変更に対応。本体Library更新に対応。 (#55)

* インタフェース変更に対応。 * 本体Library更新に対応。
igapyon · May 26, 2021 · a8ddb8b · a8ddb8b
1 parent 91b6d00
commit a8ddb8b
Show file tree

Hide file tree

Showing 89 changed files with 120 additions and 95 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,8 +1,24 @@
+# Release 1.18 (2021-05-26)
+
+## EN
+
+- Implementation: Changed to pass OiyoInfo instance from the outside.
+- Changed to return URI with FQN.
+- Added messages regarding autoCommit, jdbcFetchSize, filterEqAutoSelect.
+- Added log.trace where EntityCollection is expected to take a time.
+
+## JA
+
+- 実装: OiyoInfo インスタンスを外側から引き渡すよう変更
+- URIをFQNで戻すよう変更
+- autoCommit, jdbcFetchSize, filterEqAutoSelect のメッセージを追加
+- EntityCollection で時間がかかると予見される箇所に log.trace を追加
+
 # Release 1.17 (2021-05-25)
 
 ## EN
 
-- Some JSON params are added to `oiyokan-settings.json`: autoCommit, jdbcFetchSize, filterEqAutoSelect。
+- Some JSON params are added to `oiyokan-settings.json`: autoCommit, jdbcFetchSize, filterEqAutoSelect.
 - Added ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY to collection Statement.
 - Use java.sql.Statement for parameterless queries.
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>jp.igapyon.oiyokan</groupId>
 	<artifactId>oiyokan-unittest</artifactId>
-	<version>1.17.20210525a</version>
+	<version>1.18.20210526a</version>
 	<name>oiyokan-unittest</name>
 	<description>UnitTest of Oiyokan. Oiyokan is a simple OData v4 Server. (based on Apache
 		Olingo / h2 database)</description>
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>jp.igapyon.oiyokan</groupId>
 			<artifactId>oiyokan</artifactId>
-			<version>1.17.20210525e</version>
+			<version>1.18.20210526a</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/jp/app/ctrl/ThIndexCtrl.java b/src/main/java/jp/app/ctrl/ThIndexCtrl.java
@@ -7,8 +7,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import jp.oiyokan.OiyokanConstants;
-import jp.oiyokan.unittest.OiyokanUnittestConstants;
 import jp.oiyokan.unittest.OiyokanOdata4Register;
+import jp.oiyokan.unittest.OiyokanUnittestConstants;
 
 @Controller
 public class ThIndexCtrl {

diff --git a/src/main/java/jp/oiyokan/unittest/OiyokanOdata4Register.java b/src/main/java/jp/oiyokan/unittest/OiyokanOdata4Register.java
@@ -25,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import jp.oiyokan.OiyokanOdata4RegisterImpl;
+import jp.oiyokan.common.OiyoInfo;
 
 /**
  * Oiyokan (OData v4 server) を Spring Boot の Servlet として登録.
@@ -49,7 +50,9 @@ public class OiyokanOdata4Register {
     public void serv(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException {
         // ライブラリ側でキャッシュOFFを実施する。
 
+        final OiyoInfo oiyoInfo = new OiyoInfo();
+
         // Process Oiyokan.
-        OiyokanOdata4RegisterImpl.serv(req, resp, ODATA_ROOTPATH);
+        OiyokanOdata4RegisterImpl.serv(oiyoInfo, req, resp, ODATA_ROOTPATH);
     }
 }
diff --git a/src/main/resources/db/oiyokan-internal.mv.db b/src/main/resources/db/oiyokan-internal.mv.db
diff --git a/src/test/java/jp/oiyokan/OiyokanUnittestUtil.java b/src/test/java/jp/oiyokan/OiyokanUnittestUtil.java
@@ -20,8 +20,11 @@
 import jp.oiyokan.common.OiyoInfo;
 
 public class OiyokanUnittestUtil {
-    public static OiyoInfo setupUnittestDatabase() throws ODataApplicationException {
-        final OiyoInfo oiyoInfo = OiyokanEdmProvider.getOiyoInfoInstance();
+    public static OiyoInfo getUnittestOiyoInfoInstance() throws ODataApplicationException {
+        final OiyoInfo oiyoInfo = new OiyoInfo();
+        // シングルトンな OiyoSettings を利用。
+        OiyokanEdmProvider.setupOiyoSettingsInstance(oiyoInfo);
+
         // 取得した OiyoInfo をそのまま返却.
         return oiyoInfo;
     }

diff --git a/src/test/java/jp/oiyokan/core/basic/sql/OiyoSqlQueryListExprTest.java b/src/test/java/jp/oiyokan/core/basic/sql/OiyoSqlQueryListExprTest.java
@@ -51,10 +51,10 @@ class OiyoSqlQueryListExprTest {
      * @throws Exception 例外が発生した場合.
      */
     private String getExprString(String rawODataPath, String rawQueryPath) throws Exception {
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         OData odata = OData.newInstance();
-        ServiceMetadata edm = odata.createServiceMetadata(new OiyokanEdmProvider(), new ArrayList<>());
+        ServiceMetadata edm = odata.createServiceMetadata(new OiyokanEdmProvider(oiyoInfo), new ArrayList<>());
 
         // アプリ情報が入っている内部DBをベースに処理。つまり h2 database 前提としての振る舞いをおこなう。
         OiyoSettingsEntitySet entitySet = OiyoInfoUtil.getOiyoEntitySet(oiyoInfo, "ODataTest1");
@@ -90,7 +90,7 @@ void test02() throws Exception {
 
     @Test
     void test03() throws Exception {
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
         OiyoSettingsDatabase database = OiyoInfoUtil.getOiyoDatabaseByEntitySetName(oiyoInfo, "ODataTest1");
         OiyokanConstants.DatabaseType databaseType = OiyokanConstants.DatabaseType.valueOf(database.getType());
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityBasic01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityBasic01Test.java
@@ -35,7 +35,7 @@ class UnitTestEntityBasic01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // INSERT + DELETE
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest3", "{\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityBasic02Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityBasic02Test.java
@@ -34,7 +34,7 @@ class UnitTestEntityBasic02Test {
     @Test
     void test02() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // INSERT
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest3", "{\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityHeadBody01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityHeadBody01Test.java
@@ -39,7 +39,7 @@ class UnitTestEntityHeadBody01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest8", "{\n" //
                 + "  \"MainKey\":\"KEY001\"\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityNull01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityNull01Test.java
@@ -35,7 +35,7 @@ class UnitTestEntityNull01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // INSERT + DELETE
         // 自動項目の ID もNULLで引き渡す。

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchInsert01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchInsert01Test.java
@@ -35,7 +35,7 @@ class UnitTestEntityPatchInsert01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final int TEST_ID = OiyokanTestUtil.getNextUniqueId();
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchInsert02Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchInsert02Test.java
@@ -34,7 +34,7 @@ class UnitTestEntityPatchInsert02Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final int NOT_EXISTS_ID = OiyokanTestUtil.getNextUniqueId() + 999;
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchUpdate01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchUpdate01Test.java
@@ -35,7 +35,7 @@ class UnitTestEntityPatchUpdate01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final int TEST_ID = OiyokanTestUtil.getNextUniqueId();
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchUpsert01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPatchUpsert01Test.java
@@ -35,7 +35,7 @@ class UnitTestEntityPatchUpsert01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final int TEST_ID = OiyokanTestUtil.getNextUniqueId();
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPostAll01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestEntityPostAll01Test.java
@@ -31,7 +31,7 @@ class UnitTestEntityPostAll01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // FULL INSERT
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest3", //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeBinary01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeBinary01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeBinary01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest6", "{\n" //
                 + "  \"Binary1\":\"VG9uYXJpIG5vIGt5YWt1Lg==\"\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeBlob01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeBlob01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeBlob01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"Blob1\":\"VG9uYXJpIG5vIGt5YWt1Lg==\"\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeBoolean01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeBoolean01Test.java
@@ -38,7 +38,7 @@ class UnitTestTypeBoolean01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"Boolean1\":true\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar01Test.java
@@ -31,7 +31,7 @@ class UnitTestTypeChar01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // 左右の文字が正しいことを確認
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest3", //
@@ -54,7 +54,7 @@ void test01() throws Exception {
         resp = OiyokanTestUtil.callGet("/ODataTest3", "$filter=ID eq " + idString + "&$select=StringChar8");
         result = OiyokanTestUtil.stream2String(resp.getContent());
         assertEquals(
-                "{\"@odata.context\":\"$metadata#ODataTest3\",\"value\":[{\"@odata.id\":\"ODataTest3(" + idString
+                "{\"@odata.context\":\"$metadata#ODataTest3\",\"value\":[{\"@odata.id\":\"http://localhost:8080/odata4.svc/ODataTest3(" + idString
                         + ")\",\"ID\":" + idString + ",\"StringChar8\":\"  C456  \"}]}",
                 result, "前後空白付きでFILTER検索できることを確認.");
         assertEquals(200, resp.getStatusCode());

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar02Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar02Test.java
@@ -32,7 +32,7 @@ class UnitTestTypeChar02Test {
     @Test
     void test02() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String decVal = "1304";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar03Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar03Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeChar03Test {
     @Test
     void test03() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String decVal = "1404";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar04Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar04Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeChar04Test {
     @Test
     void test04() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String decVal = "1404";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar05Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeChar05Test.java
@@ -36,7 +36,7 @@ class UnitTestTypeChar05Test {
     @Test
     void test04() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // 全項目をデフォルト値でセット。
         // StringChar8 だけは null にセット.

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeClob01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeClob01Test.java
@@ -36,7 +36,7 @@ class UnitTestTypeClob01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"Clob1\":\"ABCDXYZ\"\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDate01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDate01Test.java
@@ -40,7 +40,7 @@ class UnitTestTypeDate01Test {
     @Test
     void test03() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String dateStringInput = "2021-01-01";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDateTimeOffset01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDateTimeOffset01Test.java
@@ -37,7 +37,7 @@ class UnitTestTypeDateTimeOffset01Test {
     @Test
     void test03() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String dateStringInput = "2020-12-31T21:53:00Z";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDateTimeOffset02Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDateTimeOffset02Test.java
@@ -37,7 +37,7 @@ class UnitTestTypeDateTimeOffset02Test {
     @Test
     void test03() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String dateStringInput = "2020-12-31T21:53:00.000+09:00";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDecimal01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDecimal01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeDecimal01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"Decimal1\":8765.43\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDecimal02Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDecimal02Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeDecimal02Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest2", "{\n" //
                 + "  \"Decimal1\":8765.43\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDouble01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeDouble01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeDouble01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"Double1\":543.21\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeIdentity01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeIdentity01Test.java
@@ -31,7 +31,7 @@ class UnitTestTypeIdentity01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest5", "{\n" //
                 + "  \"Name\":\"Name\"\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeLongVar01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeLongVar01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeLongVar01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"StringLongVar1\":\"ABCDXYZ\"\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeSbyte01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeSbyte01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeSbyte01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         // SQL Server では 正の値の TINYINT型を利用している。
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeSingle01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeSingle01Test.java
@@ -36,7 +36,7 @@ class UnitTestTypeSingle01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"Single1\":543.21\n" //

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeTimeOfDay01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeTimeOfDay01Test.java
@@ -40,7 +40,7 @@ class UnitTestTypeTimeOfDay01Test {
     @Test
     void test03() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final String dateStringInput = "21:53:00";
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeUuid01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeUuid01Test.java
@@ -32,7 +32,7 @@ class UnitTestTypeUuid01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         final int TEST_ID = OiyokanTestUtil.getNextUniqueId();
 

diff --git a/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeVarBinary01Test.java b/src/test/java/jp/oiyokan/core/db/testdb/entity/UnitTestTypeVarBinary01Test.java
@@ -33,7 +33,7 @@ class UnitTestTypeVarBinary01Test {
     @Test
     void test01() throws Exception {
         @SuppressWarnings("unused")
-        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.setupUnittestDatabase();
+        final OiyoInfo oiyoInfo = OiyokanUnittestUtil.getUnittestOiyoInfoInstance();
 
         ODataResponse resp = OiyokanTestUtil.callPost("/ODataTest1", "{\n" //
                 + "  \"VarBinary1\":\"VG9uYXJpIG5vIGt5YWt1Lg==\"\n" //