Skip to content

Commit 725fa62

Browse files
author
Antonis
committed
Fixed #669: Add actual Integration test cases to test RCConnection and RCDevice
1 parent 3eadd99 commit 725fa62

File tree

7 files changed

+849
-93
lines changed

7 files changed

+849
-93
lines changed

‎Examples/restcomm-olympus/app/app.iml‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -94,41 +94,56 @@
9494
</content>
9595
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
9696
<orderEntry type="sourceFolder" forTests="false" />
97-
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
97+
<orderEntry type="library" exported="" scope="TEST" name="rules-1.0.0" level="project" />
9898
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
9999
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
100100
<orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.7.1" level="project" />
101-
<orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
101+
<orderEntry type="library" exported="" name="transition-25.4.0" level="project" />
102102
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
103-
<orderEntry type="library" exported="" name="design-25.3.1" level="project" />
104-
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
103+
<orderEntry type="library" exported="" name="design-25.4.0" level="project" />
104+
<orderEntry type="library" exported="" name="support-core-ui-25.4.0" level="project" />
105105
<orderEntry type="library" exported="" scope="TEST" name="assertj-android-1.1.1" level="project" />
106106
<orderEntry type="library" exported="" scope="TEST" name="awaitility-3.0.0" level="project" />
107107
<orderEntry type="library" exported="" scope="TEST" name="httpclient-4.3.6" level="project" />
108108
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
109-
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
110-
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
109+
<orderEntry type="library" exported="" name="support-core-utils-25.4.0" level="project" />
110+
<orderEntry type="library" exported="" name="support-fragment-25.4.0" level="project" />
111+
<orderEntry type="library" exported="" scope="TEST" name="runner-1.0.0" level="project" />
111112
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
112113
<orderEntry type="library" exported="" scope="TEST" name="objenesis-2.5.1" level="project" />
113-
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
114-
<orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
115114
<orderEntry type="library" exported="" scope="TEST" name="uiautomator-v18-2.1.2" level="project" />
116115
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
117116
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
117+
<orderEntry type="library" exported="" scope="TEST" name="kxml2-2.3.0" level="project" />
118118
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
119-
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
120-
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-v4-25.4.0" level="project" />
120+
<orderEntry type="library" exported="" name="support-media-compat-25.4.0" level="project" />
121121
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
122122
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
123-
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
123+
<orderEntry type="library" exported="" name="recyclerview-v7-25.4.0" level="project" />
124124
<orderEntry type="library" exported="" name="testfairy-android-sdk-1.5.2" level="project" />
125+
<orderEntry type="library" exported="" name="support-annotations-25.4.0" level="project" />
126+
<orderEntry type="library" exported="" name="appcompat-v7-25.4.0" level="project" />
127+
<orderEntry type="library" exported="" name="support-vector-drawable-25.4.0" level="project" />
128+
<orderEntry type="library" exported="" scope="TEST" name="android-async-http-1.4.9" level="project" />
129+
<orderEntry type="library" exported="" name="support-compat-25.4.0" level="project" />
130+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.4.0" level="project" />
131+
<orderEntry type="library" exported="" name="libwebrtc-1.0.0-beta5-16765" level="project" />
132+
<orderEntry type="module" module-name="restcomm.android.sdk" exported="" />
133+
<orderEntry type="library" exported="" name="android-jain-sip-ri-1.2.293" level="project" />
134+
<orderEntry type="library" exported="" name="core-1.54.0.0" level="project" />
135+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
136+
<orderEntry type="library" exported="" name="prov-1.54.0.0" level="project" />
137+
<orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
138+
<orderEntry type="library" exported="" name="pkix-1.54.0.0" level="project" />
139+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
140+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
125141
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
126142
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
127143
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
128-
<orderEntry type="library" exported="" scope="TEST" name="android-async-http-1.4.9" level="project" />
129144
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
145+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
146+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
130147
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
131-
<orderEntry type="library" exported="" name="libwebrtc-1.0.0-beta5-16765" level="project" />
132-
<orderEntry type="module" module-name="restcomm.android.sdk" exported="" />
133148
</component>
134149
</module>

‎Examples/restcomm-olympus/app/build.gradle‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ buildscript {
77
// Only add repositories here that are used in *buildscript dependencies* NOT application dependencies. These go to the separate repositories block further down
88
mavenCentral()
99
maven { url 'https://www.testfairy.com/maven' }
10+
maven { url "https://maven.google.com" }
11+
1012

1113
}
1214

@@ -151,14 +153,18 @@ dependencies {
151153
compile project(':restcomm.android.sdk')
152154
// If you want to use latest released restcomm-android-sdk library, please uncomment this and comment previous line
153155
//compile 'org.restcomm:restcomm-android-sdk:1.0.3-BETA6-134'
154-
compile 'com.android.support:appcompat-v7:25.3.1'
155-
compile 'com.android.support:design:25.3.1'
156-
compile 'com.android.support:support-v4:25.3.1'
156+
compile 'com.android.support:appcompat-v7:25.4.0'
157+
compile 'com.android.support:design:25.4.0'
158+
compile 'com.android.support:support-v4:25.4.0'
157159
compile 'testfairy:testfairy-android-sdk:1.+@aar'
158160
//compile 'testfairy:testfairy-android-sdk:1.4.5'
159161
//compile 'net.hockeyapp.android:HockeySDK:4.1.1'
160162
////compile files('./libs/testfairy-android-sdk-1.4.6-unlimited-events.jar')
161163

164+
// AndroidJUnitRunner and JUnit Rules
165+
androidTestCompile 'com.android.support.test:runner:1.0.0'
166+
androidTestCompile 'com.android.support.test:rules:1.0.0'
167+
162168
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
163169
exclude group: 'com.android.support', module: 'support-annotations'
164170
}

0 commit comments

Comments
 (0)