Host-based unit tests

build.gradle.kts

@@ -4,3 +4,24 @@ plugins {
     id("com.android.library") version "8.1.2" apply false
     id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false
 }
+
+val osName: String? = System.getProperty("os.name")
+val osArch: String? = System.getProperty("os.arch")
+when {
+    osName == "Linux" && osArch == "amd64" -> extra["hostRustTarget"] = "linux-x86-64"
+    // see https://github.com/openjdk/jdk/blob/master/src/java.base/macosx/native/libjava/java_props_macosx.c
+    osName == "Mac OS X" && osArch == "amd64" -> extra["hostRustTarget"] = "darwin-x86-64"
+    osName == "Mac OS X" && osArch == "aarch64" -> extra["hostRustTarget"] = "darwin-aarch64"
+    // see https://github.com/openjdk/jdk/blob/master/src/java.base/windows/native/libjava/java_props_md.c
+    osName != null && osName.startsWith("Windows") && osArch == "amd64" -> extra["hostRustTarget"] =
+        "win32-x86-64-msvc"
+
+    else -> throw GradleException("Unsupported host operating system and architecture")
+}
+extra["rustTargets"] = listOf(
+    "arm",
+    "arm64",
+    "x86",
+    "x86_64",
+    extra["hostRustTarget"]
+)

divviup/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace = "org.divviup.android"
-    compileSdk = 33
+    compileSdk = 34
 
     ndkVersion = "26.1.10909125"
 
@@ -30,23 +30,33 @@ android {
 
 dependencies {
     implementation("commons-io:commons-io:2.15.0")
+    testImplementation(project(":divviup:commontest"))
     testImplementation("junit:junit:4.13.2")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+    androidTestImplementation(project(":divviup:commontest"))
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
 }
 
+val rustTargets: List<String> by rootProject.extra
+val hostRustTarget: String by rootProject.extra
+
 cargo {
     module = "./rust"
     libname = "divviup_android"
-    targets = listOf("arm", "arm64", "x86", "x86_64")
-
+    targets = rustTargets
     profile = "release"
-
     pythonCommand = "python3"
 }
 
 tasks.matching { it.name.matches(Regex("merge.*JniLibFolders")) }.configureEach {
-    this.inputs.dir(File(buildDir, "rustJniLibs/android"))
-    this.dependsOn(tasks.named("cargoBuild"))
+    inputs.dir(File(buildDir, "rustJniLibs/android"))
+    dependsOn(tasks.named("cargoBuild"))
+}
+
+tasks.withType<Test>().matching { it.name.matches(Regex("test.*UnitTest"))}.configureEach {
+    systemProperty("java.library.path", "${buildDir}/rustJniLibs/desktop/${hostRustTarget}")
+    val capitalizedHostRustTarget = hostRustTarget.replaceFirstChar { it.uppercase() }
+    dependsOn(tasks.named("cargoBuild${capitalizedHostRustTarget}"))
 }

divviup/commontest/.gitignore

@@ -0,0 +1 @@
+/build

divviup/commontest/build.gradle.kts

@@ -0,0 +1,33 @@
+plugins {
+    id("com.android.library")
+}
+
+android {
+    namespace = "org.divviup.commontest"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 21
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+}

divviup/commontest/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

divviup/commontest/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

divviup/commontest/src/main/java/org/divviup/commontest/MockAggregator.java

@@ -0,0 +1,39 @@
+package org.divviup.commontest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okio.Buffer;
+
+public class MockAggregator {
+    private static Buffer loadHpkeConfigList() throws IOException {
+        Buffer hpkeConfigListBuffer;
+        ClassLoader classLoader = Objects.requireNonNull(MockAggregator.class.getClassLoader());
+        try (InputStream is = classLoader.getResourceAsStream("hpke_config_list.bin")) {
+            hpkeConfigListBuffer = new Buffer();
+            hpkeConfigListBuffer.readFrom(is);
+        }
+        return hpkeConfigListBuffer;
+    }
+
+    public static MockWebServer setupMockServer() throws IOException {
+        Buffer hpkeConfigListBuffer = loadHpkeConfigList();
+        MockWebServer server = new MockWebServer();
+        server.enqueue(
+                new MockResponse()
+                        .setHeader("Content-Type", "application/dap-hpke-config-list")
+                        .setBody(hpkeConfigListBuffer)
+        );
+        server.enqueue(
+                new MockResponse()
+                        .setHeader("Content-Type", "application/dap-hpke-config-list")
+                        .setBody(hpkeConfigListBuffer)
+        );
+        server.enqueue(new MockResponse());
+        server.start();
+        return server;
+    }
+}

divviup/src/androidTest/java/org/divviup/android/InstrumentedSmokeTest.java

@@ -0,0 +1,80 @@
+package org.divviup.android;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.divviup.commontest.MockAggregator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.net.URI;
+
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+
+@RunWith(AndroidJUnit4.class)
+public class InstrumentedSmokeTest {
+    private static final TaskId ZERO_TASK_ID = TaskId.parse("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+
+    @Test
+    public void smokeTestPrio3Count() throws IOException, InterruptedException {
+        try (MockWebServer server = MockAggregator.setupMockServer()) {
+            URI uri = server.url("/").uri();
+            Client<Boolean> client = Client.createPrio3Count(uri, uri, ZERO_TASK_ID, 300);
+            client.sendMeasurement(true);
+
+            basicUploadChecks(server);
+        }
+    }
+
+    @Test
+    public void smokeTestPrio3Sum() throws IOException, InterruptedException {
+        try (MockWebServer server = MockAggregator.setupMockServer()) {
+            URI uri = server.url("/").uri();
+            Client<Long> client = Client.createPrio3Sum(uri, uri, ZERO_TASK_ID, 300, 32);
+            client.sendMeasurement(1000000L);
+
+            basicUploadChecks(server);
+        }
+    }
+
+    @Test
+    public void smokeTestPrio3SumVec() throws IOException, InterruptedException {
+        try (MockWebServer server = MockAggregator.setupMockServer()) {
+            URI uri = server.url("/").uri();
+            Client<long[]> client = Client.createPrio3SumVec(uri, uri, ZERO_TASK_ID, 300, 10, 8, 12);
+            client.sendMeasurement(new long[] {252L, 7L, 80L, 194L, 190L, 217L, 141L, 85L, 222L, 243L});
+
+            basicUploadChecks(server);
+        }
+    }
+
+    @Test
+    public void smokeTestPrio3Histogram() throws IOException, InterruptedException {
+        try (MockWebServer server = MockAggregator.setupMockServer()) {
+            URI uri = server.url("/").uri();
+            Client<Long> client = Client.createPrio3Histogram(uri, uri, ZERO_TASK_ID, 300, 5, 2);
+            client.sendMeasurement(2L);
+
+            basicUploadChecks(server);
+        }
+    }
+
+    private static void basicUploadChecks(MockWebServer server) throws InterruptedException {
+        RecordedRequest r1 = server.takeRequest();
+        assertEquals(r1.getMethod(), "GET");
+        assertEquals(r1.getPath(), "/hpke_config?task_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+
+        RecordedRequest r2 = server.takeRequest();
+        assertEquals(r2.getMethod(), "GET");
+        assertEquals(r2.getPath(), "/hpke_config?task_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+
+        RecordedRequest r3 = server.takeRequest();
+        assertEquals(r3.getMethod(), "PUT");
+        assertEquals(r3.getPath(), "/tasks/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/reports");
+        assertEquals(r3.getHeader("Content-Type"), "application/dap-report");
+        assertTrue(r3.getBody().size() > 0);
+    }
+}