Skip to content

Commit

Permalink
test: Add Java 17 to the matrix build
Browse files Browse the repository at this point in the history
When trying to run the test with Java 17, there was an issue with assertion accessing internal API. As reported in: google/compile-testing#222.

As a fix, replaced asserts with plain text asserts, inspired by google/auto#1004

To be running the test on Java 17. Need to update the processor test to
  • Loading branch information
aurambaj committed Nov 14, 2023
1 parent 9f9070a commit 03e67fa
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
build:
strategy:
matrix:
version: [8, 11]
version: [8, 11, 17]
include:
- version: 11
bazel: yes
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 1.8
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.version }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
import static com.google.testing.compile.Compiler.javac;
import static com.pinterest.l10nmessages.L10nPropertiesEnumGenerator.shouldUseOldGeneratedAnnotation;
import static com.pinterest.l10nmessages.PropertiesLoaderTest.getPropertiesEntries;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import static org.junit.jupiter.api.Assertions.assertIterableEquals;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

import com.google.common.io.Resources;
import com.google.testing.compile.Compilation;
import com.google.testing.compile.CompilationSubject.DiagnosticInFile;
import com.google.testing.compile.JavaFileObjectSubject;
import com.google.testing.compile.JavaFileObjects;
import com.pinterest.l10nmessages.PropertiesLoader.PropertiesEntry;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
Expand Down Expand Up @@ -73,14 +77,10 @@ public void repeatableJava9() {
checkGenerationSuccessful(compilation);

// test the second file
JavaFileObjectSubject javaFileObjectSubject =
assertThat(compilation).generatedSourceFile(Generator.getEnumOutputName(testName) + "2");

javaFileObjectSubject.hasSourceEquivalentTo(
JavaFileObjects.forResource(
String.format(
"com/pinterest/l10nmessages/L10nPropertiesProcessorTest_IO/%1$s/TestMessages2.java",
testName)));
compareGenerateWithTestResource(
compilation,
Generator.getEnumOutputName(testName) + "2",
"com/pinterest/l10nmessages/L10nPropertiesProcessorTest_IO/%1$s/TestMessages2.java");
}

@Test
Expand Down Expand Up @@ -288,12 +288,27 @@ Compilation defaultCompile() {

void checkGenerationSuccessful(Compilation compilation) {
assertThat(compilation).succeeded();
JavaFileObjectSubject javaFileObjectSubject =
assertThat(compilation).generatedSourceFile(Generator.getEnumOutputName(testName));
javaFileObjectSubject.hasSourceEquivalentTo(
JavaFileObjects.forResource(
String.format(
"com/pinterest/l10nmessages/L10nPropertiesProcessorTest_IO/%1$s/TestMessages.java",
testName)));
compareGenerateWithTestResource(
compilation,
Generator.getEnumOutputName(testName),
"com/pinterest/l10nmessages/L10nPropertiesProcessorTest_IO/%1$s/TestMessages.java");
}

void compareGenerateWithTestResource(
Compilation compilation, String generatedPath, String resourcePathPattern) {

try {
String resourcePath = String.format(resourcePathPattern, testName);

String generated =
compilation.generatedSourceFile(generatedPath).get().getCharContent(false).toString();

String expected =
Resources.toString(Resources.getResource(resourcePath), StandardCharsets.UTF_8);

Assertions.assertThat(generated.trim()).isEqualTo(expected.trim());
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ public enum TestMessages {
public String toString() {
return key;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ public enum TestMessages2 {
public String toString() {
return key;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ public enum TestMessages {
public String toString() {
return key;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ public enum TestMessages2 {
public String toString() {
return key;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ public enum TestMessages {
public String toString() {
return key;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ public enum TestMessages {
public String toString() {
return key;
}

}

0 comments on commit 03e67fa

Please sign in to comment.