davemds pushed a commit to branch master.

commit 2daa751915084173ec6f108d29e732c2b0ed2015
Author: davemds <[email protected]>
Date:   Wed Mar 27 21:58:59 2013 +0100

    Python-EFL: Fix edje-external unittest
    
    was broken due to recent elm include changes
---
 tests/edje/test_03_external.py | 118 +++++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 40 deletions(-)

diff --git a/tests/edje/test_03_external.py b/tests/edje/test_03_external.py
index 41ba128..6b2a5c5 100644
--- a/tests/edje/test_03_external.py
+++ b/tests/edje/test_03_external.py
@@ -1,10 +1,48 @@
 #!/usr/bin/env python
 
+import os, unittest
+
 from efl import evas
 from efl import ecore
 from efl import edje
-from efl import elementary
-import os, unittest
+
+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
+
 
 
 theme_file = os.path.join(os.path.dirname(__file__), "theme.edj")
@@ -24,7 +62,7 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalActionslider(self):
         elm_as = self.theme.part_external_object_get("ext_elm_actionslider")
-        self.assertIsInstance(elm_as, elementary.Actionslider)
+        self.assertIsInstance(elm_as, Actionslider)
 
         # check values setted in edc (from external)
         
self.assertEqual(self.theme.part_external_param_get("ext_elm_actionslider", 
"label"), "ActionSlideR")
@@ -41,37 +79,37 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalBackground(self):
         elm_bg = self.theme.part_external_object_get("ext_elm_bg")
-        self.assertIsInstance(elm_bg, elementary.Background)
+        self.assertIsInstance(elm_bg, Background)
 
         # TODO test params
 
     def testExternalBubble(self):
         elm_bg = self.theme.part_external_object_get("ext_elm_bubble")
-        self.assertIsInstance(elm_bg, elementary.Bubble)
+        self.assertIsInstance(elm_bg, Bubble)
 
         # TODO test params
 
     def testExternalButton(self):
         elm_button = self.theme.part_external_object_get("ext_elm_button")
-        self.assertIsInstance(elm_button, elementary.Button)
+        self.assertIsInstance(elm_button, Button)
 
         # TODO test params
 
     def testExternalCalendar(self):
         elm_cal = self.theme.part_external_object_get("ext_elm_calendar")
-        self.assertIsInstance(elm_cal, elementary.Calendar)
+        self.assertIsInstance(elm_cal, Calendar)
 
         # TODO test params
 
     def testExternalCheck(self):
         elm_check = self.theme.part_external_object_get("ext_elm_check")
-        self.assertIsInstance(elm_check, elementary.Check)
+        self.assertIsInstance(elm_check, Check)
 
         # TODO test params
 
     def testExternalClock(self):
         elm_clock = self.theme.part_external_object_get("ext_elm_clock")
-        self.assertIsInstance(elm_clock, elementary.Clock)
+        self.assertIsInstance(elm_clock, Clock)
 
         # check values setted in edc (from external)
         self.assertEqual(self.theme.part_external_param_get("ext_elm_clock", 
"hours"), 23)
@@ -103,67 +141,67 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalEntry(self):
         elm_entry = self.theme.part_external_object_get("ext_elm_entry")
-        self.assertIsInstance(elm_entry, elementary.Entry)
+        self.assertIsInstance(elm_entry, Entry)
 
         # TODO test params
 
     def testExternalFileselector(self):
         elm_fs = self.theme.part_external_object_get("ext_elm_fileselector")
-        self.assertIsInstance(elm_fs, elementary.Fileselector)
+        self.assertIsInstance(elm_fs, 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, elementary.FileselectorButton)
+        self.assertIsInstance(elm_fs_btn, 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, elementary.FileselectorEntry)
+        self.assertIsInstance(elm_fs_en, FileselectorEntry)
 
         # TODO test params
 
     def testExternalFrame(self):
         elm_frame = self.theme.part_external_object_get("ext_elm_frame")
-        self.assertIsInstance(elm_frame, elementary.Frame)
+        self.assertIsInstance(elm_frame, Frame)
 
         # TODO test params
 
     def testExternalGengrid(self):
         elm_gg = self.theme.part_external_object_get("ext_elm_gengrid")
-        self.assertIsInstance(elm_gg, elementary.Gengrid)
+        self.assertIsInstance(elm_gg, Gengrid)
 
         # TODO test params
 
     def testExternalGenlist(self):
         elm_gl = self.theme.part_external_object_get("ext_elm_genlist")
-        self.assertIsInstance(elm_gl, elementary.Genlist)
+        self.assertIsInstance(elm_gl, Genlist)
 
         # TODO test params
 
     def testExternalHoversel(self):
         elm_hoversel = self.theme.part_external_object_get("ext_elm_hoversel")
-        self.assertIsInstance(elm_hoversel, elementary.Hoversel)
+        self.assertIsInstance(elm_hoversel, Hoversel)
 
         # TODO test params
 
     def testExternalIcon(self):
         elm_icon = self.theme.part_external_object_get("ext_elm_icon")
-        self.assertIsInstance(elm_icon, elementary.Icon)
+        self.assertIsInstance(elm_icon, Icon)
 
         # TODO test params
 
     def testExternalIndex(self):
         elm_index = self.theme.part_external_object_get("ext_elm_index")
-        self.assertIsInstance(elm_index, elementary.Index)
+        self.assertIsInstance(elm_index, Index)
 
         # TODO test params
 
     def testExternalLabel(self):
         elm_label = self.theme.part_external_object_get("ext_elm_label")
-        self.assertIsInstance(elm_label, elementary.Label)
+        self.assertIsInstance(elm_label, 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")
@@ -180,73 +218,73 @@ class TestElementaryExternal(unittest.TestCase):
 
     def testExternalList(self):
         elm_list = self.theme.part_external_object_get("ext_elm_list")
-        self.assertIsInstance(elm_list, elementary.List)
+        self.assertIsInstance(elm_list, List)
 
         # TODO test params
 
     def testExternalMap(self):
         elm_map = self.theme.part_external_object_get("ext_elm_map")
-        self.assertIsInstance(elm_map, elementary.Map)
+        self.assertIsInstance(elm_map, Map)
 
         # TODO test params
 
     def testExternalMultibuttonentry(self):
         elm_mbe = 
self.theme.part_external_object_get("ext_elm_multibuttonentry")
-        self.assertIsInstance(elm_mbe, elementary.MultiButtonEntry)
+        self.assertIsInstance(elm_mbe, MultiButtonEntry)
 
         # TODO test params
 
     def testExternalNaviframe(self):
         elm_nf = self.theme.part_external_object_get("ext_elm_naviframe")
-        self.assertIsInstance(elm_nf, elementary.Naviframe)
+        self.assertIsInstance(elm_nf, Naviframe)
 
         # TODO test params
 
     def testExternalNotify(self):
         elm_notify = self.theme.part_external_object_get("ext_elm_notify")
-        self.assertIsInstance(elm_notify, elementary.Notify)
+        self.assertIsInstance(elm_notify, Notify)
 
         # TODO test params
 
     def testExternalPanes(self):
         elm_panes = self.theme.part_external_object_get("ext_elm_panes")
-        self.assertIsInstance(elm_panes, elementary.Panes)
+        self.assertIsInstance(elm_panes, Panes)
 
         # TODO test params
 
     def testExternalPhotocam(self):
         elm_photocam = self.theme.part_external_object_get("ext_elm_photocam")
-        self.assertIsInstance(elm_photocam, elementary.Photocam)
+        self.assertIsInstance(elm_photocam, Photocam)
 
         # TODO test params
 
     def testExternalProgressbar(self):
         elm_pb = self.theme.part_external_object_get("ext_elm_progressbar")
-        self.assertIsInstance(elm_pb, elementary.Progressbar)
+        self.assertIsInstance(elm_pb, Progressbar)
 
         # TODO test params
 
     def testExternalRadio(self):
         elm_radio = self.theme.part_external_object_get("ext_elm_radio")
-        self.assertIsInstance(elm_radio, elementary.Radio)
+        self.assertIsInstance(elm_radio, Radio)
 
         # TODO test params
 
     def testExternalScroller(self):
         elm_scroller = self.theme.part_external_object_get("ext_elm_scroller")
-        self.assertIsInstance(elm_scroller, elementary.Scroller)
+        self.assertIsInstance(elm_scroller, Scroller)
 
         # TODO test params
 
     def testExternalSegmentControl(self):
         elm_sc = self.theme.part_external_object_get("ext_elm_segment_control")
-        self.assertIsInstance(elm_sc, elementary.SegmentControl)
+        self.assertIsInstance(elm_sc, SegmentControl)
 
         # TODO test params
 
     def testExternalSlider(self):
         elm_slider = self.theme.part_external_object_get("ext_elm_slider")
-        self.assertIsInstance(elm_slider, elementary.Slider)
+        self.assertIsInstance(elm_slider, Slider)
 
         # check values setted in edc (from external)
         self.assertEqual(self.theme.part_external_param_get("ext_elm_slider", 
"label"), "external slider")
@@ -268,7 +306,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, elementary.Icon)
+        self.assertIsInstance(elm_slider.icon, Icon)
 
         # do params set
         self.theme.part_external_param_set("ext_elm_slider", "label", "new 
text")
@@ -291,41 +329,41 @@ 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, elementary.Icon)
+        self.assertIsInstance(elm_slider.icon, Icon)
 
     def testExternalSlideshow(self):
         elm_ss = self.theme.part_external_object_get("ext_elm_slideshow")
-        self.assertIsInstance(elm_ss, elementary.Slideshow)
+        self.assertIsInstance(elm_ss, Slideshow)
 
         # TODO test params
 
     def testExternalSpinner(self):
         elm_spinner = self.theme.part_external_object_get("ext_elm_spinner")
-        self.assertIsInstance(elm_spinner, elementary.Spinner)
+        self.assertIsInstance(elm_spinner, Spinner)
 
         # TODO test params
 
     def testExternalThumb(self):
         elm_thumb = self.theme.part_external_object_get("ext_elm_thumb")
-        self.assertIsInstance(elm_thumb, elementary.Thumb)
+        self.assertIsInstance(elm_thumb, Thumb)
 
         # TODO test params
 
     def testExternalToolbar(self):
         elm_toolbar = self.theme.part_external_object_get("ext_elm_toolbar")
-        self.assertIsInstance(elm_toolbar, elementary.Toolbar)
+        self.assertIsInstance(elm_toolbar, Toolbar)
 
         # TODO test params
 
     def testExternalVideo(self):
         elm_video = self.theme.part_external_object_get("ext_elm_video")
-        self.assertIsInstance(elm_video, elementary.Video)
+        self.assertIsInstance(elm_video, Video)
 
         # TODO test params
 
     def testExternalWeb(self):
         elm_web = self.theme.part_external_object_get("ext_elm_web")
-        self.assertIsInstance(elm_web, elementary.Web)
+        self.assertIsInstance(elm_web, Web)
 
         # TODO test params
 

-- 

------------------------------------------------------------------------------
Own the Future-Intel&reg; Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game 
on Steam. $5K grand prize plus 10 genre and skill prizes. 
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d

Reply via email to