テストケース追加

diff --git a/workspace/TrainDelayed/bin/TrainDelayed.apk b/workspace/TrainDelayed/bin/TrainDelayed.apk
index 7b2196a..462b73b 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 c4c10bd..f816d62 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 4b42747..a403126 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/service/Scheduler.java b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
index 3613206..011d5f7 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/Scheduler.java
+++ b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
@@ -100,7 +100,7 @@ public class Scheduler {
                }       \r
        }\r
        \r
-       private void clearSchedule(){\r
+       public void clearSchedule(){\r
                list = new List[N];\r
                for (int i = 0; i < list.length; i++){\r
                        list[i] = new ArrayList<Term>();\r
@@ -162,4 +162,8 @@ public class Scheduler {
                int to = (to1 > to2)? to1 : to2;\r
                return new Term(from, to);\r
        }\r
+\r
+       public List<Term>[] getList() {\r
+               return list;\r
+       }\r
 }\r

diff --git a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
index ee08365..d2e5f3b 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
+++ b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
@@ -1,15 +1,24 @@
 package com.td.service;\r
 \r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import com.td.db.Monitor;\r
 import com.td.test.TestException;\r
 import com.td.test.TestUtil;\r
 import com.td.utility.Debug;\r
 \r
 public class SchedulerTest {\r
+       private static int N = 7;//TODO\r
+       \r
        public static void main(){\r
                SchedulerTest obj = new SchedulerTest();\r
 \r
                Debug.i(obj, "start");\r
                try {\r
+                       test_addListTermMonitor();\r
+                       test_addListTermTerm();\r
+                       test_isContain();\r
                        test_addTermTerm();\r
                } catch (TestException e) {\r
                        Debug.i(obj, null, e);\r
@@ -17,6 +26,152 @@ public class SchedulerTest {
                Debug.i(obj, "end");\r
        }\r
        \r
+       public static void test_addListTermMonitor() throws TestException{\r
+               int n = -1;\r
+               Monitor m = null;\r
+               \r
+               Scheduler sc = new Scheduler();\r
+               sc.clearSchedule();\r
+               List<Term>[] ll = sc.getList();\r
+               List<Term> l = null;\r
+               \r
+               for (int i = 0; i < 2; i++){\r
+                       switch (i){\r
+                       case 0:\r
+                               n = 3;\r
+                               ll[n].add(new Term(1, 2));\r
+                               m = new Monitor(2, 3);\r
+                               m.setWeek(n, true);\r
+                               m.setWeek(n + 2, true);\r
+                               break;\r
+                       case 1:\r
+                               n = 0;\r
+                               ll[n].add(new Term(1, 2));\r
+                               m = new Monitor(3, 4);\r
+                               m.setWeek(n, true);\r
+                               break;\r
+                       }\r
+       \r
+                       sc.add(ll, m);\r
+       \r
+                       switch (i){\r
+                       case 0:\r
+                               l = ll[n];\r
+                               TestUtil.equal(l.size(), 1);\r
+                               TestUtil.isTrue(l.get(0).equals(new Term(1, 3)));\r
+                               l = ll[n + 2];\r
+                               TestUtil.equal(l.size(), 1);\r
+                               TestUtil.isTrue(l.get(0).equals(new Term(2, 3)));\r
+                               break;\r
+                       case 1:\r
+                               l = ll[n];\r
+                               TestUtil.equal(l.size(), 2);\r
+                               TestUtil.isTrue(l.get(0).equals(new Term(1, 2)));\r
+                               TestUtil.isTrue(l.get(1).equals(new Term(3, 4)));\r
+                               break;\r
+                       }\r
+               }\r
+       }\r
+       \r
+       public static void test_addListTermTerm() throws TestException{\r
+               Term t = null;\r
+               Term t1 = null;\r
+               \r
+               for (int i = 0; i < 3; i++){\r
+                       List<Term> l = new ArrayList<Term>();\r
+                       switch (i){\r
+                       case 0:\r
+                               t = new Term(1, 3);\r
+                               l.add(t);\r
+                               t1 = new Term(2, 4);\r
+                               break;\r
+                       case 1:\r
+                               t = new Term(1, 2);\r
+                               l.add(t);\r
+                               t = new Term(5, 6);\r
+                               l.add(t);\r
+                               t1 = new Term(3, 4);\r
+                               break;\r
+                       case 2:\r
+                               t = new Term(1, 2);\r
+                               l.add(t);\r
+                               t = new Term(3, 4);\r
+                               l.add(t);\r
+                               t1 = new Term(2, 3);\r
+                               break;\r
+                       }\r
+                       \r
+                       Scheduler sc = new Scheduler();\r
+                       sc.add(l, t1);\r
+\r
+                       switch (i){\r
+                       case 0:\r
+                               TestUtil.equal(l.size(), 1);\r
+                               TestUtil.isTrue(l.get(0).equals(new Term(1, 4)));\r
+                               break;\r
+                       case 1:\r
+                               TestUtil.equal(l.size(), 3);\r
+                               TestUtil.isTrue(l.get(0).equals(new Term(1, 2)));\r
+                               TestUtil.isTrue(l.get(1).equals(new Term(3, 4)));\r
+                               TestUtil.isTrue(l.get(2).equals(new Term(5, 6)));\r
+                               break;\r
+                       case 2:\r
+                               TestUtil.equal(l.size(), 1);\r
+                               TestUtil.isTrue(l.get(0).equals(new Term(1, 4)));\r
+                               break;\r
+                       }                       \r
+               }\r
+       }\r
+       \r
+       public static void test_isContain() throws TestException{\r
+               Term t1;\r
+               Term t2;\r
+               boolean b;\r
+               int from1 = -1;\r
+               int to1 = -1;\r
+               int from2 = -1;\r
+               int to2 = -1;\r
+               Scheduler sc;\r
+               \r
+               for (int i = 0; i < 3; i++){\r
+                       switch (i){\r
+                       case 0:\r
+                               from1 = 1;\r
+                               to1 = 3;\r
+                               from2 = 2;\r
+                               to2 = 4;\r
+                               break;\r
+                       case 1:\r
+                               from1 = 1;\r
+                               to1 = 4;\r
+                               from2 = 2;\r
+                               to2 = 3;\r
+                               break;\r
+                       case 2:\r
+                               from1 = 1;\r
+                               to1 = 2;\r
+                               from2 = 3;\r
+                               to2 = 4;\r
+                               break;\r
+                       }\r
+                       sc = new Scheduler();\r
+                       t1 = new Term(from1, to1);\r
+                       t2 = new Term(from2, to2);\r
+                       b = sc.isContain(t1, t2);\r
+                       switch (i){\r
+                       case 0:\r
+                               TestUtil.isTrue(b);\r
+                               break;\r
+                       case 1:\r
+                               TestUtil.isTrue(b);\r
+                               break;\r
+                       case 2:\r
+                               TestUtil.isFalse(b);\r
+                               break;\r
+                       }\r
+               }               \r
+       }\r
+\r
        public static void test_addTermTerm() throws TestException{\r
                Term t1;\r
                Term t2;\r

diff --git a/workspace/TrainDelayed/src/com/td/service/Term.java b/workspace/TrainDelayed/src/com/td/service/Term.java
index 6120a7f..a9f0f61 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/Term.java
+++ b/workspace/TrainDelayed/src/com/td/service/Term.java
@@ -21,4 +21,13 @@ public class Term {
        public void setTo(int to) {\r
                this.to = to;\r
        }\r
+\r
+       @Override\r
+       public boolean equals(Object o) {\r
+               if (o instanceof Term){\r
+                       Term t = (Term)o;\r
+                       return this.getFrom() == t.getFrom() && this.getTo() == t.getTo();\r
+               }\r
+               return super.equals(o);\r
+       }\r
 }\r

diff --git a/workspace/TrainDelayed/src/com/td/test/TestUtil.java b/workspace/TrainDelayed/src/com/td/test/TestUtil.java
index 78f6763..090a42e 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/test/TestUtil.java
+++ b/workspace/TrainDelayed/src/com/td/test/TestUtil.java
@@ -12,4 +12,16 @@ public class TestUtil {
                        throw new TestException();\r
                }\r
        }\r
+\r
+       public static void isTrue(boolean b) throws TestException{\r
+               if (!b){\r
+                       throw new TestException();\r
+               }\r
+       }\r
+\r
+       public static void isFalse(boolean b) throws TestException{\r
+               if (b){\r
+                       throw new TestException();\r
+               }\r
+       }\r
 }\r