From 44411ab2247d85ed2e22527589fd557b96941be6 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 12 Dec 2019 10:33:33 +0000
Subject: [PATCH] Simplify code.

---
 .../AbstractAttachmentCreationTaskTest.java   | 12 ++------
 .../PngSuiteAttachmentCreationTaskTest.java   | 30 +++++++------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AbstractAttachmentCreationTaskTest.java b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AbstractAttachmentCreationTaskTest.java
index 7f2a9ca14..6b112fa55 100644
--- a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AbstractAttachmentCreationTaskTest.java
+++ b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AbstractAttachmentCreationTaskTest.java
@@ -28,19 +28,11 @@ abstract class AbstractAttachmentCreationTaskTest {
 
 	void testCompress(String filename, String contentType)
 			throws IOException {
-		InputStream is = getAssetInputStream(filename);
+		InputStream is = getAssetManager().open(filename);
 		task.compressImage(is, contentType);
 	}
 
-	private InputStream getAssetInputStream(String name) throws IOException {
-		return getAssetManager().open(name);
-	}
-
-	static String[] getAssetFiles(String path) throws IOException {
-		return getAssetManager().list(path);
-	}
-
-	private static AssetManager getAssetManager() {
+	static AssetManager getAssetManager() {
 		// pm.getResourcesForApplication(packageName).getAssets() did not work
 		//noinspection deprecation
 		return getContext().getAssets();
diff --git a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/PngSuiteAttachmentCreationTaskTest.java b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/PngSuiteAttachmentCreationTaskTest.java
index 86e86f780..9c63ec7a8 100644
--- a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/PngSuiteAttachmentCreationTaskTest.java
+++ b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/PngSuiteAttachmentCreationTaskTest.java
@@ -1,15 +1,14 @@
 package org.briarproject.briar.android.attachment;
 
-import org.briarproject.bramble.api.Pair;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
+import static java.util.Arrays.asList;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.junit.Assert.fail;
 
 @RunWith(Parameterized.class)
@@ -17,36 +16,27 @@ public class PngSuiteAttachmentCreationTaskTest
 		extends AbstractAttachmentCreationTaskTest {
 
 	@Parameters
-	public static Iterable<Pair<String, Boolean>> data() throws IOException {
-		List<Pair<String, Boolean>> data = new ArrayList<>();
-		for (String file : getAssetFiles("PngSuite")) {
-			if (file.endsWith(".png")) {
-				boolean shouldPass = !file.startsWith("x");
-				data.add(new Pair<>("PngSuite/" + file, shouldPass));
-			}
-		}
-		return data;
+	public static Iterable<String> data() throws IOException {
+		return asList(requireNonNull(getAssetManager().list("PngSuite")));
 	}
 
 	private final String filename;
-	private final boolean shouldPass;
 
-	public PngSuiteAttachmentCreationTaskTest(Pair<String, Boolean> data) {
-		filename = data.getFirst();
-		shouldPass = data.getSecond();
+	public PngSuiteAttachmentCreationTaskTest(String filename) {
+		this.filename = filename;
 	}
 
 	@Test
 	public void testPngSuiteCompress() throws Exception {
-		if (shouldPass) {
-			testCompress(filename, "image/png");
-		} else {
+		if (filename.startsWith("x")) {
 			try {
-				testCompress(filename, "image/png");
+				testCompress("PngSuite/" + filename, "image/png");
 				fail();
 			} catch (IOException expected) {
 				// Expected
 			}
+		} else {
+			testCompress("PngSuite/" + filename, "image/png");
 		}
 	}
 }