テストケース追加。pref、プロセスkill対策作成中（バグあり）

diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index 5b140c8..9d95c7c 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -41,6 +41,8 @@ public class HistoryActivity extends BaseActivity {
 //     public static final String PREF_HIS_FROM = "HIS_FROM";\r
 //     public static final String PREF_HIS_TO = "HIS_TO";\r
 \r
+       public static final String PREF_HIS_DATA = "HIS_DATA";\r
+\r
        public static final int[] unit = { 10, 30, 60 };\r
 \r
        private EditPrefUtil pref = new EditPrefUtil(this);\r
@@ -125,6 +127,12 @@ public class HistoryActivity extends BaseActivity {
                        Date date = cal.getTime();\r
 \r
                        int H = 3;\r
+                       \r
+                       String data = pref.get(PREF_HIS_DATA);\r
+                       if (data != null){\r
+                               pref.restore(PREF_HIS_DATA);\r
+                       }\r
+\r
                        prefEnHour = pref.getInt(PREF_HIS_EN_HOUR, date.getHours());\r
                        prefEnMinute = pref.getInt(PREF_HIS_EN_MINUTE, date.getMinutes());\r
                        cal = Calendar.getInstance();\r
@@ -204,6 +212,18 @@ public class HistoryActivity extends BaseActivity {
                }\r
        }\r
 \r
+       @Override\r
+       protected void onStop() {\r
+               super.onStop();\r
+               \r
+               pref.save(PREF_HIS_DATA);\r
+       }\r
+\r
+       @Override\r
+       protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
+               super.onActivityResult(requestCode, resultCode, data);\r
+       }\r
+\r
        public static void init(Context context) {\r
                EditPrefUtil pref = new EditPrefUtil(context);\r
 \r
@@ -214,6 +234,8 @@ public class HistoryActivity extends BaseActivity {
                pref.remove(PREF_HIS_EN_HOUR);\r
                pref.remove(PREF_HIS_EN_MINUTE);\r
 \r
+               pref.remove(PREF_HIS_DATA);\r
+               \r
                pref.update();\r
        }\r
        \r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java
index 30f9f3a..9f0ca1d 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapterTest.java
@@ -49,7 +49,7 @@ public class TrainTwitterAdapterTest {
                boolean ret = false;\r
                String retData = null;\r
                \r
-               for (int i = 0; i < 4; i++){\r
+               for (int i = 0; i < 5; i++){\r
                        StringBuffer sb = new StringBuffer();\r
                        StringBuffer preSb = new StringBuffer();\r
 \r
@@ -152,6 +152,34 @@ public class TrainTwitterAdapterTest {
                                delay = new Delay(id, ymd, hm + 2, 0, true);\r
                                Delay.setData(sb, delay);\r
                                break;\r
+                       case 4:\r
+                               // \93ñ\82Â\96Ú\82Ì\83f\81[\83^\82ª\92x\89\84\r
+                               id = 1;\r
+                               cal = DateUtil.getCalendar(ymd, hm);\r
+                               // Twit\90\94\r
+                               count = 100;\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 = 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
+                               delay = new Delay(id + 1, ymd, hm, 0, true);\r
+                               Delay.setData(preSb, delay);\r
+                               delay = new Delay(id, ymd, hm - 5, 0, true);\r
+                               Delay.setData(preSb, delay);\r
+\r
+                               // \92x\89\84\8c\8b\89Ê\r
+                               ret = true;\r
+                               // \92x\89\84\8fó\8bµ\r
+                               delay = new Delay(id + 1, ymd, hm, 0, true);\r
+                               Delay.setData(sb, delay);\r
+                               delay = new Delay(id, ymd, hm, 0, true);\r
+                               Delay.setData(sb, delay);\r
+                               break;\r
                        }\r
                        ConfUtil.setHeight(pref, h);\r
                        ConfUtil.setWidth(pref, w);\r

diff --git a/workspace/TrainDelayed/src/com/td/utility/Delay.java b/workspace/TrainDelayed/src/com/td/utility/Delay.java
index f4fe7c9..04f2aee 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/utility/Delay.java
+++ b/workspace/TrainDelayed/src/com/td/utility/Delay.java
@@ -57,7 +57,6 @@ public class Delay {
                StringBuffer sb = new StringBuffer();\r
                for (Delay delay : delays){\r
                        setData(sb, delay);\r
-                       sb.append(DELM);\r
                }\r
                return sb;\r
        }\r