davemds pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=741000d423deafb01c80c93eef323188234c18f0

commit 741000d423deafb01c80c93eef323188234c18f0
Author: Dave Andreoli <d...@gurumeditation.it>
Date:   Sat Jul 22 10:55:04 2017 +0200

    Move elm external test from edje to elm
    
    elm widgets need an elm parent to work correctly, so it's better to use an 
elm win instead of a ecore evas one.
---
 tests/edje/theme.edc                               | 375 ---------------------
 tests/edje/theme.edj                               | Bin 15999 -> 13570 bytes
 .../test_04_external.py}                           | 127 +++----
 tests/{edje => elementary}/theme.edc               | 284 ++--------------
 tests/elementary/theme.edj                         | Bin 0 -> 12331 bytes
 5 files changed, 82 insertions(+), 704 deletions(-)

diff --git a/tests/edje/theme.edc b/tests/edje/theme.edc
index 4829d0d..f36c6a3 100644
--- a/tests/edje/theme.edc
+++ b/tests/edje/theme.edc
@@ -154,381 +154,6 @@ collections {
                     y: 1 0 0;
                 }
             }
-            //// Externals (hiddens, only used for the unittests)
-            part { name: "ext_elm_actionslider";
-                type: EXTERNAL;
-                source: "elm/actionslider";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        string: "label" "ActionSlideR";
-                    }
-                }
-            }
-            part { name: "ext_elm_bg";
-                type: EXTERNAL;
-                source: "elm/bg";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_bubble";
-                type: EXTERNAL;
-                source: "elm/bubble";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_button";
-                type: EXTERNAL;
-                source: "elm/button";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_calendar";
-                type: EXTERNAL;
-                source: "elm/calendar";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_check";
-                type: EXTERNAL;
-                source: "elm/check";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_clock";
-                type: EXTERNAL;
-                source: "elm/clock";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        int: "hours" 23;
-                        int: "minutes" 58;
-                        int: "seconds" 59;
-                        bool: "editable" 1;
-                        bool: "am/pm" 1;
-                        bool: "show seconds" 1;
-                    }
-                }
-            }
-            part { name: "ext_elm_entry";
-                type: EXTERNAL;
-                source: "elm/entry";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_fileselector";
-                type: EXTERNAL;
-                source: "elm/fileselector";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_fileselector_button";
-                type: EXTERNAL;
-                source: "elm/fileselector_button";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_fileselector_entry";
-                type: EXTERNAL;
-                source: "elm/fileselector_entry";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_frame";
-                type: EXTERNAL;
-                source: "elm/frame";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_gengrid";
-                type: EXTERNAL;
-                source: "elm/gengrid";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_genlist";
-                type: EXTERNAL;
-                source: "elm/genlist";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_hoversel";
-                type: EXTERNAL;
-                source: "elm/hoversel";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_icon";
-                type: EXTERNAL;
-                source: "elm/icon";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_index";
-                type: EXTERNAL;
-                source: "elm/index";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_label";
-                type: EXTERNAL;
-                source: "elm/label";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        string: "label" "This is an elm label";
-                    }
-                }
-            }
-            part { name: "ext_elm_list";
-                type: EXTERNAL;
-                source: "elm/list";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_map";
-                type: EXTERNAL;
-                source: "elm/map";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_multibuttonentry";
-                type: EXTERNAL;
-                source: "elm/multibuttonentry";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_naviframe";
-                type: EXTERNAL;
-                source: "elm/naviframe";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_notify";
-                type: EXTERNAL;
-                source: "elm/notify";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_panes";
-                type: EXTERNAL;
-                source: "elm/panes";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_photocam";
-                type: EXTERNAL;
-                source: "elm/photocam";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_progressbar";
-                type: EXTERNAL;
-                source: "elm/progressbar";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_radio";
-                type: EXTERNAL;
-                source: "elm/radio";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_scroller";
-                type: EXTERNAL;
-                source: "elm/scroller";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_segment_control";
-                type: EXTERNAL;
-                source: "elm/segment_control";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_slider";
-                type: EXTERNAL;
-                source: "elm/slider";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        string: "label" "external slider";
-                        double: "min" -1;
-                        double: "max" 999;
-                        double: "value" 0.6;
-                        bool: "inverted" 1;
-                        bool: "horizontal" 1;
-                        int: "span" 45;
-                        string: "unit format" "test %f";
-                        string: "indicator format" "%f ind";
-                        string: "icon" "folder";
-                    }
-                }
-            }
-            part { name: "ext_elm_slideshow";
-                type: EXTERNAL;
-                source: "elm/slideshow";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_spinner";
-                type: EXTERNAL;
-                source: "elm/spinner";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_thumb";
-                type: EXTERNAL;
-                source: "elm/thumb";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_toolbar";
-                type: EXTERNAL;
-                source: "elm/toolbar";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_video";
-                type: EXTERNAL;
-                source: "elm/video";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
-            part { name: "ext_elm_web";
-                type: EXTERNAL;
-                source: "elm/web";
-                description { state: "default" 0.0;
-                    visible: 0;
-                    params {
-                        // TODO
-                    }
-                }
-            }
         }
         programs {
             program { name: "emit_back_message";
diff --git a/tests/edje/theme.edj b/tests/edje/theme.edj
index 1b06d61..3fa45d1 100644
Binary files a/tests/edje/theme.edj and b/tests/edje/theme.edj differ
diff --git a/tests/edje/test_03_external.py 
b/tests/elementary/test_04_external.py
similarity index 74%
rename from tests/edje/test_03_external.py
rename to tests/elementary/test_04_external.py
index 757f03f..cdbe1e0 100644
--- a/tests/edje/test_03_external.py
+++ b/tests/elementary/test_04_external.py
@@ -5,43 +5,7 @@ import logging
 
 from efl import evas
 from efl import edje
-
-from efl.elementary.actionslider import Actionslider
-from efl.elementary.background import Background
-from efl.elementary.bubble import Bubble
-from efl.elementary.button import Button
-from efl.elementary.calendar_elm import Calendar
-from efl.elementary.check import Check
-from efl.elementary.clock import Clock
-from efl.elementary.entry import Entry
-from efl.elementary.fileselector import Fileselector
-from efl.elementary.fileselector_button import FileselectorButton
-from efl.elementary.fileselector_entry import FileselectorEntry
-from efl.elementary.frame import Frame
-from efl.elementary.gengrid import Gengrid
-from efl.elementary.genlist import Genlist
-from efl.elementary.hoversel import Hoversel
-from efl.elementary.icon import Icon
-from efl.elementary.index import Index
-from efl.elementary.label import Label
-from efl.elementary.list import List
-from efl.elementary.map import Map
-from efl.elementary.multibuttonentry import MultiButtonEntry
-from efl.elementary.naviframe import Naviframe
-from efl.elementary.notify import Notify
-from efl.elementary.panes import Panes
-from efl.elementary.photocam import Photocam
-from efl.elementary.progressbar import Progressbar
-from efl.elementary.radio import Radio
-from efl.elementary.scroller import Scroller
-from efl.elementary.segment_control import SegmentControl
-from efl.elementary.slider import Slider
-from efl.elementary.slideshow import Slideshow
-from efl.elementary.spinner import Spinner
-from efl.elementary.toolbar import Toolbar
-from efl.elementary.thumb import Thumb
-from efl.elementary.video import Video
-from efl.elementary.web import Web
+from efl import elementary as elm
 
 
 theme_path = os.path.dirname(os.path.abspath(__file__))
@@ -50,19 +14,18 @@ theme_file = os.path.join(theme_path, "theme.edj")
 
 class TestElementaryExternal(unittest.TestCase):
     def setUp(self):
-        self.canvas = evas.Canvas(method="buffer",
-                                  size=(400, 500),
-                                  viewport=(0, 0, 400, 500))
-        self.canvas.engine_info_set(self.canvas.engine_info_get())
-        self.theme = edje.Edje(self.canvas, file=theme_file, group="main")
+        self.win = elm.Window("t", elm.ELM_WIN_BASIC)
+        self.layout = elm.Layout(self.win, file=(theme_file, "main"))
+        self.theme = self.layout.edje
 
     def tearDown(self):
-        self.theme.delete()
-        self.canvas.delete()
+        # TODO: This is correct but throw lots of Eo errors (to be fixed in 
efl)
+        # self.win.delete()
+        pass
 
     def testExternalActionslider(self):
         elm_as = self.theme.part_external_object_get("ext_elm_actionslider")
-        self.assertIsInstance(elm_as, Actionslider)
+        self.assertIsInstance(elm_as, elm.Actionslider)
 
         # check values set in edc (from external)
         
self.assertEqual(self.theme.part_external_param_get("ext_elm_actionslider", 
"label"), "ActionSlideR")
@@ -79,37 +42,37 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalBackground(self):
         elm_bg = self.theme.part_external_object_get("ext_elm_bg")
-        self.assertIsInstance(elm_bg, Background)
+        self.assertIsInstance(elm_bg, elm.Background)
 
         # TODO test params
 
     def testExternalBubble(self):
         elm_bg = self.theme.part_external_object_get("ext_elm_bubble")
-        self.assertIsInstance(elm_bg, Bubble)
+        self.assertIsInstance(elm_bg, elm.Bubble)
 
         # TODO test params
 
     def testExternalButton(self):
         elm_button = self.theme.part_external_object_get("ext_elm_button")
-        self.assertIsInstance(elm_button, Button)
+        self.assertIsInstance(elm_button, elm.Button)
 
         # TODO test params
 
     def testExternalCalendar(self):
         elm_cal = self.theme.part_external_object_get("ext_elm_calendar")
-        self.assertIsInstance(elm_cal, Calendar)
+        self.assertIsInstance(elm_cal, elm.Calendar)
 
         # TODO test params
 
     def testExternalCheck(self):
         elm_check = self.theme.part_external_object_get("ext_elm_check")
-        self.assertIsInstance(elm_check, Check)
+        self.assertIsInstance(elm_check, elm.Check)
 
         # TODO test params
 
     def testExternalClock(self):
         elm_clock = self.theme.part_external_object_get("ext_elm_clock")
-        self.assertIsInstance(elm_clock, Clock)
+        self.assertIsInstance(elm_clock, elm.Clock)
 
         # check values set in edc (from external)
         self.assertEqual(self.theme.part_external_param_get("ext_elm_clock", 
"hours"), 23)
@@ -141,67 +104,67 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalEntry(self):
         elm_entry = self.theme.part_external_object_get("ext_elm_entry")
-        self.assertIsInstance(elm_entry, Entry)
+        self.assertIsInstance(elm_entry, elm.Entry)
 
         # TODO test params
 
     def testExternalFileselector(self):
         elm_fs = self.theme.part_external_object_get("ext_elm_fileselector")
-        self.assertIsInstance(elm_fs, Fileselector)
+        self.assertIsInstance(elm_fs, elm.Fileselector)
 
         # TODO test params
 
     def testExternalFileselectorButton(self):
         elm_fs_btn = 
self.theme.part_external_object_get("ext_elm_fileselector_button")
-        self.assertIsInstance(elm_fs_btn, FileselectorButton)
+        self.assertIsInstance(elm_fs_btn, elm.FileselectorButton)
 
         # TODO test params
 
     def testExternalFileselectorEntry(self):
         elm_fs_en = 
self.theme.part_external_object_get("ext_elm_fileselector_entry")
-        self.assertIsInstance(elm_fs_en, FileselectorEntry)
+        self.assertIsInstance(elm_fs_en, elm.FileselectorEntry)
 
         # TODO test params
 
     def testExternalFrame(self):
         elm_frame = self.theme.part_external_object_get("ext_elm_frame")
-        self.assertIsInstance(elm_frame, Frame)
+        self.assertIsInstance(elm_frame, elm.Frame)
 
         # TODO test params
 
     def testExternalGengrid(self):
         elm_gg = self.theme.part_external_object_get("ext_elm_gengrid")
-        self.assertIsInstance(elm_gg, Gengrid)
+        self.assertIsInstance(elm_gg, elm.Gengrid)
 
         # TODO test params
 
     def testExternalGenlist(self):
         elm_gl = self.theme.part_external_object_get("ext_elm_genlist")
-        self.assertIsInstance(elm_gl, Genlist)
+        self.assertIsInstance(elm_gl, elm.Genlist)
 
         # TODO test params
 
     def testExternalHoversel(self):
         elm_hoversel = self.theme.part_external_object_get("ext_elm_hoversel")
-        self.assertIsInstance(elm_hoversel, Hoversel)
+        self.assertIsInstance(elm_hoversel, elm.Hoversel)
 
         # TODO test params
 
     def testExternalIcon(self):
         elm_icon = self.theme.part_external_object_get("ext_elm_icon")
-        self.assertIsInstance(elm_icon, Icon)
+        self.assertIsInstance(elm_icon, elm.Icon)
 
         # TODO test params
 
     def testExternalIndex(self):
         elm_index = self.theme.part_external_object_get("ext_elm_index")
-        self.assertIsInstance(elm_index, Index)
+        self.assertIsInstance(elm_index, elm.Index)
 
         # TODO test params
 
     def testExternalLabel(self):
         elm_label = self.theme.part_external_object_get("ext_elm_label")
-        self.assertIsInstance(elm_label, Label)
+        self.assertIsInstance(elm_label, elm.Label)
 
         # check values setted in edc (from external)
         self.assertEqual(self.theme.part_external_param_get("ext_elm_label", 
"label"), "This is an elm label")
@@ -218,73 +181,73 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalList(self):
         elm_list = self.theme.part_external_object_get("ext_elm_list")
-        self.assertIsInstance(elm_list, List)
+        self.assertIsInstance(elm_list, elm.List)
 
         # TODO test params
 
     def testExternalMap(self):
         elm_map = self.theme.part_external_object_get("ext_elm_map")
-        self.assertIsInstance(elm_map, Map)
+        self.assertIsInstance(elm_map, elm.Map)
 
         # TODO test params
 
     def testExternalMultibuttonentry(self):
         elm_mbe = 
self.theme.part_external_object_get("ext_elm_multibuttonentry")
-        self.assertIsInstance(elm_mbe, MultiButtonEntry)
+        self.assertIsInstance(elm_mbe, elm.MultiButtonEntry)
 
         # TODO test params
 
     def testExternalNaviframe(self):
         elm_nf = self.theme.part_external_object_get("ext_elm_naviframe")
-        self.assertIsInstance(elm_nf, Naviframe)
+        self.assertIsInstance(elm_nf, elm.Naviframe)
 
         # TODO test params
 
     def testExternalNotify(self):
         elm_notify = self.theme.part_external_object_get("ext_elm_notify")
-        self.assertIsInstance(elm_notify, Notify)
+        self.assertIsInstance(elm_notify, elm.Notify)
 
         # TODO test params
 
     def testExternalPanes(self):
         elm_panes = self.theme.part_external_object_get("ext_elm_panes")
-        self.assertIsInstance(elm_panes, Panes)
+        self.assertIsInstance(elm_panes, elm.Panes)
 
         # TODO test params
 
     def testExternalPhotocam(self):
         elm_photocam = self.theme.part_external_object_get("ext_elm_photocam")
-        self.assertIsInstance(elm_photocam, Photocam)
+        self.assertIsInstance(elm_photocam, elm.Photocam)
 
         # TODO test params
 
     def testExternalProgressbar(self):
         elm_pb = self.theme.part_external_object_get("ext_elm_progressbar")
-        self.assertIsInstance(elm_pb, Progressbar)
+        self.assertIsInstance(elm_pb, elm.Progressbar)
 
         # TODO test params
 
     def testExternalRadio(self):
         elm_radio = self.theme.part_external_object_get("ext_elm_radio")
-        self.assertIsInstance(elm_radio, Radio)
+        self.assertIsInstance(elm_radio, elm.Radio)
 
         # TODO test params
 
     def testExternalScroller(self):
         elm_scroller = self.theme.part_external_object_get("ext_elm_scroller")
-        self.assertIsInstance(elm_scroller, Scroller)
+        self.assertIsInstance(elm_scroller, elm.Scroller)
 
         # TODO test params
 
     def testExternalSegmentControl(self):
         elm_sc = self.theme.part_external_object_get("ext_elm_segment_control")
-        self.assertIsInstance(elm_sc, SegmentControl)
+        self.assertIsInstance(elm_sc, elm.SegmentControl)
 
         # TODO test params
 
     def testExternalSlider(self):
         elm_slider = self.theme.part_external_object_get("ext_elm_slider")
-        self.assertIsInstance(elm_slider, Slider)
+        self.assertIsInstance(elm_slider, elm.Slider)
 
         # check values setted in edc (from external)
         self.assertEqual(self.theme.part_external_param_get("ext_elm_slider", 
"label"), "external slider")
@@ -306,7 +269,7 @@ class TestElementaryExternal(unittest.TestCase):
         self.assertEqual(elm_slider.span_size, 45)
         self.assertEqual(elm_slider.unit_format, "test %f")
         self.assertEqual(elm_slider.indicator_format, "%f ind")
-        self.assertIsInstance(elm_slider.icon, Icon)
+        self.assertIsInstance(elm_slider.icon, elm.Icon)
 
         # do params set
         self.theme.part_external_param_set("ext_elm_slider", "label", "new 
text")
@@ -329,42 +292,42 @@ class TestElementaryExternal(unittest.TestCase):
         self.assertEqual(elm_slider.span_size, 11)
         self.assertEqual(elm_slider.unit_format, "uf")
         self.assertEqual(elm_slider.indicator_format, "if")
-        self.assertIsInstance(elm_slider.icon, Icon)
+        self.assertIsInstance(elm_slider.icon, elm.Icon)
 
     def testExternalSlideshow(self):
         elm_ss = self.theme.part_external_object_get("ext_elm_slideshow")
-        self.assertIsInstance(elm_ss, Slideshow)
+        self.assertIsInstance(elm_ss, elm.Slideshow)
 
         # TODO test params
 
     def testExternalSpinner(self):
         elm_spinner = self.theme.part_external_object_get("ext_elm_spinner")
-        self.assertIsInstance(elm_spinner, Spinner)
+        self.assertIsInstance(elm_spinner, elm.Spinner)
 
         # TODO test params
 
     def testExternalThumb(self):
         elm_thumb = self.theme.part_external_object_get("ext_elm_thumb")
-        self.assertIsInstance(elm_thumb, Thumb)
+        self.assertIsInstance(elm_thumb, elm.Thumb)
 
         # TODO test params
 
     def testExternalToolbar(self):
         elm_toolbar = self.theme.part_external_object_get("ext_elm_toolbar")
-        self.assertIsInstance(elm_toolbar, Toolbar)
+        self.assertIsInstance(elm_toolbar, elm.Toolbar)
 
         # TODO test params
 
     def testExternalVideo(self):
         elm_video = self.theme.part_external_object_get("ext_elm_video")
-        self.assertIsInstance(elm_video, Video)
+        self.assertIsInstance(elm_video, elm.Video)
 
         # TODO test params
 
     @unittest.skip("Elm Web not maintained atm")
     def testExternalWeb(self):
         elm_web = self.theme.part_external_object_get("ext_elm_web")
-        self.assertIsInstance(elm_web, Web)
+        self.assertIsInstance(elm_web, elm.Web)
 
         # TODO test params
 
diff --git a/tests/edje/theme.edc b/tests/elementary/theme.edc
similarity index 53%
copy from tests/edje/theme.edc
copy to tests/elementary/theme.edc
index 4829d0d..78f9b4a 100644
--- a/tests/edje/theme.edc
+++ b/tests/elementary/theme.edc
@@ -3,163 +3,13 @@ externals {
     external: "elm";
 }
 
-data {
-    item: "key1" "value1";
-    item: "key2" "value2";
-}
-
-styles {
-    style {
-        name: "style1";
-        base: "font=Sans font_size=13 color=#fff wrap=word";
-        tag:  "br" "\n";
-        tag:  "tab" "\t";
-    }
-    style {
-        name: "style2";
-        base: "font=Sans font_size=9 color=#ccc";
-        tag:  "br" "\n";
-        tag:  "tab" "\t";
-        tag:  "b" "+ font=Sans:style=Bold";
-    }
-}
-
-color_classes {
-    color_class {
-        name: "colorclass1";
-        color: 1 2 3 4;
-        color2: 5 6 7 8;
-        color3: 9 10 11 12;
-    }
-    color_class {
-        name: "colorclass2";
-        color: 13 14 15 16;
-        color2: 17 18 19 20;
-        color3: 21 22 23 24;
-    }
-}
-
-
 collections {
-    group {
-        name: "main";
-        min: 200 200;
-        max: 400 400;
-
-        data {
-            item: "key3" "value3";
-            item: "key4" "value4";
-        }
-
-        script {
-            public my_func(val) {
-                set_text(PART:"label", "asd");
-            }
-        }
-
+    group { name: "main";
         parts {
-            part { name: "bg";
-                type: RECT;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                    color: 255 255 255 255;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        offset: 0 0;
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        offset: -1 -1;
-                    }
-                }
-            }
-            part { name: "rect";
-                type: RECT;
-                mouse_events: 1;
-                description {
-                    state: "default" 0.0;
-                    color: 255 0 0 255;
-                    rel1 {
-                        relative: 0.5 0.5;
-                        offset: -50 -50;
-                    }
-                    rel2 {
-                        relative: 0.5 0.5;
-                        offset: 49 49;
-                    }
-                }
-            }
-            part { name: "label";
-                type: TEXT;
-                description { state: "default" 0.0;
-                    color: 0 0 200 255;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        offset: 0 0;
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        offset: -1 -1;
-                    }
-                    text {
-                        font: "Sans";
-                        size: 12;
-                        text: "label test";
-                    }
-                }
-            }
-            //// Used to test edje edit
-            part { name: "test_clip";
-                type: RECT;
-                mouse_events: 0;
-                description {
-                    state: "default" 0.0;
-                }
-            }
-            part { name: "edit_test";
-                type: RECT;
-                mouse_events: 0;
-                repeat_events: 0;
-                scale: 1;
-                effect: OUTLINE BOTTOM;
-                ignore_flags: ON_HOLD;
-                clip_to: "test_clip";
-                api: "api_name" "api_description";
-                description {
-                    state: "default" 0.0;
-                }
-                description {
-                    state: "state1" 0.0;
-                }
-                description {
-                    state: "state2" 0.0;
-                }
-                description {
-                    state: "state2" 0.1;
-                }
-                dragable {
-                    confine: "label";
-                    events: "edit_test_drag_event";
-                    x: 1 6 8;
-                    y: 1 7 9;
-                }
-            }
-            part { name: "edit_test_drag_event";
-                type: RECT;
-                description {
-                    state: "default" 0.0;
-                }
-                dragable {
-                    x: 1 0 0;
-                    y: 1 0 0;
-                }
-            }
-            //// Externals (hiddens, only used for the unittests)
             part { name: "ext_elm_actionslider";
                 type: EXTERNAL;
                 source: "elm/actionslider";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         string: "label" "ActionSlideR";
                     }
@@ -168,8 +18,7 @@ collections {
             part { name: "ext_elm_bg";
                 type: EXTERNAL;
                 source: "elm/bg";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -178,8 +27,7 @@ collections {
             part { name: "ext_elm_bubble";
                 type: EXTERNAL;
                 source: "elm/bubble";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -188,8 +36,7 @@ collections {
             part { name: "ext_elm_button";
                 type: EXTERNAL;
                 source: "elm/button";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -198,8 +45,7 @@ collections {
             part { name: "ext_elm_calendar";
                 type: EXTERNAL;
                 source: "elm/calendar";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -208,8 +54,7 @@ collections {
             part { name: "ext_elm_check";
                 type: EXTERNAL;
                 source: "elm/check";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -218,8 +63,7 @@ collections {
             part { name: "ext_elm_clock";
                 type: EXTERNAL;
                 source: "elm/clock";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         int: "hours" 23;
                         int: "minutes" 58;
@@ -233,8 +77,7 @@ collections {
             part { name: "ext_elm_entry";
                 type: EXTERNAL;
                 source: "elm/entry";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -243,8 +86,7 @@ collections {
             part { name: "ext_elm_fileselector";
                 type: EXTERNAL;
                 source: "elm/fileselector";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -253,8 +95,7 @@ collections {
             part { name: "ext_elm_fileselector_button";
                 type: EXTERNAL;
                 source: "elm/fileselector_button";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -263,8 +104,7 @@ collections {
             part { name: "ext_elm_fileselector_entry";
                 type: EXTERNAL;
                 source: "elm/fileselector_entry";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -273,8 +113,7 @@ collections {
             part { name: "ext_elm_frame";
                 type: EXTERNAL;
                 source: "elm/frame";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -283,8 +122,7 @@ collections {
             part { name: "ext_elm_gengrid";
                 type: EXTERNAL;
                 source: "elm/gengrid";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -293,8 +131,7 @@ collections {
             part { name: "ext_elm_genlist";
                 type: EXTERNAL;
                 source: "elm/genlist";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -303,8 +140,7 @@ collections {
             part { name: "ext_elm_hoversel";
                 type: EXTERNAL;
                 source: "elm/hoversel";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -313,8 +149,7 @@ collections {
             part { name: "ext_elm_icon";
                 type: EXTERNAL;
                 source: "elm/icon";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -323,8 +158,7 @@ collections {
             part { name: "ext_elm_index";
                 type: EXTERNAL;
                 source: "elm/index";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -333,8 +167,7 @@ collections {
             part { name: "ext_elm_label";
                 type: EXTERNAL;
                 source: "elm/label";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         string: "label" "This is an elm label";
                     }
@@ -343,8 +176,7 @@ collections {
             part { name: "ext_elm_list";
                 type: EXTERNAL;
                 source: "elm/list";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -353,8 +185,7 @@ collections {
             part { name: "ext_elm_map";
                 type: EXTERNAL;
                 source: "elm/map";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -363,8 +194,7 @@ collections {
             part { name: "ext_elm_multibuttonentry";
                 type: EXTERNAL;
                 source: "elm/multibuttonentry";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -373,8 +203,7 @@ collections {
             part { name: "ext_elm_naviframe";
                 type: EXTERNAL;
                 source: "elm/naviframe";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -383,8 +212,7 @@ collections {
             part { name: "ext_elm_notify";
                 type: EXTERNAL;
                 source: "elm/notify";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -393,8 +221,7 @@ collections {
             part { name: "ext_elm_panes";
                 type: EXTERNAL;
                 source: "elm/panes";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -403,8 +230,7 @@ collections {
             part { name: "ext_elm_photocam";
                 type: EXTERNAL;
                 source: "elm/photocam";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -413,8 +239,7 @@ collections {
             part { name: "ext_elm_progressbar";
                 type: EXTERNAL;
                 source: "elm/progressbar";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -423,8 +248,7 @@ collections {
             part { name: "ext_elm_radio";
                 type: EXTERNAL;
                 source: "elm/radio";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -433,8 +257,7 @@ collections {
             part { name: "ext_elm_scroller";
                 type: EXTERNAL;
                 source: "elm/scroller";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -443,8 +266,7 @@ collections {
             part { name: "ext_elm_segment_control";
                 type: EXTERNAL;
                 source: "elm/segment_control";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -453,8 +275,7 @@ collections {
             part { name: "ext_elm_slider";
                 type: EXTERNAL;
                 source: "elm/slider";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         string: "label" "external slider";
                         double: "min" -1;
@@ -472,8 +293,7 @@ collections {
             part { name: "ext_elm_slideshow";
                 type: EXTERNAL;
                 source: "elm/slideshow";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -482,8 +302,7 @@ collections {
             part { name: "ext_elm_spinner";
                 type: EXTERNAL;
                 source: "elm/spinner";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -492,8 +311,7 @@ collections {
             part { name: "ext_elm_thumb";
                 type: EXTERNAL;
                 source: "elm/thumb";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -502,8 +320,7 @@ collections {
             part { name: "ext_elm_toolbar";
                 type: EXTERNAL;
                 source: "elm/toolbar";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -512,8 +329,7 @@ collections {
             part { name: "ext_elm_video";
                 type: EXTERNAL;
                 source: "elm/video";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
@@ -522,38 +338,12 @@ collections {
             part { name: "ext_elm_web";
                 type: EXTERNAL;
                 source: "elm/web";
-                description { state: "default" 0.0;
-                    visible: 0;
+                description { state: "default";
                     params {
                         // TODO
                     }
                 }
             }
         }
-        programs {
-            program { name: "emit_back_message";
-                signal: "emit,message";
-                script {
-                    send_message(MSG_INT, 1, 33);
-                }
-            }
-            program { name: "prog1";
-                source: "edit_test";
-                signal: "mouse,down,1";
-                in: 1.1 2.2;
-                action: STATE_SET "state2" 0.1;
-                target: "edit_test";
-                target: "test_clip";
-                after: "prog2";
-                after: "prog3";
-                api: "p_api_name" "p_api_desc";
-            }
-            program { name: "prog2";
-            }
-            program { name: "prog3";
-            }
-            program { name: "prog4";
-            }
-        }
     }
 }
diff --git a/tests/elementary/theme.edj b/tests/elementary/theme.edj
new file mode 100644
index 0000000..1be0865
Binary files /dev/null and b/tests/elementary/theme.edj differ

-- 


Reply via email to