[ElmSharp.Wearable]add Activate() and fix tc 05/157405/2
authorJeongkyun <jk.pu@samsung.com>
Tue, 24 Oct 2017 10:16:41 +0000 (19:16 +0900)
committerJeongkyun <jk.pu@samsung.com>
Tue, 24 Oct 2017 10:47:19 +0000 (19:47 +0900)
add Activate() for activating circle object.
fix some tct code and add naviframe tc.

Change-Id: Idd150d89168986d1f2bf9127f98d6318003c0d1a
Signed-off-by: Jeongkyun <jk.pu@samsung.com>
19 files changed:
test/ElmSharp.Wearable.Test/TC/CircleDateTimeSelectorTest1.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleDateTimeSelectorTest2.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleDateTimeSelectorTest3.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleDateTimeSelectorTest4.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleGenListTest1.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleGenListTest2.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleGenListTest3.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleGenListTest4.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleProgressBarTest5.cs [new file with mode: 0755]
test/ElmSharp.Wearable.Test/TC/CircleScrollerTest1.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleScrollerTest2.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleScrollerTest3.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleScrollerTest4.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleSliderTest1.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleSliderTest2.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleSliderTest3.cs [new file with mode: 0755]
test/ElmSharp.Wearable.Test/TC/CircleSpinnerTest1.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleSpinnerTest2.cs [changed mode: 0644->0755]
test/ElmSharp.Wearable.Test/TC/CircleSpinnerTest3.cs [new file with mode: 0755]

old mode 100644 (file)
new mode 100755 (executable)
index 4ddaba3..316de85
@@ -37,12 +37,13 @@ namespace ElmSharp.Test.TC
 
             var surface = new CircleSurface(conformant);
 
-            DateTimeSelector datetime = new CircleDateTimeSelector(conformant, surface)
+            var datetime = new CircleDateTimeSelector(conformant, surface)
             {
                 MinimumDateTime = new DateTime(2015, 1, 1),
                 MaximumDateTime = DateTime.Now,
                 DateTime = DateTime.Now
             };
+            ((IRotaryActionWidget)datetime).Activate();
 
             layout.SetContent(datetime);
 
old mode 100644 (file)
new mode 100755 (executable)
index d27b4fc..90c58b3
@@ -37,12 +37,12 @@ namespace ElmSharp.Test.TC
 
             var surface = new CircleSurface(conformant);
 
-            DateTimeSelector datetime = new CircleDateTimeSelector(conformant, surface)
+            var datetime = new CircleDateTimeSelector(conformant, surface)
             {
                 DateTime = DateTime.Now,
                 Style = "timepicker/circle"
             };
-
+            ((IRotaryActionWidget)datetime).Activate();
             layout.SetContent(datetime);
 
             Button btn = new Button(layout)
old mode 100644 (file)
new mode 100755 (executable)
index 64ee69b..6ea1d1e
@@ -37,13 +37,13 @@ namespace ElmSharp.Test.TC
 
             var surface = new CircleSurface(conformant);
 
-            DateTimeSelector datetime = new CircleDateTimeSelector(conformant, surface)
+            var datetime = new CircleDateTimeSelector(conformant, surface)
             {
                 DateTime = DateTime.Now,
                 Style = "timepicker/circle",
                 IsEnabled = false
             };
-
+            ((IRotaryActionWidget)datetime).Activate();
             layout.SetContent(datetime);
 
             Button btn = new Button(layout)
old mode 100644 (file)
new mode 100755 (executable)
index 5a81497..c2ffa60
@@ -29,15 +29,15 @@ namespace ElmSharp.Test.TC
             Conformant conformant = new Conformant(window);
             conformant.Show();
 
-            Layout layout = new Layout(window);
+            var naviframe = new Naviframe(window);
 
+            conformant.SetContent(naviframe);
+            Layout layout = new Layout(naviframe);
             layout.SetTheme("layout", "circle", "datetime");
 
-            conformant.SetContent(layout);
-
             var surface = new CircleSurface(conformant);
 
-            DateTimeSelector datetime = new CircleDateTimeSelector(conformant, surface)
+            DateTimeSelector datetime = new CircleDateTimeSelector(naviframe, surface)
             {
                 DateTime = DateTime.Now,
                 Style = "timepicker/circle",
@@ -45,7 +45,7 @@ namespace ElmSharp.Test.TC
                 MarkerColor = Color.Pink,
                 MarkerRadius = 100,
             };
-
+            ((IRotaryActionWidget)datetime).Activate();
             layout.SetContent(datetime);
 
             Button btn = new Button(layout)
@@ -58,6 +58,8 @@ namespace ElmSharp.Test.TC
 
             layout.SetPartText("elm.text", "Set time");
 
+            naviframe.Push(layout, null, "empty");
+
             datetime.DateTimeChanged += (object sender, DateChangedEventArgs e) =>
             {
                 Log.Debug(TestName, "Old DateTime={0}", e.OldDate.ToString());
old mode 100644 (file)
new mode 100755 (executable)
index 2443827..eb821d3
@@ -37,7 +37,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBackgroundColor = Color.Pink,
                 VerticalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Visible,
             };
-
+            ((IRotaryActionWidget)list).Activate();
             conformant.SetContent(list);
 
             GenItemClass defaultClass = new GenItemClass("default")
old mode 100644 (file)
new mode 100755 (executable)
index af50687..54447fa
@@ -43,7 +43,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBarLineWidth = 30,
             };
             list.Show();
-
+            ((IRotaryActionWidget)list).Activate();
             list.Move(0, 0);
             list.Resize(360, 360);
             list.Lower();
old mode 100644 (file)
new mode 100755 (executable)
index ab8c62b..8116136
@@ -32,7 +32,7 @@ namespace ElmSharp.Test.TC
 
             conformant.SetContent(naviframe);
 
-            var surface = new CircleSurface(naviframe);
+            var surface = new CircleSurface(conformant);
 
             var list = new CircleGenList(naviframe, surface)
             {
@@ -40,7 +40,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Auto,
                 IsEnabled = false,
             };
-
+            ((IRotaryActionWidget)list).Activate();
             var item = naviframe.Push(list);
             item.Style = "empty";
 
old mode 100644 (file)
new mode 100755 (executable)
index 184cb05..ac968fa
@@ -33,7 +33,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Invisible,
             };
             list.Show();
-
+            ((IRotaryActionWidget)list).Activate();
             list.Move(0, 0);
             list.Resize(360, 360);
 
diff --git a/test/ElmSharp.Wearable.Test/TC/CircleProgressBarTest5.cs b/test/ElmSharp.Wearable.Test/TC/CircleProgressBarTest5.cs
new file mode 100755 (executable)
index 0000000..1dda1ab
--- /dev/null
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+using ElmSharp.Wearable;
+
+namespace ElmSharp.Test.TC
+{
+    public class CircleProgressBarTest5 : TestCaseBase
+    {
+        public override string TestName => "CircleProgressBarTest5";
+        public override string TestDescription => "To test Disabled property of CircleProgressBar";
+
+        public override void Run(Window window)
+        {
+            Log.Debug(TestName, "CircleProgressBar run");
+            Conformant conformant = new Conformant(window);
+            conformant.Show();
+
+            Naviframe naviframe = new Naviframe(window);
+            naviframe.Show();
+            conformant.SetContent(naviframe);
+
+            var surface = new CircleSurface(conformant);
+            CircleProgressBar pb1 = new CircleProgressBar(naviframe, surface)
+            {
+                AlignmentX = -1,
+                AlignmentY = -1,
+                WeightX = 1,
+                WeightY = 1,
+                Value = 0,
+                Maximum = 100,
+                Minimum = 0,
+            };
+            pb1.Show();
+            naviframe.Push(pb1, null, "empty");
+
+            Label lb1 = new Label(window)
+            {
+                Text = string.Format("S {0} %", pb1.Value),
+            };
+
+            lb1.Resize(window.ScreenSize.Width, window.ScreenSize.Height);
+            lb1.Move(160, window.ScreenSize.Height / 2 - 40);
+            lb1.Show();
+
+            EcoreMainloop.AddTimer(0.05, () =>
+            {
+                if (pb1.Value == pb1.Maximum/2)
+                {
+                    // Test purpose : set disable
+                    pb1.IsEnabled = false;
+                }
+
+                if (pb1.Value == pb1.Maximum)
+                {
+                    EcoreMainloop.RemoveTimer(pb1);
+                }
+
+                pb1.Value += 1;
+                lb1.Text = string.Format("S {0} %", pb1.Value);
+
+                return true;
+            });
+        }
+    }
+}
old mode 100644 (file)
new mode 100755 (executable)
index 9872c73..e5ee27f
@@ -39,6 +39,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Auto,
                 HorizontalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Invisible,
             };
+            ((IRotaryActionWidget)circleScroller).Activate();
             circleScroller.Show();
             conformant.SetContent(circleScroller);
             Box box = new Box(window)
old mode 100644 (file)
new mode 100755 (executable)
index 5742f24..96e27a3
@@ -41,6 +41,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Invisible,
                 HorizontalScrollBarVisiblePolicy = ScrollBarVisiblePolicy.Auto,
             };
+            ((IRotaryActionWidget)circleScroller).Activate();
             circleScroller.Show();
             circleScroller.Move(0, 0);
             circleScroller.Resize(360, 360);
old mode 100644 (file)
new mode 100755 (executable)
index b9688a7..1a8cb0c
@@ -29,9 +29,11 @@ namespace ElmSharp.Test.TC
             Conformant conformant = new Conformant(window);
             conformant.Show();
 
-            Naviframe naviframe = new Naviframe(conformant);
+            Naviframe naviframe = new Naviframe(window);
+            naviframe.Show();
+            conformant.SetContent(naviframe);
 
-            var surface = new CircleSurface(naviframe);
+            var surface = new CircleSurface(conformant);
             CircleScroller circleScroller = new CircleScroller(naviframe, surface)
             {
                 AlignmentX = -1,
@@ -45,10 +47,10 @@ namespace ElmSharp.Test.TC
                 HorizontalScrollBarLineWidth = 15,
                 HorizontalScrollBackgroundLineWidth = 15,
             };
+            ((IRotaryActionWidget)circleScroller).Activate();
             circleScroller.Show();
-            naviframe.Push(circleScroller);
-            naviframe.Show();
-            conformant.SetContent(naviframe);
+            naviframe.Push(circleScroller, null , "empty");
+
 
             Box box = new Box(window)
             {
old mode 100644 (file)
new mode 100755 (executable)
index c81e01f..bad9f09
@@ -41,6 +41,7 @@ namespace ElmSharp.Test.TC
                 VerticalScrollBarRadius = 170,
                 VerticalScrollBackgroundRadius = 170,
             };
+            ((IRotaryActionWidget)circleScroller).Activate();
             circleScroller.Show();
             circleScroller.Move(0, 0);
             circleScroller.Resize(360, 360);
old mode 100644 (file)
new mode 100755 (executable)
index 12681c2..1fd548d
@@ -40,6 +40,7 @@ namespace ElmSharp.Test.TC
                 Value = 25,
                 Step = 5,
             };
+            ((IRotaryActionWidget)circleSlider).Activate();
             circleSlider.Show();
             conformant.SetContent(circleSlider);
 
old mode 100644 (file)
new mode 100755 (executable)
index 179638e..ece5633
@@ -51,6 +51,7 @@ namespace ElmSharp.Test.TC
                 Value = 3,
                 Step = 0.5,
             };
+            ((IRotaryActionWidget)circleSlider).Activate();
             circleSlider.Show();
             conformant.SetContent(circleSlider);
             Label label1 = new Label(window)
diff --git a/test/ElmSharp.Wearable.Test/TC/CircleSliderTest3.cs b/test/ElmSharp.Wearable.Test/TC/CircleSliderTest3.cs
new file mode 100755 (executable)
index 0000000..2ca3c57
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp.Wearable;
+
+namespace ElmSharp.Test.TC
+{
+    public class CircleSliderTest3 : TestCaseBase
+    {
+        public override string TestName => "CircleSliderTest3";
+        public override string TestDescription => "To test basic operation of CircleSlider";
+
+        public override void Run(Window window)
+        {
+            Conformant conformant = new Conformant(window);
+            conformant.Show();
+
+            Naviframe naviframe = new Naviframe(window);
+            naviframe.Show();
+            conformant.SetContent(naviframe);
+
+            var surface = new CircleSurface(conformant);
+            CircleSlider circleSlider = new CircleSlider(naviframe, surface)
+            {
+                AlignmentX = -1,
+                AlignmentY = -1,
+                WeightX = 1,
+                WeightY = 1,
+                Minimum = 0,
+                Maximum = 20,
+                Value = 5,
+                Step = 0.5,
+            };
+            ((IRotaryActionWidget)circleSlider).Activate();
+            circleSlider.Show();
+            naviframe.Push(circleSlider, null, "empty");
+
+            Label label1 = new Label(window)
+            {
+                Text = string.Format("{0:F1}", circleSlider.Value),
+                Color = Color.White,
+            };
+
+            label1.Resize(window.ScreenSize.Width, window.ScreenSize.Height);
+            label1.Move(170, window.ScreenSize.Height / 2 - 20);
+            label1.Show();
+
+            circleSlider.ValueChanged += (s, e) =>
+            {
+                label1.Text = string.Format("{0:F1}", circleSlider.Value);
+            };
+
+        }
+    }
+}
old mode 100644 (file)
new mode 100755 (executable)
index 5c6eabd..87c6a0a
@@ -50,6 +50,7 @@ namespace ElmSharp.Test.TC
                 WeightX = 1,
                 WeightY = 1
             };
+            ((IRotaryActionWidget)spn1).Activate();
             spn1.AddSpecialValue(50, "50 match !!!!");
             layout.SetContent(spn1);
 
old mode 100644 (file)
new mode 100755 (executable)
index 50db506..80c5372
@@ -36,7 +36,7 @@ namespace ElmSharp.Test.TC
             var surface = new CircleSurface(conformant);
             CircleSpinner spn1 = new CircleSpinner(conformant, surface)
             {
-                Text = "Slider Test",
+                Text = "Spinner Test",
                 LabelFormat = "%d Value",
                 Style = "circle",
                 AngleRatio = 3.0,
@@ -54,6 +54,7 @@ namespace ElmSharp.Test.TC
                 MarkerColor = Color.Pink,
                 MarkerRadius = 100,
             };
+            ((IRotaryActionWidget)spn1).Activate();
             spn1.AddSpecialValue(50, "50 match !!!!");
             layout.SetContent(spn1);
 
diff --git a/test/ElmSharp.Wearable.Test/TC/CircleSpinnerTest3.cs b/test/ElmSharp.Wearable.Test/TC/CircleSpinnerTest3.cs
new file mode 100755 (executable)
index 0000000..57843c8
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp.Wearable;
+
+namespace ElmSharp.Test.TC
+{
+    class CircleSpinnerTest3 : TestCaseBase
+    {
+        public override string TestName => "CircleSpinnerTest3";
+        public override string TestDescription => "To test basic operation of Circle Spinner";
+
+        public override void Run(Window window)
+        {
+            Log.Debug(TestName, "CircleSpinnerTest run");
+            Conformant conformant = new Conformant(window);
+            conformant.Show();
+
+            Naviframe naviframe = new Naviframe(window);
+            naviframe.Show();
+            conformant.SetContent(naviframe);
+
+            Layout layout = new Layout(naviframe);
+            layout.SetTheme("layout", "circle", "spinner");
+
+            var surface = new CircleSurface(conformant);
+            CircleSpinner spn1 = new CircleSpinner(naviframe, surface)
+            {
+                Text = "Spinner Test",
+                LabelFormat = "%d Value",
+                Style = "circle",
+                AngleRatio = 3.0,
+                Minimum = 0,
+                Maximum = 360,
+                Value = 0,
+                Step = 10,
+                Interval = 0.5,
+                AlignmentX = -1,
+                AlignmentY = 1,
+                WeightX = 1,
+                WeightY = 1
+            };
+            ((IRotaryActionWidget)spn1).Activate();
+            spn1.AddSpecialValue(50, "50 match !!!!");
+            layout.SetContent(spn1);
+
+            Button btn = new Button(layout) {
+                Text = "OK",
+                Style = "bottom",
+            };
+
+            layout.SetPartContent("elm.swallow.btn", btn);
+            layout.SetPartText("elm.text", "Set value");
+
+            naviframe.Push(layout, null, "empty");
+        }
+    }
+}