From 55dfe7e39a75a126a3577f70d79f023fa29cbcb1 Mon Sep 17 00:00:00 2001 From: Erjan Gavalji Date: Thu, 29 Oct 2015 10:35:14 +0200 Subject: [PATCH] Remove redundant files. Update the doc with iOS instructions --- linux-runtestapp.sh | 70 -------------------------------------------- run.sh | 7 ----- running-tests.md | 4 +-- win-runtestsapp.sh | 71 --------------------------------------------- 4 files changed, 2 insertions(+), 150 deletions(-) delete mode 100755 linux-runtestapp.sh delete mode 100755 run.sh delete mode 100644 win-runtestsapp.sh diff --git a/linux-runtestapp.sh b/linux-runtestapp.sh deleted file mode 100755 index 52cfc274f..000000000 --- a/linux-runtestapp.sh +++ /dev/null @@ -1,70 +0,0 @@ -workingdir=__TESTSAPP__ -startdir=$(pwd) -rm -rd $workingdir -mkdir $workingdir -cd $workingdir - -#android create avd -t "android-21" -n Api21 -b "default/x86" - -#if [ 1 == 2 ] ; then - echo "------------------------------------------------" - echo "Killing the emulator..." - time pkill ".*emulator64-x86" && true - - echo "------------------------------------------------" - echo "Starting the emulator..." - #time emulator -avd Api19 -no-skin -no-audio & # -gpu on - time emulator -avd Api21 -qemu -m 2048 -enable-kvm & - #emulator -avd Api19 -no-skin -no-audio -no-window & - - echo "------------------------------------------------" - echo "Creating the app..." - time tns create TestsApp - cd TestsApp - - echo "------------------------------------------------" - echo "Removing the original template files..." - time rm app/*.* - - echo "------------------------------------------------" - echo "Copying the test app files..." - time cp -r ../../bin/dist/apps/tests/* ./app/ - - echo "------------------------------------------------" - echo "Adding the android platform..." - time tns platform add android #--frameworkPath=/Users/erjan/tns-android.tgz - - # #DO THE REPLACEMENTS IN THE Info.plist and AndroidManifest.xml -# cp /Users/erjan/work/spikes/__DEL__/AndroidManifest.xml platforms/android/src/main/ - - echo "------------------------------------------------" - echo "Building the application..." - time tns build android - - echo "------------------------------------------------" - echo "Killing the adb server..." - time adb kill-server - - echo "------------------------------------------------" - echo "Starting the adb server..." - time adb start-server - -#fi - -echo "------------------------------------------------" -echo "Uninstalling the app..." -time adb uninstall org.nativescript.TestsApp - -echo "------------------------------------------------" -echo "Installing the app..." -time adb install ./platforms/android/build/outputs/apk/TestsApp-debug.apk - -echo "------------------------------------------------" -echo "Starting the app..." -time adb shell am start -n org.nativescript.TestsApp/com.tns.NativeScriptActivity - -cd $startdir - -echo "------------------------------------------------" -echo "Waiting for the tests to finish executing..." -time ./expect.exp diff --git a/run.sh b/run.sh deleted file mode 100755 index 88e8b99e5..000000000 --- a/run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash - -#grunt testsapp --verbose --platform=Android --emuPId=".*emulator64-x86" --avd="Api19" --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-android.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz - -grunt testsapp --verbose --platform=iOS --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-ios.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz --avd="2ADF1A49-F09E-4D5F-A099-AD557ABFA91C" - - diff --git a/running-tests.md b/running-tests.md index 4cce032b6..1d3d4b8e4 100644 --- a/running-tests.md +++ b/running-tests.md @@ -42,8 +42,8 @@ to be tested. Defaults to the npm package, located in the current found, the globally installed `tns` gets called. - `emuPId`: The ID of the emulator process. This one is used to refresh the emulator process, as the emulator sometimes hangs. -- `avd`: The name of the Android Virtual Device to be started to run the -tests. +- `avd`: The name of the Android Virtual Device or the iOS simulator GUID +to be started to run the tests. - `logFilePath`: [Optional] The path to the file, which the test app run log will get saved to. Defaults to "./TestRunResult.txt". - `runtimePath`: [Optional] The path to a custom iOS or Android Runtime diff --git a/win-runtestsapp.sh b/win-runtestsapp.sh deleted file mode 100644 index 1e7a24ea8..000000000 --- a/win-runtestsapp.sh +++ /dev/null @@ -1,71 +0,0 @@ -workingdir=__TESTSAPP__ -startdir=$(pwd) -rm -rd $workingdir -mkdir $workingdir -cd $workingdir - -#android create avd -t "android-21" -n Api21 -b "default/x86" - -#if [ 1 == 2 ] ; then - echo "------------------------------------------------" - echo "Killing the emulator..." -# time pkill ".*emulator64-x86" && true - - echo "------------------------------------------------" - echo "Starting the emulator..." - #time emulator -avd Api19 -no-skin -no-audio & # -gpu on - time emulator -avd Api19 -no-audio & # -gpu on - #emulator -avd Api19 -no-skin -no-audio -no-window & - - echo "------------------------------------------------" - echo "Creating the app..." - time tns create TestsApp - cd TestsApp - - echo "------------------------------------------------" - echo "Removing the original template files..." - time rm app/*.* - - echo "------------------------------------------------" - echo "Copying the test app files..." - time cp -r ../../bin/dist/apps/tests/* ./app/ - - echo "------------------------------------------------" - echo "Adding the android platform..." - time tns platform add android #--frameworkPath=/Users/erjan/tns-android.tgz - - # #DO THE REPLACEMENTS IN THE Info.plist and AndroidManifest.xml - cp /Users/erjan/work/spikes/__DEL__/AndroidManifest.xml platforms/android/src/main/ - - echo "------------------------------------------------" - echo "Building the application..." - time tns build android - - echo "------------------------------------------------" - echo "Killing the adb server..." - time adb kill-server - - echo "------------------------------------------------" - echo "Starting the adb server..." - time adb start-server - -#fi - -echo "------------------------------------------------" -echo "Uninstalling the app..." -time adb uninstall org.nativescript.TestsApp - -echo "------------------------------------------------" -echo "Installing the app..." -time adb install ./platforms/android/build/outputs/apk/TestsApp-debug.apk - -echo "------------------------------------------------" -echo "Starting the app..." -time adb shell am start -n org.nativescript.TestsApp/com.tns.NativeScriptActivity - -cd $startdir - -echo "------------------------------------------------" -echo "Waiting for the tests to finish executing..." -adb logcat -