Move unit test assets and remove old andorid test directory

45 files changed, 0 insertions, 81 deletions

diff --git a/sdl_android_tests/assets/json/AddCommand.json b/sdl_android/src/androidTest/assets/AddCommand.json
index c6567e966..c6567e966 100644
--- a/sdl_android_tests/assets/json/AddCommand.json
+++ b/sdl_android/src/androidTest/assets/AddCommand.json
diff --git a/sdl_android_tests/assets/json/AddSubMenu.json b/sdl_android/src/androidTest/assets/AddSubMenu.json
index 5d86c2615..5d86c2615 100644
--- a/sdl_android_tests/assets/json/AddSubMenu.json
+++ b/sdl_android/src/androidTest/assets/AddSubMenu.json
diff --git a/sdl_android_tests/assets/json/Alert.json b/sdl_android/src/androidTest/assets/Alert.json
index ab497110b..ab497110b 100644
--- a/sdl_android_tests/assets/json/Alert.json
+++ b/sdl_android/src/androidTest/assets/Alert.json
diff --git a/sdl_android_tests/assets/json/AlertManeuver.json b/sdl_android/src/androidTest/assets/AlertManeuver.json
index 4099f80b0..4099f80b0 100644
--- a/sdl_android_tests/assets/json/AlertManeuver.json
+++ b/sdl_android/src/androidTest/assets/AlertManeuver.json
diff --git a/sdl_android_tests/assets/json/ChangeRegistration.json b/sdl_android/src/androidTest/assets/ChangeRegistration.json
index ceb93ccd3..ceb93ccd3 100644
--- a/sdl_android_tests/assets/json/ChangeRegistration.json
+++ b/sdl_android/src/androidTest/assets/ChangeRegistration.json
diff --git a/sdl_android_tests/assets/json/CreateInteractionChoiceSet.json b/sdl_android/src/androidTest/assets/CreateInteractionChoiceSet.json
index 6f01500db..6f01500db 100644
--- a/sdl_android_tests/assets/json/CreateInteractionChoiceSet.json
+++ b/sdl_android/src/androidTest/assets/CreateInteractionChoiceSet.json
diff --git a/sdl_android_tests/assets/json/DeleteCommand.json b/sdl_android/src/androidTest/assets/DeleteCommand.json
index cba061a03..cba061a03 100644
--- a/sdl_android_tests/assets/json/DeleteCommand.json
+++ b/sdl_android/src/androidTest/assets/DeleteCommand.json
diff --git a/sdl_android_tests/assets/json/DeleteFile.json b/sdl_android/src/androidTest/assets/DeleteFile.json
index ed3ff0cdc..ed3ff0cdc 100644
--- a/sdl_android_tests/assets/json/DeleteFile.json
+++ b/sdl_android/src/androidTest/assets/DeleteFile.json
diff --git a/sdl_android_tests/assets/json/DeleteInteractionChoiceSet.json b/sdl_android/src/androidTest/assets/DeleteInteractionChoiceSet.json
index 40419f005..40419f005 100644
--- a/sdl_android_tests/assets/json/DeleteInteractionChoiceSet.json
+++ b/sdl_android/src/androidTest/assets/DeleteInteractionChoiceSet.json
diff --git a/sdl_android_tests/assets/json/DeleteSubMenu.json b/sdl_android/src/androidTest/assets/DeleteSubMenu.json
index d0619a1f6..d0619a1f6 100644
--- a/sdl_android_tests/assets/json/DeleteSubMenu.json
+++ b/sdl_android/src/androidTest/assets/DeleteSubMenu.json
diff --git a/sdl_android_tests/assets/json/DiagnosticMessage.json b/sdl_android/src/androidTest/assets/DiagnosticMessage.json
index ff5e4a92d..ff5e4a92d 100644
--- a/sdl_android_tests/assets/json/DiagnosticMessage.json
+++ b/sdl_android/src/androidTest/assets/DiagnosticMessage.json
diff --git a/sdl_android_tests/assets/json/EndAudioPassThru.json b/sdl_android/src/androidTest/assets/EndAudioPassThru.json
index ed6554bc3..ed6554bc3 100644
--- a/sdl_android_tests/assets/json/EndAudioPassThru.json
+++ b/sdl_android/src/androidTest/assets/EndAudioPassThru.json
diff --git a/sdl_android_tests/assets/json/GetDTCs.json b/sdl_android/src/androidTest/assets/GetDTCs.json
index 7a0f0e51d..7a0f0e51d 100644
--- a/sdl_android_tests/assets/json/GetDTCs.json
+++ b/sdl_android/src/androidTest/assets/GetDTCs.json
diff --git a/sdl_android_tests/assets/json/GetVehicleData.json b/sdl_android/src/androidTest/assets/GetVehicleData.json
index e27937718..e27937718 100644
--- a/sdl_android_tests/assets/json/GetVehicleData.json
+++ b/sdl_android/src/androidTest/assets/GetVehicleData.json
diff --git a/sdl_android_tests/assets/json/ListFiles.json b/sdl_android/src/androidTest/assets/ListFiles.json
index d34d64ff0..d34d64ff0 100644
--- a/sdl_android_tests/assets/json/ListFiles.json
+++ b/sdl_android/src/androidTest/assets/ListFiles.json
diff --git a/sdl_android_tests/assets/json/PerformAudioPassThru.json b/sdl_android/src/androidTest/assets/PerformAudioPassThru.json
index 60e88b694..60e88b694 100644
--- a/sdl_android_tests/assets/json/PerformAudioPassThru.json
+++ b/sdl_android/src/androidTest/assets/PerformAudioPassThru.json
diff --git a/sdl_android_tests/assets/json/PerformInteraction.json b/sdl_android/src/androidTest/assets/PerformInteraction.json
index 1096d9c4d..1096d9c4d 100644
--- a/sdl_android_tests/assets/json/PerformInteraction.json
+++ b/sdl_android/src/androidTest/assets/PerformInteraction.json
diff --git a/sdl_android_tests/assets/json/PutFile.json b/sdl_android/src/androidTest/assets/PutFile.json
index 1b14dc798..1b14dc798 100644
--- a/sdl_android_tests/assets/json/PutFile.json
+++ b/sdl_android/src/androidTest/assets/PutFile.json
diff --git a/sdl_android_tests/assets/json/ReadDID.json b/sdl_android/src/androidTest/assets/ReadDID.json
index 5cb3403fb..5cb3403fb 100644
--- a/sdl_android_tests/assets/json/ReadDID.json
+++ b/sdl_android/src/androidTest/assets/ReadDID.json
diff --git a/sdl_android_tests/assets/json/RegisterAppInterface.json b/sdl_android/src/androidTest/assets/RegisterAppInterface.json
index abb7611ae..abb7611ae 100644
--- a/sdl_android_tests/assets/json/RegisterAppInterface.json
+++ b/sdl_android/src/androidTest/assets/RegisterAppInterface.json
diff --git a/sdl_android_tests/assets/json/ResetGlobalProperties.json b/sdl_android/src/androidTest/assets/ResetGlobalProperties.json
index 02ff2ba26..02ff2ba26 100644
--- a/sdl_android_tests/assets/json/ResetGlobalProperties.json
+++ b/sdl_android/src/androidTest/assets/ResetGlobalProperties.json
diff --git a/sdl_android_tests/assets/json/ScrollableMessage.json b/sdl_android/src/androidTest/assets/ScrollableMessage.json
index f86dc188c..f86dc188c 100644
--- a/sdl_android_tests/assets/json/ScrollableMessage.json
+++ b/sdl_android/src/androidTest/assets/ScrollableMessage.json
diff --git a/sdl_android_tests/assets/json/SendLocation.json b/sdl_android/src/androidTest/assets/SendLocation.json
index c6553c59c..c6553c59c 100644
--- a/sdl_android_tests/assets/json/SendLocation.json
+++ b/sdl_android/src/androidTest/assets/SendLocation.json
diff --git a/sdl_android_tests/assets/json/SetAppIcon.json b/sdl_android/src/androidTest/assets/SetAppIcon.json
index 67f3b0b41..67f3b0b41 100644
--- a/sdl_android_tests/assets/json/SetAppIcon.json
+++ b/sdl_android/src/androidTest/assets/SetAppIcon.json
diff --git a/sdl_android_tests/assets/json/SetDisplayLayout.json b/sdl_android/src/androidTest/assets/SetDisplayLayout.json
index 3b80dfb36..3b80dfb36 100644
--- a/sdl_android_tests/assets/json/SetDisplayLayout.json
+++ b/sdl_android/src/androidTest/assets/SetDisplayLayout.json
diff --git a/sdl_android_tests/assets/json/SetGlobalProperties.json b/sdl_android/src/androidTest/assets/SetGlobalProperties.json
index 955d657a2..955d657a2 100644
--- a/sdl_android_tests/assets/json/SetGlobalProperties.json
+++ b/sdl_android/src/androidTest/assets/SetGlobalProperties.json
diff --git a/sdl_android_tests/assets/json/SetMediaClockTimer.json b/sdl_android/src/androidTest/assets/SetMediaClockTimer.json
index af1671200..af1671200 100644
--- a/sdl_android_tests/assets/json/SetMediaClockTimer.json
+++ b/sdl_android/src/androidTest/assets/SetMediaClockTimer.json
diff --git a/sdl_android_tests/assets/json/Show.json b/sdl_android/src/androidTest/assets/Show.json
index 97ef1f20f..97ef1f20f 100644
--- a/sdl_android_tests/assets/json/Show.json
+++ b/sdl_android/src/androidTest/assets/Show.json
diff --git a/sdl_android_tests/assets/json/ShowConstantTBT.json b/sdl_android/src/androidTest/assets/ShowConstantTBT.json
index 10e064992..10e064992 100644
--- a/sdl_android_tests/assets/json/ShowConstantTBT.json
+++ b/sdl_android/src/androidTest/assets/ShowConstantTBT.json
diff --git a/sdl_android_tests/assets/json/Slider.json b/sdl_android/src/androidTest/assets/Slider.json
index 4bd5761ed..4bd5761ed 100644
--- a/sdl_android_tests/assets/json/Slider.json
+++ b/sdl_android/src/androidTest/assets/Slider.json
diff --git a/sdl_android_tests/assets/json/Speak.json b/sdl_android/src/androidTest/assets/Speak.json
index 413535ac6..413535ac6 100644
--- a/sdl_android_tests/assets/json/Speak.json
+++ b/sdl_android/src/androidTest/assets/Speak.json
diff --git a/sdl_android_tests/assets/json/SubscribeButton.json b/sdl_android/src/androidTest/assets/SubscribeButton.json
index bfb660c7e..bfb660c7e 100644
--- a/sdl_android_tests/assets/json/SubscribeButton.json
+++ b/sdl_android/src/androidTest/assets/SubscribeButton.json
diff --git a/sdl_android_tests/assets/json/SubscribeVehicleData.json b/sdl_android/src/androidTest/assets/SubscribeVehicleData.json
index 977057cf1..977057cf1 100644
--- a/sdl_android_tests/assets/json/SubscribeVehicleData.json
+++ b/sdl_android/src/androidTest/assets/SubscribeVehicleData.json
diff --git a/sdl_android_tests/assets/json/SystemRequest.json b/sdl_android/src/androidTest/assets/SystemRequest.json
index 7768db7e4..7768db7e4 100644
--- a/sdl_android_tests/assets/json/SystemRequest.json
+++ b/sdl_android/src/androidTest/assets/SystemRequest.json
diff --git a/sdl_android_tests/assets/json/UnregisterAppInterface.json b/sdl_android/src/androidTest/assets/UnregisterAppInterface.json
index f9cc9f0de..f9cc9f0de 100644
--- a/sdl_android_tests/assets/json/UnregisterAppInterface.json
+++ b/sdl_android/src/androidTest/assets/UnregisterAppInterface.json
diff --git a/sdl_android_tests/assets/json/UnsubscribeButton.json b/sdl_android/src/androidTest/assets/UnsubscribeButton.json
index cb2164d94..cb2164d94 100644
--- a/sdl_android_tests/assets/json/UnsubscribeButton.json
+++ b/sdl_android/src/androidTest/assets/UnsubscribeButton.json
diff --git a/sdl_android_tests/assets/json/UnsubscribeVehicleData.json b/sdl_android/src/androidTest/assets/UnsubscribeVehicleData.json
index 24b41a0b9..24b41a0b9 100644
--- a/sdl_android_tests/assets/json/UnsubscribeVehicleData.json
+++ b/sdl_android/src/androidTest/assets/UnsubscribeVehicleData.json
diff --git a/sdl_android_tests/assets/json/UpdateTurnList.json b/sdl_android/src/androidTest/assets/UpdateTurnList.json
index 9cd449acd..9cd449acd 100644
--- a/sdl_android_tests/assets/json/UpdateTurnList.json
+++ b/sdl_android/src/androidTest/assets/UpdateTurnList.json
diff --git a/sdl_android_tests/.settings/org.eclipse.jdt.core.prefs b/sdl_android_tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca..000000000
--- a/sdl_android_tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/sdl_android_tests/AndroidManifest.xml b/sdl_android_tests/AndroidManifest.xml
deleted file mode 100644
index 87a9fc7c3..000000000
--- a/sdl_android_tests/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.smartdevicelink.test"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="8" />
- 	
- 	<uses-permission android:name="android.permission.BLUETOOTH" />
-    <!-- Required to pair Bluetooth devices -->
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- Required to check if WiFi is enabled -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.smartdevicelink.test" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
- <application
-        android:label="@string/app_name" >
-        <uses-library android:name="android.test.runner" />             
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/sdl_android_tests/libs/json.jar b/sdl_android_tests/libs/json.jar
deleted file mode 100644
index 450d445ef..000000000
--- a/sdl_android_tests/libs/json.jar
+++ /dev/null
diff --git a/sdl_android_tests/lint.xml b/sdl_android_tests/lint.xml
deleted file mode 100644
index ee0eead5b..000000000
--- a/sdl_android_tests/lint.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-</lint>
\ No newline at end of file
diff --git a/sdl_android_tests/proguard-project.txt b/sdl_android_tests/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/sdl_android_tests/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/sdl_android_tests/project.properties b/sdl_android_tests/project.properties
deleted file mode 100644
index f76c1b9a4..000000000
--- a/sdl_android_tests/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
-android.library.reference.1=../sdl_android_lib
diff --git a/sdl_android_tests/res/values/strings.xml b/sdl_android_tests/res/values/strings.xml
deleted file mode 100644
index f11d7a44d..000000000
--- a/sdl_android_tests/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">MultiplexingUnitTestTest</string>
-
-</resources>