Fix unit tests

Skyscanner · May 21, 2023 · 49002a1 · 49002a1
1 parent 85bcd65
commit 49002a1
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 17 deletions.
diff --git a/config/coverage.gradle b/config/coverage.gradle
@@ -8,6 +8,9 @@ android {
             }
         }
     }
+    unitTestVariants.all {
+        it.mergedFlavor.manifestPlaceholders = ['appAuthRedirectScheme': 'net.openid.appauthdemo']
+    }
 }
 
 task jacocoTestReport(type: JacocoReport, dependsOn: "testDebugUnitTest") {

diff --git a/config/testdeps.gradle b/config/testdeps.gradle
@@ -1,9 +1,9 @@
 testImplementation 'junit:junit:4.13.2'
 testImplementation 'org.hamcrest:hamcrest:2.2'
 testImplementation 'org.mockito:mockito-core:3.10.0'
-testImplementation 'org.robolectric:robolectric:4.5.1'
+testImplementation 'org.robolectric:robolectric:4.9'
 testImplementation 'org.assertj:assertj-core:3.19.0'
-testImplementation 'androidx.test.ext:junit:1.1.3'
-testImplementation 'androidx.test.ext:truth:1.3.0'
+testImplementation 'androidx.test.ext:junit:1.1.5'
+testImplementation 'androidx.test.ext:truth:1.5.0'
 testImplementation 'com.google.truth:truth:1.1.3'
 testImplementation 'xmlpull:xmlpull:1.1.3.1'
diff --git a/library/javatests/AndroidManifest.xml b/library/javatests/AndroidManifest.xml
@@ -13,12 +13,11 @@
  * limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.openid.appauth">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
         <activity android:name=".RedirectUriReceiverActivity"
-            android:exported="true" tools:node="replace">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>

diff --git a/library/javatests/net/openid/appauth/browser/AnyBrowserMatcherTest.java b/library/javatests/net/openid/appauth/browser/AnyBrowserMatcherTest.java
@@ -16,7 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import net.openid.appauth.BuildConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;

diff --git a/library/javatests/net/openid/appauth/browser/BrowserAllowListTest.java b/library/javatests/net/openid/appauth/browser/BrowserAllowListTest.java
@@ -16,7 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import net.openid.appauth.BuildConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;

diff --git a/library/javatests/net/openid/appauth/browser/BrowserDenyListTest.java b/library/javatests/net/openid/appauth/browser/BrowserDenyListTest.java
@@ -16,7 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import net.openid.appauth.BuildConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;

diff --git a/library/javatests/net/openid/appauth/browser/CustomTabManagerTest.java b/library/javatests/net/openid/appauth/browser/CustomTabManagerTest.java
@@ -14,7 +14,6 @@
 import androidx.browser.customtabs.CustomTabsServiceConnection;
 import androidx.browser.customtabs.CustomTabsSession;
 import java.util.List;
-import net.openid.appauth.BuildConfig;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/library/javatests/net/openid/appauth/browser/DelimitedVersionTest.java b/library/javatests/net/openid/appauth/browser/DelimitedVersionTest.java
@@ -16,7 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import net.openid.appauth.BuildConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;

diff --git a/library/javatests/net/openid/appauth/browser/VersionRangeTest.java b/library/javatests/net/openid/appauth/browser/VersionRangeTest.java
@@ -16,7 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import net.openid.appauth.BuildConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;

diff --git a/library/javatests/net/openid/appauth/browser/VersionedBrowserMatcherTest.java b/library/javatests/net/openid/appauth/browser/VersionedBrowserMatcherTest.java
@@ -19,7 +19,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 
-import net.openid.appauth.BuildConfig;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/library/javatests/net/openid/appauth/internal/LoggerTest.java b/library/javatests/net/openid/appauth/internal/LoggerTest.java
@@ -23,7 +23,6 @@
 
 import android.util.Log;
 
-import net.openid.appauth.BuildConfig;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/library/javatests/net/openid/appauth/internal/UriUtilTest.java b/library/javatests/net/openid/appauth/internal/UriUtilTest.java
@@ -19,8 +19,6 @@
 import android.os.Bundle;
 import androidx.browser.customtabs.CustomTabsService;
 
-import net.openid.appauth.BuildConfig;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,7 +64,7 @@ public void testFormUrlEncode_withSpaceSeparatedValueForParameter() {
         parameters.put("test2", "value2 value3");
         String query = UriUtil.formUrlEncode(parameters);
 
-        assertThat(query.contains("value2+value3"));
+        assertThat(query).contains("value2+value3");
         mSanitizer.parseQuery(query);
         for (Map.Entry<String, String> param : parameters.entrySet()) {
             assertThat(mSanitizer.getValue(param.getKey())).isEqualTo(param.getValue());