fix: sync tests (#4)

* refactor: sync tests

* refactor: use IntEnum instead of Enum

Author: dtopuzov

core/enums/app_type.py

@@ -1,10 +1,10 @@
 """
 Application type enum.
 """
-from aenum import Enum
+from aenum import IntEnum
 
 
-class AppType(Enum):
+class AppType(IntEnum):
     _init_ = 'value string'
 
     JS = 1, 'js'

core/enums/device_type.py

@@ -1,10 +1,10 @@
 """
 Device type enum.
 """
-from aenum import Enum
+from aenum import IntEnum
 
 
-class DeviceType(Enum):
+class DeviceType(IntEnum):
     _init_ = 'value string'
 
     EMU = 1, 'emulator'

core/enums/env.py

@@ -1,10 +1,10 @@
 """
 Environment type.
 """
-from aenum import Enum
+from aenum import IntEnum
 
 
-class EnvironmentType(Enum):
+class EnvironmentType(IntEnum):
     _init_ = 'value string'
 
     NEXT = 1, 'next'

core/enums/os_type.py

@@ -1,10 +1,10 @@
 """
 Host OS enum.
 """
-from aenum import Enum
+from aenum import IntEnum
 
 
-class OSType(Enum):
+class OSType(IntEnum):
     _init_ = 'value string'
 
     WINDOWS = 1, 'Windows'

core/enums/platform_type.py

@@ -1,10 +1,10 @@
 """
 {N} Platform Type.
 """
-from aenum import Enum
+from aenum import IntEnum
 
 
-class Platform(Enum):
+class Platform(IntEnum):
     _init_ = 'value string'
 
     ANDROID = 1, 'android'

core/enums/styling_type.py

@@ -1,10 +1,10 @@
 """
 Styling type enum.
 """
-from aenum import Enum
+from aenum import IntEnum
 
 
-class StylingType(Enum):
+class StylingType(IntEnum):
     _init_ = 'value string'
 
     CSS = 1, 'css'

core_tests/utils/app.android.scss

@@ -0,0 +1 @@
+// Import app variables@import 'app-variables';// Import the theme’s main ruleset - both index and platform specific.@import '~nativescript-theme-core/scss/index';@import '~nativescript-theme-core/scss/platforms/index.android';// Import common styles@import 'app-common';// Place any CSS rules you want to apply only on Android here.action-item {    padding-right: 10;}

core_tests/utils/file_tests.py

@@ -0,0 +1,39 @@
+import os
+import unittest
+
+from settings import Settings
+from utils.file_utils import File
+
+
+# noinspection PyMethodMayBeStatic
+class FileUtilsTests(unittest.TestCase):
+
+    def test_01_replace(self):
+        # Path to files
+        base_path = os.path.join(Settings.TEST_RUN_HOME, 'core_tests', 'utils')
+        old_scss = os.path.join(base_path, 'app.android.scss')
+        new_scss = os.path.join(base_path, 'app.android.add_style.scss')
+        old_value = 'Android here'
+        new_value = 'Android here\n.page { background-color: red;}'
+
+        # Create new file (so we don't break original one).
+        File.copy(src=old_scss, target=new_scss)
+        assert len(File.read(path=new_scss).split('\n')) == 14, 'Unexpected lines count.'
+
+        # Replace
+        File.replace(path=new_scss, old_string=old_value, new_string=new_value)
+        content = File.read(path=new_scss)
+        assert 'red;' in content, 'Failed to replace string.'
+        assert len(content.split('\n')) == 15, 'Unexpected lines count.'
+
+        # Revert
+        File.replace(path=new_scss, old_string=new_value, new_string=old_value)
+        content = File.read(path=new_scss)
+        assert 'red;' not in content, 'Failed to replace string.'
+        assert len(content.split('\n')) == 14, 'Unexpected lines count.'
+
+        File.clean(path=new_scss)
+
+
+if __name__ == '__main__':
+    unittest.main()

core_tests/utils/process_tests.py

@@ -11,16 +11,16 @@ def test_30_kill_by_port(self):
         port = 4210
         self.start_server(port=port)
         time.sleep(0.5)
-        running = Process.is_running_by_commandline(commandline='SimpleHTTPServer')
+        running = Process.is_running_by_commandline(commandline='http.server')
         assert running, 'Failed to start simple http server.'
         Process.kill_by_port(port=port)
         time.sleep(0.5)
-        running = Process.is_running_by_commandline(commandline='SimpleHTTPServer')
+        running = Process.is_running_by_commandline(commandline='http.server')
         assert not running, 'Kill by port failed to kill process.'
 
     @staticmethod
     def start_server(port):
-        run(cmd='python -m SimpleHTTPServer ' + str(port), wait=False)
+        run(cmd='python -m http.server ' + str(port), wait=False)
 
 
 if __name__ == '__main__':

data/changes.py

@@ -1,15 +1,20 @@
 import os
 
+from const import Colors
 from core.settings import Settings
 from core.utils.file_utils import File
 
 
 # noinspection PyShadowingBuiltins
 class ChangeSet(object):
-    def __init__(self, file, old_value, new_value):
+    def __init__(self, file, old_value, new_value, old_text=None, new_text=None, old_color=None, new_color=None):
         self.file = file
         self.old_value = old_value
         self.new_value = new_value
+        self.old_text = old_text
+        self.new_text = new_text
+        self.old_color = old_color
+        self.new_color = new_color
 
 
 class Sync(object):
@@ -26,34 +31,84 @@ def revert(app_name, change_set):
 
 class Changes(object):
     class JSHelloWord(object):
-        JS = ChangeSet(file=os.path.join('app', 'main-view-model.js'), old_value='taps left', new_value='clicks left')
-        CSS = ChangeSet(file=os.path.join('app', 'app.css'), old_value='font-size: 18', new_value='font-size: 50')
-        XML = ChangeSet(file=os.path.join('app', 'main-page.xml'), old_value='TAP', new_value='HIT')
+        JS = ChangeSet(file=os.path.join('app', 'main-view-model.js'),
+                       old_value='taps left', new_value='clicks left',
+                       old_text='taps left', new_text='clicks left')
+        CSS = ChangeSet(file=os.path.join('app', 'app.css'),
+                        old_value='font-size: 18', new_value='font-size: 50',
+                        old_color=None, new_color=None)
+        XML = ChangeSet(file=os.path.join('app', 'main-page.xml'),
+                        old_value='TAP', new_value='HIT',
+                        old_text='TAP', new_text='HIT')
 
     class TSHelloWord(object):
-        TS = ChangeSet(file=os.path.join('app', 'main-view-model.ts'), old_value='taps left', new_value='clicks left')
-        CSS = ChangeSet(file=os.path.join('app', 'app.css'), old_value='font-size: 18', new_value='font-size: 50')
-        XML = ChangeSet(file=os.path.join('app', 'main-page.xml'), old_value='TAP', new_value='HIT')
+        TS = ChangeSet(file=os.path.join('app', 'main-view-model.ts'),
+                       old_value='taps left', new_value='clicks left',
+                       old_text='taps left', new_text='clicks left')
+        CSS = ChangeSet(file=os.path.join('app', 'app.css'),
+                        old_value='font-size: 18', new_value='font-size: 50',
+                        old_color=None, new_color=None)
+        XML = ChangeSet(file=os.path.join('app', 'main-page.xml'),
+                        old_value='TAP', new_value='HIT',
+                        old_text='TAP', new_text='HIT')
 
     class NGHelloWorld(object):
-        TS = ChangeSet(file=os.path.join('src', 'app', 'item', 'item.service.ts'), old_value='Ter Stegen',
-                       new_value='Unknown')
-        CSS = ChangeSet(file=os.path.join('src', 'app.css'), old_value='light', new_value='dark')
-        HTML = ChangeSet(file=os.path.join('src', 'app', 'item', 'items.component.html'), old_value='"item.name"',
-                         new_value='"item.id"')
+        TS = ChangeSet(file=os.path.join('src', 'app', 'item', 'item.service.ts'),
+                       old_value='Ter Stegen', new_value='Unknown',
+                       old_text='Ter Stegen', new_text='Unknown')
+        CSS = ChangeSet(file=os.path.join('src', 'app.css'),
+                        old_value='light', new_value='dark',
+                        old_color=Colors.WHITE, new_color=Colors.DARK)
+        HTML = ChangeSet(file=os.path.join('src', 'app', 'item', 'items.component.html'),
+                         old_value='"item.name"', new_value='"item.id"',
+                         old_text=None, new_text=None)
 
     class MasterDetailNG(object):
         TS = ChangeSet(file=os.path.join('src', 'app', 'cars', 'shared', 'car.model.ts'),
-                       old_value='this._name = options.name;',
-                       new_value='this._name = "SyncTSTest";')
-        CSS = ChangeSet(file=os.path.join('src', 'app.css'), old_value='light', new_value='dark')
-        HTML = ChangeSet(file=os.path.join('src', 'app', 'cars', 'shared', 'car-list.component.html'),
-                         old_value='Browse',
-                         new_value='Best Car Ever!')
+                       old_value='options.name;', new_value='"SyncTSTest";',
+                       old_text='BMW 5 Series', new_text='SyncTSTest')
+        HTML = ChangeSet(file=os.path.join('src', 'app', 'cars', 'car-list.component.html'),
+                         old_value='Browse', new_value='Best Car Ever!',
+                         old_text='Browse', new_text='Best Car Ever!')
+
+        # This change should make title of cars pink
+        SCSS_ROOT_COMMON = ChangeSet(file=os.path.join('src', '_app-common.scss'),
+                                     old_value='$accent-dark;', new_value='pink;',
+                                     old_color=Colors.ACCENT_DARK, new_color=Colors.PINK)
+
+        # This change should add some red between list view items on home page
+        SCSS_ROOT_ANDROID = ChangeSet(file=os.path.join('src', 'app.android.scss'),
+                                      old_value='Android here',
+                                      new_value='Android here\n.page { background-color: red;}\n',
+                                      old_color=Colors.WHITE, new_color=Colors.RED_DARK)
+        SCSS_ROOT_IOS = ChangeSet(file=os.path.join('src', 'app.ios.scss'),
+                                  old_value='iOS here',
+                                  new_value='iOS here\n.page { background-color: red;}\n',
+                                  old_color=Colors.WHITE, new_color=Colors.RED_DARK)
+
+        # This change should make background of items on home page purple
+        SCSS_NESTED_COMMON = ChangeSet(file=os.path.join('src', 'app', 'cars', '_car-list.component.scss'),
+                                       old_value='$background-light;', new_value='purple;',
+                                       old_color=Colors.WHITE, new_color=Colors.PURPLE)
+
+        # This change should make icons on home page yellow
+        SCSS_NESTED_ANDROID = ChangeSet(file=os.path.join('src', 'app', 'cars', 'car-list.component.android.scss'),
+                                        old_value='Android here',
+                                        new_value='Android here\n.list-group{.list-group-item{.fa{color:yellow;}}}\n',
+                                        old_color=None, new_color=Colors.YELLOW)
+
+        SCSS_NESTED_IOS = ChangeSet(file=os.path.join('src', 'app', 'cars', 'car-list.component.ios.scss'),
+                                    old_value='iOS here',
+                                    new_value='iOS here\n.list-group{.list-group-item{.fa{color:yellow;}}}\n',
+                                    old_color=None, new_color=Colors.YELLOW)
 
     class SharedHelloWorld(object):
-        TS = ChangeSet(file=os.path.join('src', 'app', 'item', 'item.service.ts'), old_value='Ter Stegen',
-                       new_value='Unknown')
-        CSS = ChangeSet(file=os.path.join('src', 'app', 'app.css'), old_value='light', new_value='dark')
-        HTML = ChangeSet(file=os.path.join('src', 'app', 'item', 'items.component.html'), old_value='"item.name"',
-                         new_value='"item.id"')
+        TS = ChangeSet(file=os.path.join('src', 'app', 'item', 'item.service.ts'),
+                       old_value='Ter Stegen', new_value='Unknown',
+                       old_text='Ter Stegen', new_text='Unknown')
+        CSS = ChangeSet(file=os.path.join('src', 'app', 'app.css'),
+                        old_value='light', new_value='dark',
+                        old_color=None, new_color=None)
+        HTML = ChangeSet(file=os.path.join('src', 'app', 'item', 'items.component.html'),
+                         old_value='"item.name"', new_value='"item.id"',
+                         old_text=None, new_text=None)

data/const.py

@@ -2,6 +2,18 @@
 
 
 class Colors(object):
+    """
+    Notes: OpenCV color order is:
+    0 - blue
+    1 - green
+    2 - red
+    """
     WHITE = numpy.array([255, 255, 255])  # White color
     DARK = numpy.array([48, 48, 48])  # Dark of default theme (on NG hello-world app).
-    LIGHT_BLUE = numpy.array([255, 188, 48])  # Blue of TAP button on hello-world app
+    LIGHT_BLUE = numpy.array([255, 188, 48])  # Blue of TAP button on hello-world app.
+    ACCENT_DARK = numpy.array([255, 83, 58])  # Dark blue in pro templates.
+    PINK = numpy.array([203, 192, 255])  # Pink (standard CSS color).
+    RED = numpy.array([0, 0, 255])  # Red (standard CSS color).
+    RED_DARK = numpy.array([5, 4, 229])  # A bit custom red (happens when apply red on master-detail template).
+    PURPLE = numpy.array([128, 0, 128])  # Purple (standard CSS color).
+    YELLOW = numpy.array([0, 255, 255])  # Yellow (standard CSS color).