Fix tests.

Author: Vasil Chimev

helpers/adb.py

@@ -18,7 +18,7 @@ def StopApplication(appId, deviceId):
 
 def IsRunning(appId, deviceId):
 
-    output = runAUT("adb -s " + deviceId + " shell ps | " + appId)
+    output = runAUT("adb -s " + deviceId + " shell ps | grep " + appId)
     if ("org.nativescript.TNSApp" in output):
         return True
     else:

helpers/device.py

@@ -77,7 +77,8 @@ def GetPhysicalDeviceId(platform):
     for line in lines:
         lline = line.lower()
         if (platform in lline) and (not ("emulator" in lline)):
-            deviceId = lline.split((platform),1)[1].replace(" ", "")
+            deviceId = lline.split((platform),1)[1].replace(" ", "") # deviceId = @030b206908e6c3c5@
+            deviceId = deviceId[3:-3] # devideId = 030b206908e6c3c5
             print deviceId
     return deviceId
 

tests/device_linux.py

@@ -25,18 +25,19 @@ def setUp(self):
 
     def tearDown(self):        
         pass
-    
-    def test_001_Device_ListApplications_And_Run_Android(self):          
+
+    def test_001_Device_ListApplications_And_Run_Android(self):
         deviceId = GetPhysicalDeviceId(platform="android");
-        if (deviceId is not None): 
+        if (deviceId is not None):
 
             # Deploy TNS_App on device
             CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)  
             output = runAUT(tnsPath + " deploy android --path TNS_App")
             assert ("Project successfully prepared" in output) 
             assert ("Project successfully built" in output)   
             assert ("Successfully deployed on device with identifier" in output)  
-            assert (deviceId in output)  
+            runAUT("echo " + deviceId)
+            assert (deviceId in output)
             sleep(10)
 
             # Verify list-applications command list org.nativescript.TNSApp
@@ -60,7 +61,7 @@ def test_001_Device_ListApplications_And_Run_Android(self):
         else:
             print "Prerequisites not met. This test requires at least one real android device."
             assert (False)             
- 
+
     def test_002_Device_Log_Android(self): 
         if (GetDeviceCount(platform="android") > 1): 
             output = runAUT(tnsPath + " device log")

tests/platform_linux.py

@@ -112,16 +112,11 @@ def test_200_Platform_List_InsideEmptyProject(self):
     def test_201_Platform_Add_Android_InsideProject(self):
         CreateProject(projName="TNS_App")
         currentDir = os.getcwd()
-        os.chdir(os.path.join(currentDir, "TNS_App"))        
+        os.chdir(os.path.join(currentDir, "TNS_App"))
         output = runAUT(os.path.join("..", tnsPath) + " platform add android")
         os.chdir(currentDir);
 
         assert("Copying template files..." in output)
-        
-        # Not valid for 1.3.0+
-        # assert("Updated project.properties" in output)
-        # assert("Updated local.properties" in output)
-        
         assert("Project successfully created" in output)
 
         if ('TESTRUN' in os.environ) and (not "SMOKE" in os.environ['TESTRUN']) and ("2" in os.environ['ANDROID_HOME']):

tests/plugins_linux.py

@@ -119,9 +119,9 @@ def test_401_PluginAdd_InvalidPlugin(self):
         output = runAUT(tnsPath + " plugin add wd --path TNS_App")
         assert ("wd is not a valid NativeScript plugin" in output)
         assert ("Verify that the plugin package.json file contains a nativescript key and try again" in output)
-        
+
     def test_403_PluginAdd_PluginNotSupportedOnSpecificPlatform(self):
-        CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)    
+        CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
         output = runAUT(tnsPath + " plugin add [email protected] --path TNS_App");
         assert ("tns-plugin is not supported for android" in output)
         assert ("Successfully installed plugin tns-plugin" in output)

tests/plugins_osx.py

@@ -168,12 +168,11 @@ def test_401_PluginAdd_InvalidPlugin(self):
         output = runAUT(tnsPath + " plugin add wd --path TNS_App")
         assert ("wd is not a valid NativeScript plugin" in output)
         assert ("Verify that the plugin package.json file contains a nativescript key and try again" in output)  
-              
+
     def test_403_PluginAdd_PluginNotSupportedOnSpecificPlatform(self):
-        CreateProjectAndAddPlatform(projName="TNS_App", platform="ios", frameworkPath=iosRuntimePath)   
+        CreateProjectAndAddPlatform(projName="TNS_App", platform="ios", frameworkPath=iosRuntimePath)
         PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")
-        
+
         output = runAUT(tnsPath + " plugin add [email protected] --path TNS_App")
-        assert ("Successfully prepared plugin tns-plugin for ios" in output)
         assert ("tns-plugin is not supported for android" in output)
-        assert ("Successfully installed plugin tns-plugin" in output)       
+        assert ("Successfully installed plugin tns-plugin" in output)