svnno****@sourc*****
svnno****@sourc*****
2009年 3月 9日 (月) 22:09:58 JST
Revision: 2855 http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2855 Author: daisuke_m Date: 2009-03-09 22:09:58 +0900 (Mon, 09 Mar 2009) Log Message: ----------- refactor Modified Paths: -------------- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/test/TestModelBuilder2.java -------------- next part -------------- Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/test/TestModelBuilder2.java =================================================================== --- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/test/TestModelBuilder2.java 2009-03-09 13:05:03 UTC (rev 2854) +++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/test/TestModelBuilder2.java 2009-03-09 13:09:58 UTC (rev 2855) @@ -54,6 +54,14 @@ */ public class TestModelBuilder2 { + private static final String ID_1 = "1"; + + private static final String ID_2 = "2"; + + private static final String ID_3 = "3"; + + private static final String ID_4 = "4"; + private static final String DIALECT_CLASS_NAME = "org.jiemamy.dialect.mysql.MySqlDialect"; // ---- basics @@ -370,44 +378,44 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("546244f5-afa2-4e7e-bde0-5a811ced77af")); - RecordUtil.addValue(record, detailId, "1"); - RecordUtil.addValue(record, detailOrderId, "1"); - RecordUtil.addValue(record, detailItemId, "1"); + RecordUtil.addValue(record, detailId, ID_1); + RecordUtil.addValue(record, detailOrderId, ID_1); + RecordUtil.addValue(record, detailItemId, ID_1); RecordUtil.addValue(record, detailQuantity, "1"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("943fda94-a3f2-4c47-b19f-9e8655b47362")); - RecordUtil.addValue(record, detailId, "2"); - RecordUtil.addValue(record, detailOrderId, "1"); - RecordUtil.addValue(record, detailItemId, "4"); + RecordUtil.addValue(record, detailId, ID_2); + RecordUtil.addValue(record, detailOrderId, ID_1); + RecordUtil.addValue(record, detailItemId, ID_4); RecordUtil.addValue(record, detailQuantity, "3"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("d11db81a-2d53-42b4-9f10-17f98f1f7081")); - RecordUtil.addValue(record, detailId, "3"); - RecordUtil.addValue(record, detailOrderId, "2"); - RecordUtil.addValue(record, detailItemId, "2"); + RecordUtil.addValue(record, detailId, ID_3); + RecordUtil.addValue(record, detailOrderId, ID_2); + RecordUtil.addValue(record, detailItemId, ID_2); RecordUtil.addValue(record, detailQuantity, "2"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("0aa0dd6f-5656-4994-abfe-05f05aec7275")); - RecordUtil.addValue(record, detailId, "4"); - RecordUtil.addValue(record, detailOrderId, "2"); - RecordUtil.addValue(record, detailItemId, "3"); + RecordUtil.addValue(record, detailId, ID_4); + RecordUtil.addValue(record, detailOrderId, ID_2); + RecordUtil.addValue(record, detailItemId, ID_3); RecordUtil.addValue(record, detailQuantity, "6"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("4b9be90a-886f-47d8-89f0-da03d7ad419e")); RecordUtil.addValue(record, detailId, "5"); - RecordUtil.addValue(record, detailOrderId, "2"); - RecordUtil.addValue(record, detailItemId, "4"); + RecordUtil.addValue(record, detailOrderId, ID_2); + RecordUtil.addValue(record, detailItemId, ID_4); RecordUtil.addValue(record, detailQuantity, "12"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("23665133-7f4e-4f65-af7c-0de1b655f7c9")); RecordUtil.addValue(record, detailId, "5"); - RecordUtil.addValue(record, detailOrderId, "3"); - RecordUtil.addValue(record, detailItemId, "2"); + RecordUtil.addValue(record, detailOrderId, ID_3); + RecordUtil.addValue(record, detailItemId, ID_2); RecordUtil.addValue(record, detailQuantity, "1"); result.add(record); @@ -418,25 +426,25 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("7162b83a-1815-4b08-8c11-8e6400c05a9e")); - RecordUtil.addValue(record, itemId, "1"); + RecordUtil.addValue(record, itemId, ID_1); RecordUtil.addValue(record, itemName, "DIAMOND"); RecordUtil.addValue(record, itemPrice, "100000"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("a3d6480d-9088-49d8-a500-872262a635d5")); - RecordUtil.addValue(record, itemId, "2"); + RecordUtil.addValue(record, itemId, ID_2); RecordUtil.addValue(record, itemName, "EMERALD"); RecordUtil.addValue(record, itemPrice, "75000"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("bf4556ff-fb81-472c-945d-14067945e7c2")); - RecordUtil.addValue(record, itemId, "3"); + RecordUtil.addValue(record, itemId, ID_3); RecordUtil.addValue(record, itemName, "RUBY"); RecordUtil.addValue(record, itemPrice, "30000"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("fc30dd3e-495d-4f7c-9237-dd9f84c14eb5")); - RecordUtil.addValue(record, itemId, "4"); + RecordUtil.addValue(record, itemId, ID_4); RecordUtil.addValue(record, itemName, "SAPPHIRE"); RecordUtil.addValue(record, itemPrice, "10000"); result.add(record); @@ -448,20 +456,20 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("bf813157-8690-4eb3-9168-cd4906f13f27")); - RecordUtil.addValue(record, orderId, "1"); - RecordUtil.addValue(record, orderUserId, "2"); + RecordUtil.addValue(record, orderId, ID_1); + RecordUtil.addValue(record, orderUserId, ID_2); RecordUtil.addValue(record, orderDate, "2009-01-23 00:11:22"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("645b241d-a6ba-4821-8682-448f59949b3e")); - RecordUtil.addValue(record, orderId, "2"); - RecordUtil.addValue(record, orderUserId, "3"); + RecordUtil.addValue(record, orderId, ID_2); + RecordUtil.addValue(record, orderUserId, ID_3); RecordUtil.addValue(record, orderDate, "2009-01-23 00:22:33"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("654ceb1b-b6eb-406d-8eac-aa07c7c41e62")); - RecordUtil.addValue(record, orderId, "2"); - RecordUtil.addValue(record, orderUserId, "2"); + RecordUtil.addValue(record, orderId, ID_2); + RecordUtil.addValue(record, orderUserId, ID_2); RecordUtil.addValue(record, orderDate, "2009-01-24 00:33:44"); result.add(record); @@ -472,22 +480,22 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("c60fb4ba-e3d6-415e-a22c-20fbaf4e04e6")); - RecordUtil.addValue(record, userId, "1"); + RecordUtil.addValue(record, userId, ID_1); RecordUtil.addValue(record, userName, "SMITH"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("83d5c923-7c61-4393-8185-ac95042f6476")); - RecordUtil.addValue(record, userId, "2"); + RecordUtil.addValue(record, userId, ID_2); RecordUtil.addValue(record, userName, "ALLEN"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("2ddd8857-3fca-4020-bb23-49d0126af6fc")); - RecordUtil.addValue(record, userId, "3"); + RecordUtil.addValue(record, userId, ID_3); RecordUtil.addValue(record, userName, "WARD"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("2b9aeb38-97de-439e-b96b-40a1c82d249e")); - RecordUtil.addValue(record, userId, "4"); + RecordUtil.addValue(record, userId, ID_4); RecordUtil.addValue(record, userName, "JONES"); result.add(record); @@ -518,44 +526,44 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("5a6604ce-6ed2-4542-b009-2a3264b0946a")); - RecordUtil.addValue(record, detailId, "1"); - RecordUtil.addValue(record, detailOrderId, "1"); - RecordUtil.addValue(record, detailItemId, "1"); + RecordUtil.addValue(record, detailId, ID_1); + RecordUtil.addValue(record, detailOrderId, ID_1); + RecordUtil.addValue(record, detailItemId, ID_1); RecordUtil.addValue(record, detailQuantity, "1"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("db883c9c-b7d3-44f4-88ba-d9753eeae58a")); - RecordUtil.addValue(record, detailId, "2"); - RecordUtil.addValue(record, detailOrderId, "1"); - RecordUtil.addValue(record, detailItemId, "4"); + RecordUtil.addValue(record, detailId, ID_2); + RecordUtil.addValue(record, detailOrderId, ID_1); + RecordUtil.addValue(record, detailItemId, ID_4); RecordUtil.addValue(record, detailQuantity, "3"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("04e92727-483c-42ad-b671-c1e4661c1844")); - RecordUtil.addValue(record, detailId, "3"); - RecordUtil.addValue(record, detailOrderId, "2"); - RecordUtil.addValue(record, detailItemId, "2"); + RecordUtil.addValue(record, detailId, ID_3); + RecordUtil.addValue(record, detailOrderId, ID_2); + RecordUtil.addValue(record, detailItemId, ID_2); RecordUtil.addValue(record, detailQuantity, "2"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("f5147476-8bc6-4656-9d0c-fd883a24a18c")); - RecordUtil.addValue(record, detailId, "4"); - RecordUtil.addValue(record, detailOrderId, "2"); - RecordUtil.addValue(record, detailItemId, "3"); + RecordUtil.addValue(record, detailId, ID_4); + RecordUtil.addValue(record, detailOrderId, ID_2); + RecordUtil.addValue(record, detailItemId, ID_3); RecordUtil.addValue(record, detailQuantity, "6"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("d849f188-9940-4ecc-98a8-868dac5b3b4e")); RecordUtil.addValue(record, detailId, "5"); - RecordUtil.addValue(record, detailOrderId, "2"); - RecordUtil.addValue(record, detailItemId, "4"); + RecordUtil.addValue(record, detailOrderId, ID_2); + RecordUtil.addValue(record, detailItemId, ID_4); RecordUtil.addValue(record, detailQuantity, "12"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("2abef8cc-bfb7-4565-ba4e-afca3bf98811")); RecordUtil.addValue(record, detailId, "5"); - RecordUtil.addValue(record, detailOrderId, "3"); - RecordUtil.addValue(record, detailItemId, "2"); + RecordUtil.addValue(record, detailOrderId, ID_3); + RecordUtil.addValue(record, detailItemId, ID_2); RecordUtil.addValue(record, detailQuantity, "1"); result.add(record); @@ -566,25 +574,25 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("5fd803d4-5a05-496b-813e-6399955a79bb")); - RecordUtil.addValue(record, itemId, "1"); + RecordUtil.addValue(record, itemId, ID_1); RecordUtil.addValue(record, itemName, "ダイヤモンド"); RecordUtil.addValue(record, itemPrice, "100000"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("d59e426b-e5ed-433e-8d5a-e748dc75af60")); - RecordUtil.addValue(record, itemId, "2"); + RecordUtil.addValue(record, itemId, ID_2); RecordUtil.addValue(record, itemName, "エメラルド"); RecordUtil.addValue(record, itemPrice, "75000"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("59e0a554-162a-4c48-b13d-1dda7fc936e0")); - RecordUtil.addValue(record, itemId, "3"); + RecordUtil.addValue(record, itemId, ID_3); RecordUtil.addValue(record, itemName, "ルビー"); RecordUtil.addValue(record, itemPrice, "30000"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("1c86858f-1e8b-4fc5-807f-f0548e1811e4")); - RecordUtil.addValue(record, itemId, "4"); + RecordUtil.addValue(record, itemId, ID_4); RecordUtil.addValue(record, itemName, "サファイヤ"); RecordUtil.addValue(record, itemPrice, "10000"); result.add(record); @@ -596,20 +604,20 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("2bdf3969-c2e5-4e3e-a939-2907ca3a5b6a")); - RecordUtil.addValue(record, orderId, "1"); - RecordUtil.addValue(record, orderUserId, "2"); + RecordUtil.addValue(record, orderId, ID_1); + RecordUtil.addValue(record, orderUserId, ID_2); RecordUtil.addValue(record, orderDate, "2009-01-23 00:11:22"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("cca67c6f-a3b2-4b43-a466-be72ccd66e8f")); - RecordUtil.addValue(record, orderId, "2"); - RecordUtil.addValue(record, orderUserId, "3"); + RecordUtil.addValue(record, orderId, ID_2); + RecordUtil.addValue(record, orderUserId, ID_3); RecordUtil.addValue(record, orderDate, "2009-01-23 00:22:33"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("1f74ab8a-3191-464b-89c3-f4f3dddb8ce8")); - RecordUtil.addValue(record, orderId, "2"); - RecordUtil.addValue(record, orderUserId, "2"); + RecordUtil.addValue(record, orderId, ID_2); + RecordUtil.addValue(record, orderUserId, ID_2); RecordUtil.addValue(record, orderDate, "2009-01-24 00:33:44"); result.add(record); @@ -620,22 +628,22 @@ List<RecordModel> result = new ArrayList<RecordModel>(); RecordModel record = factory.newModel(RecordModel.class, uuid.get("25288a67-b4c7-4296-8113-835afeb15c9d")); - RecordUtil.addValue(record, userId, "1"); + RecordUtil.addValue(record, userId, ID_1); RecordUtil.addValue(record, userName, "鈴木 茂"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("20a62610-ad04-479f-85c6-a1340e26adb5")); - RecordUtil.addValue(record, userId, "2"); + RecordUtil.addValue(record, userId, ID_2); RecordUtil.addValue(record, userName, "内海 透"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("d8fa5455-9791-46fc-9695-da7a5167f7ea")); - RecordUtil.addValue(record, userId, "3"); + RecordUtil.addValue(record, userId, ID_3); RecordUtil.addValue(record, userName, "村瀬 武彦"); result.add(record); record = factory.newModel(RecordModel.class, uuid.get("3cc66837-d604-4af8-af01-343924e9f058")); - RecordUtil.addValue(record, userId, "4"); + RecordUtil.addValue(record, userId, ID_4); RecordUtil.addValue(record, userName, "近藤 美樹"); result.add(record);