From 03cb3c70b4d522c185e5b00f0d3bec037db282ab Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Wed, 23 Oct 2024 19:17:19 -0400 Subject: [PATCH] [epilogue] Set source and target java versions for epilogue-processor tests (#7282) --- .../epilogue/processor/AnnotationProcessorTest.java | 4 ++++ .../epilogue/processor/CompileTestOptions.java | 13 +++++++++++++ .../epilogue/processor/EpilogueGeneratorTest.java | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/CompileTestOptions.java diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java index 7304e731a6..38cd90e9cf 100644 --- a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java +++ b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java @@ -6,6 +6,7 @@ package edu.wpi.first.epilogue.processor; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; +import static edu.wpi.first.epilogue.processor.CompileTestOptions.kJavaVersionOptions; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -910,6 +911,7 @@ class AnnotationProcessorTest { Compilation compilation = javac() + .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); @@ -1123,6 +1125,7 @@ class AnnotationProcessorTest { Compilation compilation = javac() + .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); @@ -1149,6 +1152,7 @@ class AnnotationProcessorTest { private void assertLoggerGenerates(String loggedClassContent, String loggerClassContent) { Compilation compilation = javac() + .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) .compile( JavaFileObjects.forSourceString( diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/CompileTestOptions.java b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/CompileTestOptions.java new file mode 100644 index 0000000000..9ce1fc4da0 --- /dev/null +++ b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/CompileTestOptions.java @@ -0,0 +1,13 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +package edu.wpi.first.epilogue.processor; + +import java.util.List; + +public class CompileTestOptions { + public static final int kJavaVersion = 17; + public static final List kJavaVersionOptions = + List.of("-source", kJavaVersion, "-target", kJavaVersion); +} diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java index a51345f49e..a2d0b18411 100644 --- a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java +++ b/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java @@ -6,6 +6,7 @@ package edu.wpi.first.epilogue.processor; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; +import static edu.wpi.first.epilogue.processor.CompileTestOptions.kJavaVersionOptions; import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.testing.compile.Compilation; @@ -363,6 +364,7 @@ class EpilogueGeneratorTest { String loggedClassContent, String loggerClassContent) { Compilation compilation = javac() + .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) .compile(JavaFileObjects.forSourceString("", loggedClassContent));