Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Factorize UI tests for Android and use separate log files

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-28 14:44:10 +01:00
parent d1d72b7157
commit d6fd0204b4
3 changed files with 57 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -17,7 +17,7 @@ liblinphone-junit-report.xml
liblinphonetester_*.zip
libs
linphone-android.iml
linphone-junit-report.xml
linphone-junit-report*.xml
linphonetester_*.zip
lint.xml
local.properties

6
tests/Makefile
View file

@ -17,11 +17,9 @@ all: clean
$(ANT) debug install
run-basic-tests: all
$(ANT) test
adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml 2>/dev/null > linphone-junit-report.xml
$(ANT) test -Dtest.size=small
if [ ! -s linphone-junit-report.xml ]; then exit 1; fi
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 2>/dev/null > linphone-junit-report.xml
$(ANT) test -Dtest.size=large
if [ ! -s linphone-junit-report.xml ]; then exit 1; fi

12
tests/custom_rules.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="custom_rules">
<project name="linphone-tester">
<target name="test">
<property name="output.file" value="./tests.output" />
<!-- Possible values for test.size are small or large -->
<property name="test.size" value="small" />
<tstamp>
<format property="archive.name"
pattern="'linphonetester_'yyyyMMdd_HHmmss" />
<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" />
@ -20,7 +20,7 @@
<!-- 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}"/>
<arg value="adb shell am instrument -r -w -e size ${test.size} org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner | tee ${output.file}"/>
</exec>
<exec executable="bash" >
<arg value="-c" />
@ -28,7 +28,7 @@
</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"/>
<arg value="adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report-${test.size}.xml"/>
</exec>
<zip destfile="${archive.name}.zip">
<fileset dir="." includes="${archive.name}"/>