From 836cf5c9a0e2d33f205c3c353e1300ee1ad03b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 22 Nov 2013 11:57:00 +0100
Subject: Rebased onto 0.2.2

Some tests aren't passed, due to changes and UI (for example, log in dialog is no longer a menu item but an action bar item, and robotium can't find it).
---
 tests/AndroidManifest.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/AndroidManifest.xml

(limited to 'tests/AndroidManifest.xml')

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
new file mode 100644
index 00000000..3e0b3496
--- /dev/null
+++ b/tests/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="se.leap.bitmaskclient.test"
+	android:versionCode="1"
+	android:versionName="1.0" >
+	
+	
+	<uses-sdk android:minSdkVersion="16" />
+
+	<instrumentation
+		android:name="android.test.InstrumentationTestRunner"
+		android:targetPackage="se.leap.bitmaskclient" />
+
+	<application>
+		<uses-library android:name="android.test.runner" />
+	</application>
+</manifest>
-- 
cgit v1.2.3


From 6bf1c8ccbf83defb44e279ed4236e9538c3a09ba Mon Sep 17 00:00:00 2001
From: cyBerta <richy@cyborgsociety.org>
Date: Sat, 30 Nov 2013 00:51:18 +0100
Subject: minor changes for running tests

---
 tests/AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/AndroidManifest.xml')

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 3e0b3496..ec055dc3 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -5,8 +5,9 @@
 	android:versionName="1.0" >
 	
 	
-	<uses-sdk android:minSdkVersion="16" />
-
+	<uses-sdk android:minSdkVersion="14" />
+	<uses-permission android:name="android.permission.WRITE_SETTINGS" />
+	
 	<instrumentation
 		android:name="android.test.InstrumentationTestRunner"
 		android:targetPackage="se.leap.bitmaskclient" />
-- 
cgit v1.2.3