From cbc3c99703928129152e91940a68518cde14d299 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 16 Dec 2014 10:49:56 +0100
Subject: [PATCH] Improved Android UI tests with zip logs and better verbosity

---
 liblinphone_tester/Makefile |  3 +-
 tests/Makefile              | 19 ++++-----
 tests/custom_rules.xml      | 78 ++++++++++++++++++++++++++-----------
 3 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index a5d66a92e..a20cfa92d 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -1,6 +1,5 @@
 all: 
-	ant debug
-	ant installd
+	ant debug install
 
 run-all-tests: all
 	ant test
diff --git a/tests/Makefile b/tests/Makefile
index 12b2c406c..70a0aeb4c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,20 +1,17 @@
 SDK_PATH=$(shell dirname `which android`)
 SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
 
-run-basic-tests:
+clean:
 	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
 	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone
 	$(SDK_PATH)/android update test-project --path . -m ../
-	ant debug
-	ant installd
-	adb shell am instrument -w -e size small org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner
-	adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report.xml
 
-run-all-tests:
-	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
-	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone
-	$(SDK_PATH)/android update test-project --path . -m ../     
-	ant debug     
-	ant installd
+all: clean
+	ant debug install
+
+run-basic-tests: all
+	ant test
+
+run-all-tests: all
 	adb shell am instrument -w -e size large org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner
 	adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report.xml
diff --git a/tests/custom_rules.xml b/tests/custom_rules.xml
index bce7e0d24..39d0d5358 100644
--- a/tests/custom_rules.xml
+++ b/tests/custom_rules.xml
@@ -1,26 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="custom_rules">
 	<target name="test">
-		<exec executable="adb" failonerror="true" outputproperty="tests.output">
-			<arg value="shell" />
-			<arg value="am" />
-			<arg value="instrument" />
-			<arg value="-w" />
-			<arg value="-e" />
-			<arg value="size" />
-			<arg value="small" />
-			<arg value="org.linphone.test/android.test.InstrumentationTestRunner" />
-		</exec>
-		<echo message="${tests.output}"/>
-		<fail message="Tests failed">
-			<condition>
-				<contains string="${tests.output}" substring="FAILURES" />
-			</condition>
-		</fail>
-		<fail message="Tests crashed">
-			<condition>
-				<contains string="${tests.output}" substring="INSTRUMENTATION_CODE:" />
-			</condition>
-		</fail>
-	</target>
+		<property name="output.file" value="./tests.output" />
+                <tstamp>
+                        <format property="archive.name"
+                        pattern="'linphonetester_'yyyyMMdd_HHmmss" />
+                </tstamp>
+                <echo>Adb log files are put in ${archive.name}.zip</echo>
+
+                <exec executable="adb" >
+                        <arg value="logcat" />
+                        <arg value="-c" />
+                </exec>
+                <exec executable="./adb-log-start.sh" >
+                        <arg value=" ${archive.name}" />
+                </exec>
+                <exec executable="bash">
+                        <arg value="-c"/>
+                        <!-- use 'tee' command to write in file AND on stdout.
+                        First is used below to check if tests failed or not while second
+                        is used to get output in real time -->
+                        <arg value="adb shell am instrument -r -w -e size small org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner | tee ${output.file}"/>
+                </exec>
+                <exec executable="bash" >
+                        <arg value="-c" />
+                        <arg value="kill `cat adb.pid`" />
+                </exec>
+                <exec executable="bash">
+                        <arg value="-c"/>
+                        <arg value="adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report.xml"/>
+                </exec>
+                <zip destfile="${archive.name}.zip">
+                        <fileset dir="." includes="${archive.name}"/>
+                </zip>
+                <fail message="Tests failed">
+                        <condition>
+                                        <resourcecontains resource="${output.file}" substring="FAILURES" />
+                        </condition>
+                </fail>
+                <condition property="has.crashed" >
+                                <resourcecontains resource="${output.file}" substring="Process crashed" />
+                </condition>
+
+		<antcall target="check-for-crash"/>
+                <delete file="${archive.name}"/>
+                <delete file="${output.file}"/>
+        </target>
+        <target name="check-for-crash" if="has.crashed">
+                <exec executable="bash" >
+                        <arg value="-c" />
+                        <arg value="tail -n 500 ${archive.name}" />
+                </exec>
+                <exec executable="bash" >
+                        <arg value="-c" />
+                        <arg value="cat ${archive.name} |ndk-stack -sym obj/local/`adb shell getprop ro.product.cpu.abi | tr -d '\r'`" />
+                </exec>
+                <fail message="Tests crashed"/>
+        </target>
 </project>