Update livesync_simulator.py

NativeScript/nativescript-cli#1225

Author: Vasil Chimev

tests/livesync_simulator.py

@@ -9,7 +9,7 @@
 
 import shutil, time
 
-from helpers._os_lib import cleanup_folder, replace
+from helpers._os_lib import cleanup_folder, replace, remove
 from helpers._tns_lib import IOS_RUNTIME_SYMLINK_PATH, \
     create_project, platform_add, run, livesync, TNS_PATH
 from helpers.device import stop_emulators
@@ -98,6 +98,8 @@ def test_001_full_livesync_ios_simulator_xml_js_css_tns_files(self):
             "app/tns_modules/application/application-common.js")
         assert "require(\"globals\"); // test" in output
 
+
+    # Add new files
     def test_101_livesync_ios_simulator_watch_add_xml_file(self):
         shutil.copyfile("TNS_App/app/main-page.xml", "TNS_App/app/test/test.xml")
         self.wait_for_text_in_output("app/test/test.xml")
@@ -120,6 +122,8 @@ def test_103_livesync_ios_simulator_watch_add_css_file(self):
         output = cat_app_file_on_simulator("TNSApp", "app/test/test.css")
         assert "color: #284848;" in output
 
+
+    # Change in files
     def test_111_livesync_ios_simulator_watch_change_xml_file(self):
         replace("TNS_App/app/main-page.xml", "TEST", "WATCH")
         self.wait_for_text_in_output("app/main-page.xml")
@@ -142,101 +146,60 @@ def test_113_livesync_ios_simulator_watch_change_css_file(self):
         output = cat_app_file_on_simulator("TNSApp", "app/app.css")
         assert "color: green;" in output
 
-#     https://github.com/NativeScript/nativescript-cli/issues/1210
+
+#     # Delete files
 #     def test_121_livesync_ios_simulator_watch_delete_xml_file(self):
 #         remove("TNS_App/app/test/test.xml")
 #         self.wait_for_text_in_output("app/test/test.xml")
-#
+# 
 #         output = cat_app_file_on_simulator("TNSApp", "app/test/test.xml")
 #         assert "No such file or directory" in output
-#
+# 
 #     def test_122_livesync_ios_simulator_watch_delete_js_file(self):
 #         remove("TNS_App/app/test/test.js")
 #         self.wait_for_text_in_output("app/test/test.js")
 #         time.sleep(2)
-#
+# 
 #         output = cat_app_file_on_simulator("TNSApp", "app/test/test.js")
 #         assert "No such file or directory" in output
-#
+# 
 #     def test_123_livesync_ios_simulator_watch_delete_css_file(self):
 #         remove("TNS_App/app/test/test.css")
 #         self.wait_for_text_in_output("app/test/test.css")
-#
+# 
 #         output = cat_app_file_on_simulator("TNSApp", "app/test/test.css")
 #         assert "No such file or directory" in output
 
+
     def test_301_livesync_ios_simulator_before_run(self):
         self.terminate_watcher()
-        cleanup_folder('TNS_App')
+        cleanup_folder('appTest')
 
-        create_project(proj_name="TNS_App")
+        create_project(proj_name="appTest")
         platform_add(platform="ios", framework_path=IOS_RUNTIME_SYMLINK_PATH, \
-            path="TNS_App", symlink=True)
+            path="appTest", symlink=True)
 
         # replace
-        replace("TNS_App/app/main-page.xml", "TAP", "TEST")
-        replace("TNS_App/app/main-view-model.js", "taps", "clicks")
-        replace("TNS_App/app/app.css", "30", "20")
+        replace("appTest/app/main-page.xml", "TAP", "TEST")
+        replace("appTest/app/main-view-model.js", "taps", "clicks")
+        replace("appTest/app/app.css", "30", "20")
 
-        replace("TNS_App/node_modules/tns-core-modules/LICENSE", "2015", "9999")
+        replace("appTest/node_modules/tns-core-modules/LICENSE", "2015", "9999")
         replace(
-            "TNS_App/node_modules/tns-core-modules/application/application-common.js",
+            "appTest/node_modules/tns-core-modules/application/application-common.js",
             "(\"globals\");", "(\"globals\"); // test")
 
-        livesync(platform="ios", emulator=True, path="TNS_App")
+        livesync(platform="ios", emulator=True, path="appTest")
 
-        output = cat_app_file_on_simulator("TNSApp", "app/main-page.xml")
+        output = cat_app_file_on_simulator("appTest", "app/main-page.xml")
         assert "<Button text=\"TEST\" tap=\"{{ tapAction }}\" />" in output
-        output = cat_app_file_on_simulator("TNSApp", "app/main-view-model.js")
+        output = cat_app_file_on_simulator("appTest", "app/main-view-model.js")
         assert "this.set(\"message\", this.counter + \" clicks left\");" in output
-        output = cat_app_file_on_simulator("TNSApp", "app/app.css")
+        output = cat_app_file_on_simulator("appTest", "app/app.css")
         assert "font-size: 20;" in output
 
-        output = cat_app_file_on_simulator("TNSApp", "app/tns_modules/LICENSE")
+        output = cat_app_file_on_simulator("appTest", "app/tns_modules/LICENSE")
         assert "Copyright (c) 9999 Telerik AD" in output
-        output = cat_app_file_on_simulator("TNSApp", \
+        output = cat_app_file_on_simulator("appTest", \
             "app/tns_modules/application/application-common.js")
         assert "require(\"globals\"); // test" in output
-
-#     https://github.com/NativeScript/nativescript-cli/issues/1225
-#     def test_301_livesync_ios_simulator_before_run(self):
-#         print "~~~ Killing subprocess ..."
-#         self.process.terminate()
-#
-#         time.sleep(2)
-#         if psutil.pid_exists(self.process.pid):
-#             print "~~~ Forced killing subprocess ..."
-#             self.process.kill()
-#
-#         cleanup_folder('appTest')
-#         create_project(proj_name="appTest")
-#         platform_add(platform="ios", framework_path=IOS_RUNTIME_SYMLINK_PATH, \
-#             path="appTest", symlink=True)
-#         build(platform="ios", path="appTest")
-#
-#         # replace
-#         replace("appTest/app/main-page.xml", "TAP", "TEST")
-#         replace("appTest/app/main-view-model.js", "taps", "clicks")
-#         replace("appTest/app/app.css", "30", "20")
-#
-#         replace("appTest/node_modules/tns-core-modules/LICENSE", "2015", "9999")
-#         replace(
-#             "appTest/node_modules/tns-core-modules/application/application-common.js",
-#             "(\"globals\");", "(\"globals\"); // test")
-#
-#         livesync(platform="ios", emulator=True, path="appTest")
-#         self.wait_for_text_in_output("prepared")
-#         time.sleep(2)
-#
-#         output = cat_app_file_on_simulator("appTest", "app/main-page.xml")
-#         assert "<Button text=\"TEST\" tap=\"{{ tapAction }}\" />" in output
-#         output = cat_app_file_on_simulator("appTest", "app/main-view-model.js")
-#         assert "this.set(\"message\", this.counter + \" clicks left\");" in output
-#         output = cat_app_file_on_simulator("appTest", "app/app.css")
-#         assert "font-size: 20;" in output
-#
-#         output = cat_app_file_on_simulator("appTest", "app/tns_modules/LICENSE")
-#         assert "Copyright (c) 9999 Telerik AD" in output
-#         output = cat_app_file_on_simulator("appTest", \
-#             "app/tns_modules/application/application-common.js")
-#         assert "require(\"globals\"); // test" in output