遅延テストケース追加

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
index 84f256e..6c1f97a 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
@@ -169,11 +169,12 @@ public class TrainDelayedServiceImpl extends Service implements TrainDelayedServ
                                        if (Debug.isDebug()){\r
                                                Calendar cal = Calendar.getInstance();\r
                                                cal.setTimeInMillis(next);\r
-                                               Date d = cal.getTime();\r
-                                               int ymd = DateUtil.getYmd(d);\r
-                                               int hm = DateUtil.getHm(d);\r
+                                               Date date = cal.getTime();\r
+                                               int ymd = DateUtil.getYmd(date);\r
+                                               int d = DateUtil.getD(ymd);\r
+                                               int hm = DateUtil.getHm(date);\r
                                                \r
-                                               long val = id * 1000000 * 10000 + ymd * 10000 + hm;\r
+                                               long val = id * 100 * 10000 + d * 10000 + hm;\r
                                                                \r
                                                TrainTwitterAdapter.insert(\r
                                                                TrainDelayedServiceImpl.this,\r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
index 4828fc3..4e31e44 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
@@ -174,13 +174,15 @@ public class TrainTwitterAdapter extends TwitterAdapter {
                if (newDelay != null) {\r
                        Delay.setData(sb, newDelay);\r
                }\r
+               ConfUtil.setDelay(pref, sb.toString());\r
 \r
                if (isDelay) {\r
-                       // \81@\92x\89\84\82ð\92Ê\92m\r
+                       // \92x\89\84\82ð\92Ê\92m\r
                        if (impl != null) {\r
                                impl.notificate(train.getName());\r
                        }\r
                }\r
+               pref.update();\r
                return isDelay;\r
        }\r
 \r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java
index bfb18d5..e1f0856 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java
@@ -36,10 +36,10 @@ public class TrainTwitterAdapterTest {
                \r
                Train train = null;\r
                long id = -1;\r
-               String name = null;\r
+               String name = "name";\r
                Calendar cal = null;\r
-               int ymd = -1;\r
-               int hm = -1;\r
+               int ymd = 2011;\r
+               int hm = 810;\r
                int count = -1;\r
                int len = -1;\r
                int h = -1;\r
@@ -51,30 +51,126 @@ public class TrainTwitterAdapterTest {
                boolean ret = false;\r
                String retData = null;\r
                \r
-               for (int i = 0; i < 1; i++){\r
-                       StringBuffer sb = new StringBuffer();\r
+               for (int i = 0; i < 4; i++){\r
+                       StringBuffer sb = null;\r
                        switch (i){\r
                        case 0:\r
                                id = 1;\r
-                               name = "foo";\r
                                cal = DateUtil.getCalendar(ymd, hm);\r
-                               count = 10;\r
+                               // Twit\90\94\r
+                               count = 9;\r
+                               // \8aÄ\8e\8b\8aÔ\8au\r
                                len = 10;       \r
                                \r
+                               // \92P\88Ê\8e\9e\8aÔ(\95ª)\82 \82½\82è\82ÌTwit\90\94\81B\82±\82ê\82ð\92´\82¦\82é\82Æ\92x\89\84\r
                                h = 1;\r
+                               // \92x\89\84\8cã\81A\82±\82Ì\8aú\8aÔ\82Í\92x\89\84\82ð\92Ê\92m\82µ\82È\82¢\r
+                               w = 1;\r
+                               \r
+                               // \91O\89ñ\82Ü\82Å\82Ì\92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               //delay = new Delay(id, ymd, hm, 0, true);\r
+                               //Delay.setData(sb, delay);\r
+                               ConfUtil.setDelay(pref, sb.toString());\r
+\r
+                               // \92x\89\84\8c\8b\89Ê\r
+                               ret = false;\r
+                               // \92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               //delay = new Delay(id, ymd, hm, 0, true);\r
+                               //Delay.setData(sb, delay);\r
+                               retData = sb.toString();\r
+                               break;\r
+                       case 1:\r
+                               id = 1;\r
+                               cal = DateUtil.getCalendar(ymd, hm);\r
+                               // Twit\90\94\r
+                               count = 10;\r
+                               // \8aÄ\8e\8b\8aÔ\8au\r
+                               len = 5;        \r
+                               \r
+                               // \92P\88Ê\8e\9e\8aÔ(\95ª)\82 \82½\82è\82ÌTwit\90\94\81B\82±\82ê\82ð\92´\82¦\82é\82Æ\92x\89\84\r
+                               h = 2;\r
+                               // \92x\89\84\8cã\81A\82±\82Ì\8aú\8aÔ\82Í\92x\89\84\82ð\92Ê\92m\82µ\82È\82¢\r
                                w = 1;\r
                                \r
+                               // \91O\89ñ\82Ü\82Å\82Ì\92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               //delay = new Delay(id, ymd, hm, 0, true);\r
+                               //Delay.setData(sb, delay);\r
+                               ConfUtil.setDelay(pref, sb.toString());\r
+\r
+                               // \92x\89\84\8c\8b\89Ê\r
+                               ret = true;\r
+                               // \92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
                                delay = new Delay(id, ymd, hm, 0, true);\r
                                Delay.setData(sb, delay);\r
+                               retData = sb.toString();\r
+                               break;\r
+                       case 2:\r
+                               // \92x\89\84\82Ì\8e\9e\8aÔ\82É\96¢\8dX\90V(\92Ê\92m\82Í\82µ\82È\82¢)\r
+                               id = 1;\r
+                               cal = DateUtil.getCalendar(ymd, hm + 1);\r
+                               // Twit\90\94\r
+                               count = 10;\r
+                               // \8aÄ\8e\8b\8aÔ\8au\r
+                               len = 5;        \r
+                               \r
+                               // \92P\88Ê\8e\9e\8aÔ(\95ª)\82 \82½\82è\82ÌTwit\90\94\81B\82±\82ê\82ð\92´\82¦\82é\82Æ\92x\89\84\r
+                               h = 2;\r
+                               // \92x\89\84\8cã\81A\82±\82Ì\8aú\8aÔ\82Í\92x\89\84\82ð\92Ê\92m\82µ\82È\82¢\r
+                               w = 1;\r
                                \r
+                               // \91O\89ñ\82Ü\82Å\82Ì\92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               delay = new Delay(id, ymd, hm, 0, true);\r
+                               Delay.setData(sb, delay);\r
+                               ConfUtil.setDelay(pref, sb.toString());\r
+\r
+                               // \92x\89\84\8c\8b\89Ê\r
                                ret = false;\r
-                               retData = "";\r
+                               // \92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               delay = new Delay(id, ymd, hm + 1, 0, true);\r
+                               Delay.setData(sb, delay);\r
+                               retData = sb.toString();\r
+                               break;\r
+                       case 3:\r
+                               // w\82ð\92´\82¦\82Ä\82Ì\92x\89\84\81B\92Ê\92m\82 \82è\r
+                               id = 1;\r
+                               cal = DateUtil.getCalendar(ymd, hm + 2);\r
+                               // Twit\90\94\r
+                               count = 10;\r
+                               // \8aÄ\8e\8b\8aÔ\8au\r
+                               len = 5;        \r
+                               \r
+                               // \92P\88Ê\8e\9e\8aÔ(\95ª)\82 \82½\82è\82ÌTwit\90\94\81B\82±\82ê\82ð\92´\82¦\82é\82Æ\92x\89\84\r
+                               h = 2;\r
+                               // \92x\89\84\8cã\81A\82±\82Ì\8aú\8aÔ\82Í\92x\89\84\82ð\92Ê\92m\82µ\82È\82¢\r
+                               w = 1;\r
+                               \r
+                               // \91O\89ñ\82Ü\82Å\82Ì\92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               delay = new Delay(id, ymd, hm, 0, true);\r
+                               Delay.setData(sb, delay);\r
+                               ConfUtil.setDelay(pref, sb.toString());\r
+\r
+                               // \92x\89\84\8c\8b\89Ê\r
+                               ret = true;\r
+                               // \92x\89\84\8fó\8bµ\r
+                               sb = new StringBuffer();\r
+                               delay = new Delay(id, ymd, hm + 2, 0, true);\r
+                               Delay.setData(sb, delay);\r
+                               retData = sb.toString();\r
                                break;\r
                        }\r
                        ConfUtil.setHeight(pref, h);\r
                        ConfUtil.setWidth(pref, w);\r
                        data = sb.toString();\r
                        ConfUtil.setDelay(pref, data);\r
+                       pref.update();\r
+\r
                        train = new Train(id, name);\r
                        \r
                        boolean isDelay = adpt.checkDelay(train, cal, count, len);\r
@@ -83,7 +179,7 @@ public class TrainTwitterAdapterTest {
                        }\r
                        \r
                        data = ConfUtil.getDelay(pref);\r
-                       if (data.equals(retData)){\r
+                       if (!data.equals(retData)){\r
                                throw new TestException();                              \r
                        }\r
                }\r

diff --git a/workspace/TrainDelayed/src/com/td/utility/Debug.java b/workspace/TrainDelayed/src/com/td/utility/Debug.java
index bb20013..e6093c2 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/utility/Debug.java
+++ b/workspace/TrainDelayed/src/com/td/utility/Debug.java
@@ -55,7 +55,7 @@ public class Debug {
        }\r
        \r
        public static void d(Object target, String msg){\r
-               d(target, msg, (Throwable)null);\r
+               d(target, msg, null, Log.DEBUG);\r
        }\r
 \r
        public static void d(Object target, String msg, Throwable t){\r