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

Updated robotium to fix issue with android kitkat 4.4 + fix broken tests compilation due to latest liblinphone update

Browse source
This commit is contained in:
Sylvain Berfini 2014-01-24 15:55:58 +01:00
parent 510855f208
commit 230cb1fcd1
8 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -12,6 +12,7 @@ local.properties
project.properties project.properties
tests/*$py.class tests/*$py.class
tests/build.xml tests/build.xml
tests/project.properties
res/.DS_Store res/.DS_Store
bc-android.keystore bc-android.keystore
res/raw/lpconfig.xsd res/raw/lpconfig.xsd

8
tests/.classpath
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="lib" path="/home/viish/Work/linphone-android/tests/libs/robotium-solo-4.1.jar"> <classpathentry kind="lib" path="/home/viish/Work/android/linphone/tests/libs/robotium-solo-4.3.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:file:/home/viish/Work/linphone-android/tests/libs/robotium-solo-4.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:file:/home/viish/Work/android/linphone/tests/libs/robotium-solo-4.3.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/linphone-android-bellesip"/> <classpathentry combineaccessrules="false" kind="src" path="/linphone"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

BIN
tests/libs/robotium-solo-4.1-javadoc.jar
View file

Binary file not shown.

BIN
tests/libs/robotium-solo-4.1.jar
View file

Binary file not shown.

BIN
tests/libs/robotium-solo-4.3.1-javadoc.jar Normal file
View file

Binary file not shown.

BIN
tests/libs/robotium-solo-4.3.1.jar Normal file
View file

Binary file not shown.

14
tests/project.properties
View file

@ -1,14 +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-17

2
tests/src/org/linphone/test/LinphoneTestManager.java
View file

@ -79,7 +79,7 @@ public class LinphoneTestManager implements LinphoneCoreListener {
LinphoneCoreFactory.instance().setDebugMode(true, "LinphoneTester"); LinphoneCoreFactory.instance().setDebugMode(true, "LinphoneTester");
String basePath = mAContext.getFilesDir().getAbsolutePath(); String basePath = mAContext.getFilesDir().getAbsolutePath();
final LinphoneCore mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, basePath + "/.linphonerc" + id, null, null); final LinphoneCore mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, basePath + "/.linphonerc" + id, null, null, c);
if (id == 2) { if (id == 2) {
mLc2 = mLc; mLc2 = mLc;
} else { } else {