Keep overly strict linter happy
Test: bazel test ...
Test: gradlew test
Change-Id: I830b1ffe0e2dc76e173c4899d2355a6da230f80f
diff --git a/src/test/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReaderTest.java b/src/test/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReaderTest.java
index 4c4086b..97fcddf 100644
--- a/src/test/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReaderTest.java
+++ b/src/test/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReaderTest.java
@@ -19,7 +19,10 @@
import java.io.ByteArrayInputStream;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+@RunWith(JUnit4.class)
public class InputStreamBerDataValueReaderTest extends BerDataValueReaderTestBase {
@Override
diff --git a/src/test/java/com/android/apksig/internal/util/Resources.java b/src/test/java/com/android/apksig/internal/util/Resources.java
index eb43934..8a761ff 100644
--- a/src/test/java/com/android/apksig/internal/util/Resources.java
+++ b/src/test/java/com/android/apksig/internal/util/Resources.java
@@ -89,7 +89,24 @@
Class <?> cls, String resourceName, String keyAlgorithm)
throws IOException, InvalidKeySpecException, NoSuchAlgorithmException {
byte[] encoded = toByteArray(cls, resourceName);
- return KeyFactory.getInstance(keyAlgorithm)
- .generatePrivate(new PKCS8EncodedKeySpec(encoded));
+
+ // Keep overly strictly linter happy by limiting what JCA KeyFactory algorithms are used
+ // here
+ KeyFactory keyFactory;
+ switch (keyAlgorithm.toUpperCase(Locale.US)) {
+ case "RSA":
+ keyFactory = KeyFactory.getInstance("rsa");
+ break;
+ case "DSA":
+ keyFactory = KeyFactory.getInstance("dsa");
+ break;
+ case "EC":
+ keyFactory = KeyFactory.getInstance("ec");
+ break;
+ default:
+ throw new InvalidKeySpecException("Unsupported key algorithm: " + keyAlgorithm);
+ }
+
+ return keyFactory.generatePrivate(new PKCS8EncodedKeySpec(encoded));
}
}
diff --git a/src/test/java/com/android/apksig/util/DataSinkFromOutputStreamTest.java b/src/test/java/com/android/apksig/util/DataSinkFromOutputStreamTest.java
index 805a600..ecb9a70 100644
--- a/src/test/java/com/android/apksig/util/DataSinkFromOutputStreamTest.java
+++ b/src/test/java/com/android/apksig/util/DataSinkFromOutputStreamTest.java
@@ -20,10 +20,13 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Tests for the {@link DataSink} returned by {@link DataSinks#asDataSink(java.io.OutputStream)}.
*/
+@RunWith(JUnit4.class)
public class DataSinkFromOutputStreamTest extends DataSinkTestBase<OutputStreamDataSink> {
@Override
diff --git a/src/test/java/com/android/apksig/util/DataSinkFromRAFTest.java b/src/test/java/com/android/apksig/util/DataSinkFromRAFTest.java
index 43922fa..e4441df 100644
--- a/src/test/java/com/android/apksig/util/DataSinkFromRAFTest.java
+++ b/src/test/java/com/android/apksig/util/DataSinkFromRAFTest.java
@@ -16,17 +16,19 @@
package com.android.apksig.util;
+import com.android.apksig.internal.util.RandomAccessFileDataSink;
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-
-import com.android.apksig.internal.util.RandomAccessFileDataSink;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Tests for the {@link DataSink} returned by
* {@link DataSinks#asDataSink(java.io.RandomAccessFile)}.
*/
+@RunWith(JUnit4.class)
public class DataSinkFromRAFTest extends DataSinkTestBase<RandomAccessFileDataSink> {
@Override
diff --git a/src/test/java/com/android/apksig/util/DataSourceFromByteBufferTest.java b/src/test/java/com/android/apksig/util/DataSourceFromByteBufferTest.java
index 87382ed..83af814 100644
--- a/src/test/java/com/android/apksig/util/DataSourceFromByteBufferTest.java
+++ b/src/test/java/com/android/apksig/util/DataSourceFromByteBufferTest.java
@@ -20,10 +20,13 @@
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Tests for the {@link DataSource} returned by {@link DataSources#asDataSource(ByteBuffer)}.
*/
+@RunWith(JUnit4.class)
public class DataSourceFromByteBufferTest extends DataSourceTestBase {
@Test
diff --git a/src/test/java/com/android/apksig/util/DataSourceFromRAFChunkTest.java b/src/test/java/com/android/apksig/util/DataSourceFromRAFChunkTest.java
index ef5ce32..8116012 100644
--- a/src/test/java/com/android/apksig/util/DataSourceFromRAFChunkTest.java
+++ b/src/test/java/com/android/apksig/util/DataSourceFromRAFChunkTest.java
@@ -23,11 +23,14 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Tests for the {@link DataSource} returned by
* {@link DataSources#asDataSource(RandomAccessFile, long, long)}.
*/
+@RunWith(JUnit4.class)
public class DataSourceFromRAFChunkTest extends DataSourceTestBase {
@Test
diff --git a/src/test/java/com/android/apksig/util/DataSourceFromRAFTest.java b/src/test/java/com/android/apksig/util/DataSourceFromRAFTest.java
index c7c4970..36ef760 100644
--- a/src/test/java/com/android/apksig/util/DataSourceFromRAFTest.java
+++ b/src/test/java/com/android/apksig/util/DataSourceFromRAFTest.java
@@ -25,11 +25,14 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Tests for the {@link DataSource} returned by
* {@link DataSources#asDataSource(java.io.RandomAccessFile)}.
*/
+@RunWith(JUnit4.class)
public class DataSourceFromRAFTest extends DataSourceTestBase {
@Test
