次回起動スケジュールのテストケース作成

diff --git a/workspace/TrainDelayed/bin/TrainDelayed.apk b/workspace/TrainDelayed/bin/TrainDelayed.apk
index 59a9a32..00519f9 100644 (file)
Binary files a/workspace/TrainDelayed/bin/TrainDelayed.apk and b/workspace/TrainDelayed/bin/TrainDelayed.apk differ

diff --git a/workspace/TrainDelayed/bin/classes.dex b/workspace/TrainDelayed/bin/classes.dex
index b4be4e6..d220103 100644 (file)
Binary files a/workspace/TrainDelayed/bin/classes.dex and b/workspace/TrainDelayed/bin/classes.dex differ

diff --git a/workspace/TrainDelayed/bin/resources.ap_ b/workspace/TrainDelayed/bin/resources.ap_
index fe5ab35..893687f 100644 (file)
Binary files a/workspace/TrainDelayed/bin/resources.ap_ and b/workspace/TrainDelayed/bin/resources.ap_ differ

diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index f683ab0..3e161ea 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -194,7 +194,7 @@ public class HistoryActivity extends BaseActivity {
                                int hm = history.getHm();\r
                                // TODO\r
                                //String text = (hm / 100) + ":" + (hm % 100);\r
-                               String text = DateUtil.formattedDate(hm);\r
+                               String text = DateUtil.formattedHm(hm);\r
                                String route = "<none>";\r
                                switch (history.getRouteId()) {\r
                                case 1:\r

diff --git a/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java b/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
index 494db82..a7068dd 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
+++ b/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
@@ -37,7 +37,8 @@ public class TrainDelayedActivity extends BaseActivity {
                Button button1 = (Button) this.findViewById(R.id.button01);
                button1.setOnClickListener(new OnClickListener() {
                        public void onClick(View v) {
-                               SchedulerTest.main();
+                               SchedulerTest.repeat(TrainDelayedActivity.this);
+                               //SchedulerTest.main();
                        }});
 
                Button button2 = (Button) this.findViewById(R.id.button02);
@@ -72,7 +73,7 @@ public class TrainDelayedActivity extends BaseActivity {
                button5.setOnClickListener(new OnClickListener() {
                        public void onClick(View view) {
                                // TODO
-                               HistoryDao.getInstance().delete(TrainDelayedActivity.this);
+                               //HistoryDao.getInstance().delete(TrainDelayedActivity.this);
 
                                Intent intent = new Intent(TrainDelayedActivity.this,
                                                TrainDelayedServiceImpl.class);

diff --git a/workspace/TrainDelayed/src/com/td/db/Monitor.java b/workspace/TrainDelayed/src/com/td/db/Monitor.java
index b8d5845..bec2bf2 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/db/Monitor.java
+++ b/workspace/TrainDelayed/src/com/td/db/Monitor.java
@@ -58,9 +58,9 @@ public class Monitor {
        @Override\r
        public String toString(){\r
                StringBuffer sb = new StringBuffer();\r
-               sb.append(DateUtil.formattedDate(from));\r
+               sb.append(DateUtil.formattedHm(from));\r
                sb.append(" - ");\r
-               sb.append(DateUtil.formattedDate(to));\r
+               sb.append(DateUtil.formattedHm(to));\r
                sb.append(" ");\r
                for (int i = 0; i < week.length; i++){\r
                        if (week[i]){\r

diff --git a/workspace/TrainDelayed/src/com/td/service/Scheduler.java b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
index fe6468f..5943330 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/Scheduler.java
+++ b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
@@ -24,8 +24,10 @@ public class Scheduler {
 \r
        }\r
        \r
-       public void calcSchedule(){\r
-               \r
+       public long calcSchedule(long now){\r
+               makeSchedule();\r
+               long t = nextSchedule(now);\r
+               return t;\r
        }\r
 \r
        public long nextSchedule(long now){\r
@@ -165,4 +167,5 @@ public class Scheduler {
        public List<Term>[] getList() {\r
                return list;\r
        }\r
+\r
 }\r

diff --git a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
index 1e50fe3..83a2e56 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
+++ b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
@@ -5,6 +5,9 @@ import java.util.Calendar;
 import java.util.Date;\r
 import java.util.List;\r
 \r
+import android.content.Context;\r
+import android.widget.Toast;\r
+\r
 import com.td.db.Monitor;\r
 import com.td.test.TestException;\r
 import com.td.test.TestUtil;\r
@@ -12,6 +15,21 @@ import com.td.utility.DateUtil;
 import com.td.utility.Debug;\r
 \r
 public class SchedulerTest {\r
+       public static void repeat(Context context){\r
+               Calendar cal = Calendar.getInstance();\r
+               Scheduler sc = new Scheduler();\r
+               long t = cal.getTimeInMillis();\r
+               \r
+               for (int i = 0; i < 5; i++){\r
+                       t = sc.calcSchedule(t);\r
+                       Date d = DateUtil.getDate(t);\r
+                       String ymd = DateUtil.formattedYmd(DateUtil.getYmd(d));\r
+                       String hm = DateUtil.formattedHm(DateUtil.getHm(d));\r
+                       String msg = ymd + " " + hm;\r
+                       Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();\r
+               }\r
+       }\r
+       \r
        public static void main() {\r
                SchedulerTest obj = new SchedulerTest();\r
 \r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
index 1dea82d..a0a028b 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
@@ -192,6 +192,8 @@ public class TrainDelayedServiceImpl extends Service {
        private Runnable task = new Runnable() {\r
                public void run() {\r
                        try {\r
+                               long now = System.currentTimeMillis();\r
+\r
                                synchronized (binder) {\r
                                        try {\r
                                                schedule2(-1);\r
@@ -202,7 +204,6 @@ public class TrainDelayedServiceImpl extends Service {
                                }\r
 \r
                                // \8e\9f\89ñ\8bN\93®\93o\98^\r
-                               long now = System.currentTimeMillis();\r
                                PendingIntent alarmSender = PendingIntent.getService(\r
                                                TrainDelayedServiceImpl.this, 0, new Intent(\r
                                                                TrainDelayedServiceImpl.this,\r

diff --git a/workspace/TrainDelayed/src/com/td/utility/DateUtil.java b/workspace/TrainDelayed/src/com/td/utility/DateUtil.java
index 8d6babc..29438e6 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/utility/DateUtil.java
+++ b/workspace/TrainDelayed/src/com/td/utility/DateUtil.java
@@ -41,7 +41,7 @@ public class DateUtil {
                return names[index];\r
        }\r
        \r
-       public static String formattedDate(int hm){\r
+       public static String formattedHm(int hm){\r
                StringBuffer sb = new StringBuffer();\r
                sb.append(fmt2.format((int) (hm / 100)));\r
                sb.append(":");\r
@@ -53,9 +53,9 @@ public class DateUtil {
                StringBuffer sb = new StringBuffer();\r
                sb.append(formattedYmd(ymd));\r
                sb.append(" ");\r
-               sb.append(formattedDate(from));\r
+               sb.append(formattedHm(from));\r
                sb.append(" - ");\r
-               sb.append(formattedDate(to));\r
+               sb.append(formattedHm(to));\r
                return sb.toString();\r
        }\r
        \r