mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-17 12:19:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass empty arrays to toArray().

Browse Source
This commit is contained in:
Isira Seneviratne
2022-05-15 15:08:17 +05:30
committed by Hans-Christoph Steiner
parent 6e71dfa348
commit ebcc122ea5
7 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
View File

@@ -19,6 +19,10 @@
package org.fdroid.fdroid.installer;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import android.app.Instrumentation;
import android.net.Uri;
import android.os.Build;
@@ -26,6 +30,7 @@ import android.util.Log;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import org.fdroid.fdroid.AssetUtils;
import org.fdroid.fdroid.compat.FileCompatTest;
import org.fdroid.fdroid.data.Apk;
@@ -40,10 +45,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.TreeSet;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* This test checks the ApkVerifier by parsing a repo from permissionsRepo.xml
* and checking the listed permissions against the ones specified in apks' AndroidManifest,
@@ -110,14 +111,14 @@ public class ApkVerifierTest {
if (Build.VERSION.SDK_INT >= 23) {
permissionsList.add("android.permission.ACCESS_FINE_LOCATION");
}
apk.requestedPermissions = permissionsList.toArray(new String[permissionsList.size()]);
apk.requestedPermissions = permissionsList.toArray(new String[0]);
Uri uri = Uri.fromFile(minMaxApk);
ApkVerifier apkVerifier = new ApkVerifier(instrumentation.getContext(), uri, apk);
apkVerifier.verifyApk();
permissionsList.add("ADDITIONAL_PERMISSION");
apk.requestedPermissions = permissionsList.toArray(new String[permissionsList.size()]);
apk.requestedPermissions = permissionsList.toArray(new String[0]);
apkVerifier.verifyApk();
}
@@ -307,7 +308,7 @@ public class ApkVerifierTest {
+ Build.VERSION.SDK_INT + ")");
}
}
String[] expectedPermissions = expectedSet.toArray(new String[expectedSet.size()]);
String[] expectedPermissions = expectedSet.toArray(new String[0]);
assertTrue(ApkVerifier.requestedPermissionsEqual(expectedPermissions, apk.requestedPermissions));
String[] badPermissions = Arrays.copyOf(expectedPermissions, expectedPermissions.length + 1);
@@ -383,7 +384,7 @@ public class ApkVerifierTest {
+ Build.VERSION.SDK_INT + ")");
}
}
String[] expectedPermissions = expectedSet.toArray(new String[expectedSet.size()]);
String[] expectedPermissions = expectedSet.toArray(new String[0]);
assertTrue(ApkVerifier.requestedPermissionsEqual(expectedPermissions, apk.requestedPermissions));
expectedSet = new TreeSet<>(Arrays.asList(