From 62970cce306fdc7f885587d7397a0e825b6aee16 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Oct 2019 10:22:21 -0300
Subject: [PATCH] [android] add instrumentation test for image compression

---
 .../assets/blue-500x500.png                   | Bin 0 -> 4426 bytes
 .../assets/green-1000x2000.png                | Bin 0 -> 17403 bytes
 .../assets/red-100x100.png                    | Bin 0 -> 755 bytes
 .../AttachmentCreationTaskTest.java           |  67 ++++++++++++++++++
 .../attachment/AttachmentCreationTask.java    |   4 +-
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 briar-android/src/androidTestOfficial/assets/blue-500x500.png
 create mode 100644 briar-android/src/androidTestOfficial/assets/green-1000x2000.png
 create mode 100644 briar-android/src/androidTestOfficial/assets/red-100x100.png
 create mode 100644 briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentCreationTaskTest.java

diff --git a/briar-android/src/androidTestOfficial/assets/blue-500x500.png b/briar-android/src/androidTestOfficial/assets/blue-500x500.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7c8cd88fd3f332f2bd82e266f75a767fef8bb66
GIT binary patch
literal 4426
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

literal 0
HcmV?d00001

diff --git a/briar-android/src/androidTestOfficial/assets/green-1000x2000.png b/briar-android/src/androidTestOfficial/assets/green-1000x2000.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8127e34603283aab653632dea0d3250bc39c3ea
GIT binary patch
literal 17403
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
E3+t@NoB#j-

literal 0
HcmV?d00001

diff --git a/briar-android/src/androidTestOfficial/assets/red-100x100.png b/briar-android/src/androidTestOfficial/assets/red-100x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f57e3a1b33d42cca87e81549cf2f1b7bc81dc0fb
GIT binary patch
literal 755
zcmeAS@N?(olHy`uVBq!ia0vp^DIhGs1SHoB+;ad@Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e6j)3^*gc-vNrS
zmw5WRvOi|y5fEc%_u!hqz`*$3)5S5Q;?~<c2fNM|N*pVEU$X4tl9X9Onw>c}G=j}^
zbaQlevfk;BPRLA7Jn7cE$x!;NifWLsrtgw-J<%IJe7Sb}c`@t#qx+x#Efrhd*VlKj
zKKwNMT~42n`g^7727!O~-JE;CrS!uR>&DJk&sV-<QH#=%F9S-{{=Ng0*jm3GB=Nc%
zD6vXke7Eq76OZS1{Q9vPC@R)2*4=Qc_A*e}*E*1Z&ArYQbH4&rZi;ZZa+@D$$&=@7
zN^_i)UVYsO6+JBv68-4c6711(ROwKXVBq=iT|h&V1Row&I`nuhN4Kks?cFzi2}<3r
zE&Saa{pCtJVuE7bKyeUv`2-LHtTAz8$A$=(9~(LfxH=<r<bi&f2o#s@=8zW?^izat
zfvNnEDELrB2%;rIN9onQx^gCA%T^bQRu>=_XhUf_C>VhHU|L=7T7g8wx;u7#TnX_T
z(4rOD;t<ychVua#8HF$UuXC(8eH#>>)7O;)-EiDmu=HOA(DX>4HD}_0jH@rf(zDM4
zHLNf@2Mk-VqDR#rxnF-l0lPIEWWefhVDPR8lPgze__KKbio81J`GvC&08@o(iEBhj
zN@7W>RdP`(kYX@0FtpS)Fw-?O3NbXZGBUC<FxNIPv@$RVUGS{|MMG|WN@iLmZVf7b
R{Xi*^!PC{xWt~$(69A4=D#ri-

literal 0
HcmV?d00001

diff --git a/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentCreationTaskTest.java b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentCreationTaskTest.java
new file mode 100644
index 000000000..943644f7c
--- /dev/null
+++ b/briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentCreationTaskTest.java
@@ -0,0 +1,67 @@
+package org.briarproject.briar.android.attachment;
+
+import android.content.res.AssetManager;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Logger;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static java.util.logging.Logger.getLogger;
+
+@RunWith(AndroidJUnit4.class)
+public class AttachmentCreationTaskTest {
+
+	private static Logger LOG =
+			getLogger(AttachmentCreationTaskTest.class.getName());
+
+	private final ImageHelper imageHelper = new ImageHelperImpl();
+	private final ImageSizeCalculator imageSizeCalculator =
+			new ImageSizeCalculator(imageHelper);
+	@SuppressWarnings("ConstantConditions")  // add real objects when needed
+	private final AttachmentCreationTask task = new AttachmentCreationTask(null,
+			getApplicationContext().getContentResolver(), null,
+			imageSizeCalculator, null, null, true);
+
+	@Test
+	public void testCompress() throws Exception {
+		InputStream is = getAssetInputStream("animated.gif");
+		task.compressImage(is, "image/gif");
+
+		is = getAssetInputStream("animated2.gif");
+		task.compressImage(is, "image/gif");
+
+		is = getAssetInputStream("blue-500x500.png");
+		task.compressImage(is, "image/png");
+
+		is = getAssetInputStream("error_high.jpg");
+		task.compressImage(is, "image/jpeg");
+
+		is = getAssetInputStream("error_large.gif");
+		task.compressImage(is, "image/gif");
+
+		is = getAssetInputStream("error_wide.jpg");
+		task.compressImage(is, "image/jpeg");
+
+		is = getAssetInputStream("green-1000x2000.png");
+		task.compressImage(is, "image/png");
+
+		is = getAssetInputStream("red-100x100.png");
+		task.compressImage(is, "image/png");
+	}
+
+	private InputStream getAssetInputStream(String name) throws IOException {
+		LOG.warning("getAssetInputStream: " + name);
+		// pm.getResourcesForApplication(packageName).getAssets() did not work
+		//noinspection deprecation
+		AssetManager assets = getContext().getAssets();
+		return assets.open(name);
+	}
+
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java
index cdeea6c5d..f4a46231d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import static android.graphics.Bitmap.CompressFormat.JPEG;
 import static android.graphics.BitmapFactory.decodeStream;
@@ -130,7 +131,8 @@ class AttachmentCreationTask {
 		return false;
 	}
 
-	private InputStream compressImage(InputStream is, String contentType)
+	@VisibleForTesting
+	InputStream compressImage(InputStream is, String contentType)
 			throws IOException {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		try {