remove use of Maven in Java tests (#520)

Per #495, Maven has proven quite unreliable for the past few weeks, so
now we download and execute the relevant TeaVM jars directly, which
should be more reliable.

This also fixes the lift-lower-foreign.wit codegen test for Java.

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

.github/workflows/main.yml

@@ -45,6 +45,8 @@ jobs:
         echo "WASI_SDK_PATH=`pwd`/wasi-sdk-16.0" >> $GITHUB_ENV
       if : matrix.os == 'windows-latest'
 
+    - run: ci/download-teavm.sh
+
     - uses: actions/setup-node@v2
       with:
         node-version: '16'

ci/download-teavm.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+mkdir -p target
+cd target
+curl -O https://repo.maven.apache.org/maven2/com/fermyon/teavm-cli/0.2.8/teavm-cli-0.2.8.jar
+curl -O https://repo.maven.apache.org/maven2/com/fermyon/teavm-interop/0.2.8/teavm-interop-0.2.8.jar

crates/gen-guest-teavm-java/src/lib.rs

@@ -1346,19 +1346,19 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                 }
             },
 
-            Instruction::FlagsLift { name, flags, .. } => match flags_repr(flags) {
+            Instruction::FlagsLift { flags, ty, .. } => match flags_repr(flags) {
                 Int::U8 | Int::U16 | Int::U32 => {
                     results.push(format!(
                         "new {}(({}) {})",
-                        name.to_upper_camel_case(),
+                        self.gen.type_name(&Type::Id(*ty)),
                         int_type(flags_repr(flags)),
                         operands[0]
                     ));
                 }
                 Int::U64 => {
                     results.push(format!(
                         "new {}(((long) ({})) | (((long) ({})) << 32))",
-                        name.to_upper_camel_case(),
+                        self.gen.type_name(&Type::Id(*ty)),
                         operands[0],
                         operands[1]
                     ));
@@ -1589,9 +1589,9 @@ impl Bindgen for FunctionBindgen<'_, '_> {
 
             Instruction::EnumLower { .. } => results.push(format!("{}.ordinal()", operands[0])),
 
-            Instruction::EnumLift { name, .. } => results.push(format!(
+            Instruction::EnumLift { ty, .. } => results.push(format!(
                 "{}.values()[{}]",
-                name.to_upper_camel_case(),
+                self.gen.type_name(&Type::Id(*ty)),
                 operands[0]
             )),
 

crates/gen-guest-teavm-java/tests/codegen.rs

@@ -2,9 +2,6 @@ use std::path::Path;
 use std::process::Command;
 
 macro_rules! codegen_test {
-    // TODO: should fix this test
-    (lift_lower_foreign $name:tt $test:tt) => {};
-
     ($id:ident $name:tt $test:tt) => {
         #[test]
         fn $id() {
@@ -25,30 +22,33 @@ macro_rules! codegen_test {
 }
 test_helpers::codegen_tests!("*.wit");
 
-// TODO: As of this writing, Maven has started failing to resolve dependencies on Windows in the GitHub action,
-// apparently unrelated to any code changes we've made.  Until we've either resolved the problem or developed a
-// workaround, we're disabling the tests.
-//
-// See https://github.com/bytecodealliance/wit-bindgen/issues/495 for more information.
-#[cfg(windows)]
-fn verify(_dir: &Path, _name: &str) {
-    _ = mvn;
-    _ = pom_xml;
-}
-
-#[cfg(unix)]
 fn verify(dir: &Path, name: &str) {
-    use heck::{ToSnakeCase, ToUpperCamelCase};
+    use heck::ToSnakeCase;
     use std::fs;
 
+    // Derived from `test_helpers::test_directory`
+    const DEPTH_FROM_TARGET_DIR: u32 = 3;
+
+    let base_dir = {
+        let mut dir = dir.to_owned();
+        for _ in 0..DEPTH_FROM_TARGET_DIR {
+            dir.pop();
+        }
+        dir
+    };
+
+    let teavm_interop_jar = base_dir.join("teavm-interop-0.2.8.jar");
+
+    if !teavm_interop_jar.is_file() {
+        panic!("please run ci/download-teavm.sh prior to running the Java tests")
+    }
+
     let java_dir = &dir.join("src/main/java");
     let snake = name.to_snake_case();
     let package_dir = &java_dir.join(format!("wit_{snake}"));
 
     fs::create_dir_all(package_dir).unwrap();
 
-    let upper = name.to_upper_camel_case();
-
     let src_files = fs::read_dir(&dir).unwrap().filter_map(|entry| {
         let path = entry.unwrap().path();
         if let Some("java") = path.extension().map(|ext| ext.to_str().unwrap()) {
@@ -58,52 +58,21 @@ fn verify(dir: &Path, name: &str) {
         }
     });
 
-    for src in src_files {
-        let dst = &package_dir.join(src.file_name().unwrap());
-        fs::rename(src, dst).unwrap();
-    }
+    let dst_files = src_files.map(|src| {
+        let dst = package_dir.join(src.file_name().unwrap());
+        fs::rename(src, &dst).unwrap();
+        dst
+    });
 
-    fs::write(
-        dir.join("pom.xml"),
-        pom_xml(&[&format!("wit_{snake}.{upper}")]),
-    )
-    .unwrap();
-    fs::write(java_dir.join("Main.java"), include_bytes!("Main.java")).unwrap();
+    let mut cmd = Command::new("javac");
+    cmd.arg("-cp")
+        .arg(&teavm_interop_jar)
+        .arg("-d")
+        .arg("target/classes");
 
-    let mut cmd = mvn();
-    cmd.arg("prepare-package").current_dir(dir);
+    for file in dst_files {
+        cmd.arg(file);
+    }
 
     test_helpers::run_command(&mut cmd);
 }
-
-#[cfg(unix)]
-fn mvn() -> Command {
-    Command::new("mvn")
-}
-
-#[cfg(windows)]
-fn mvn() -> Command {
-    let mut cmd = Command::new("cmd");
-    cmd.args(&["/c", "mvn"]);
-    cmd
-}
-
-fn pom_xml(classes_to_preserve: &[&str]) -> Vec<u8> {
-    let xml = include_str!("pom.xml");
-    let position = xml.find("<mainClass>").unwrap();
-    let (before, after) = xml.split_at(position);
-    let classes_to_preserve = classes_to_preserve
-        .iter()
-        .map(|&class| format!("<param>{class}</param>"))
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    format!(
-        "{before}
-         <classesToPreserve>
-            {classes_to_preserve}
-         </classesToPreserve>
-         {after}"
-    )
-    .into_bytes()
-}