diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 3540da64ca..1c5ef3745b 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -32,7 +32,7 @@ ext { apply from: "${rootDir}/shared/opencv.gradle" application { - mainClass = 'frc.robot.Main' + mainClass = 'wpilib.robot.Main' } apply plugin: 'com.gradleup.shadow' diff --git a/benchmark/src/main/java/frc/robot/Main.java b/benchmark/src/main/java/wpilib/robot/Main.java similarity index 99% rename from benchmark/src/main/java/frc/robot/Main.java rename to benchmark/src/main/java/wpilib/robot/Main.java index 0a559a6a2e..e0635e6e4d 100644 --- a/benchmark/src/main/java/frc/robot/Main.java +++ b/benchmark/src/main/java/wpilib/robot/Main.java @@ -2,7 +2,7 @@ // 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 frc.robot; +package wpilib.robot; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; diff --git a/developerRobot/build.gradle b/developerRobot/build.gradle index 087efd8605..36b55b7ec3 100644 --- a/developerRobot/build.gradle +++ b/developerRobot/build.gradle @@ -32,7 +32,7 @@ ext { apply from: "${rootDir}/shared/opencv.gradle" application { - mainClass = 'frc.robot.Main' + mainClass = 'wpilib.robot.Main' } apply plugin: 'com.gradleup.shadow' diff --git a/developerRobot/src/main/java/frc/robot/Main.java b/developerRobot/src/main/java/wpilib/robot/Main.java similarity index 96% rename from developerRobot/src/main/java/frc/robot/Main.java rename to developerRobot/src/main/java/wpilib/robot/Main.java index ad61a7d55b..6b3bacb952 100644 --- a/developerRobot/src/main/java/frc/robot/Main.java +++ b/developerRobot/src/main/java/wpilib/robot/Main.java @@ -2,7 +2,7 @@ // 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 frc.robot; +package wpilib.robot; import org.wpilib.framework.RobotBase; diff --git a/developerRobot/src/main/java/frc/robot/Robot.java b/developerRobot/src/main/java/wpilib/robot/Robot.java similarity index 98% rename from developerRobot/src/main/java/frc/robot/Robot.java rename to developerRobot/src/main/java/wpilib/robot/Robot.java index 71a556969f..bfdfd31c3d 100644 --- a/developerRobot/src/main/java/frc/robot/Robot.java +++ b/developerRobot/src/main/java/wpilib/robot/Robot.java @@ -2,7 +2,7 @@ // 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 frc.robot; +package wpilib.robot; import org.wpilib.framework.TimedRobot; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java index 94a463e1dc..eca5fe4fb2 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java @@ -105,7 +105,7 @@ public final class StringUtils { /** * Gets the name of the generated class used to log data of the given type. This will be - * fully-qualified class name, such as {@code "frc.robot.MyRobotLogger"}. + * fully-qualified class name, such as {@code "wpilib.robot.MyRobotLogger"}. * * @param clazz the data type that the logger supports * @return the logger class name diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java index 313e8ea712..f89ec1521e 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java @@ -28,7 +28,7 @@ class CodeAfterCoroutineParkDetectorTest { void soloPark() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -45,7 +45,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -54,7 +54,7 @@ class CodeAfterCoroutineParkDetectorTest { void printAfterPark() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -73,7 +73,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -87,7 +87,7 @@ class CodeAfterCoroutineParkDetectorTest { void printAfterParkInBlock() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -109,7 +109,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -118,7 +118,7 @@ class CodeAfterCoroutineParkDetectorTest { void loopAfterPark() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -137,7 +137,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -151,7 +151,7 @@ class CodeAfterCoroutineParkDetectorTest { void blockAfterPark() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -170,7 +170,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -184,7 +184,7 @@ class CodeAfterCoroutineParkDetectorTest { void emptyStatementAfterPark() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -201,7 +201,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -210,7 +210,7 @@ class CodeAfterCoroutineParkDetectorTest { void printAfterEmptyStatementAfterPark() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -228,7 +228,7 @@ class CodeAfterCoroutineParkDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java index 4f379d43dd..49b0636415 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java @@ -27,7 +27,7 @@ class CoroutineInLoopListenerTest { void noYieldInLoopWithoutCoroutines() { String source = """ - package frc.robot; + package wpilib.robot; class Example { Runnable lambda = () -> { @@ -40,7 +40,7 @@ class CoroutineInLoopListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -49,7 +49,7 @@ class CoroutineInLoopListenerTest { void basicYieldInLoopInLambda() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -68,7 +68,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -77,7 +77,7 @@ class CoroutineInLoopListenerTest { void basicYieldInLoopInMethod() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -96,7 +96,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -105,7 +105,7 @@ class CoroutineInLoopListenerTest { void noYieldInLoopInLambda() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -124,7 +124,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -136,7 +136,7 @@ class CoroutineInLoopListenerTest { void yieldInLoopInRunnableInLambda() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -157,7 +157,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); // TODO: Should we make it an error to yield (or invoke any methods on) a captured coroutine? assertThat(compilation).succeededWithoutWarnings(); @@ -167,7 +167,7 @@ class CoroutineInLoopListenerTest { void noYieldInMethodWithManyCoroutineParams() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -190,7 +190,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -208,7 +208,7 @@ class CoroutineInLoopListenerTest { void noYieldsInNestedLambda() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -229,7 +229,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -241,7 +241,7 @@ class CoroutineInLoopListenerTest { void nestedLambdaYieldsToOuter() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -262,7 +262,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); @@ -277,7 +277,7 @@ class CoroutineInLoopListenerTest { void noYieldsInNestedLoops() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -299,7 +299,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(2, compilation.errors().size()); @@ -317,7 +317,7 @@ class CoroutineInLoopListenerTest { void noYieldInOuterLoopButYieldInInnerLoop() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -339,7 +339,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -352,7 +352,7 @@ class CoroutineInLoopListenerTest { void noYieldInInnerLoopButYieldInOuterLoop() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -374,7 +374,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -387,7 +387,7 @@ class CoroutineInLoopListenerTest { void noYieldsInDeeplyNestedLoops() { String source = """ - package frc.robot; + package wpilib.robot; import java.util.function.Consumer; import org.wpilib.command3.Coroutine; @@ -420,7 +420,7 @@ class CoroutineInLoopListenerTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(7, compilation.errors().size()); diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java index 8f34ff9a3f..c719e7d1a3 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java @@ -28,7 +28,7 @@ class IncorrectCoroutineUseDetectorTest { void methodCalledOnNonlocalCoroutine() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -47,7 +47,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -61,7 +61,7 @@ class IncorrectCoroutineUseDetectorTest { void nonlocalCoroutinePassedToMethod() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -82,7 +82,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -96,7 +96,7 @@ class IncorrectCoroutineUseDetectorTest { void twoLocalCoroutines() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.BiConsumer; @@ -118,7 +118,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -132,7 +132,7 @@ class IncorrectCoroutineUseDetectorTest { void threeLocalCoroutines() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -158,7 +158,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -172,7 +172,7 @@ class IncorrectCoroutineUseDetectorTest { void coroutineSavedToFieldErrors() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -191,7 +191,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -203,7 +203,7 @@ class IncorrectCoroutineUseDetectorTest { void outerCoroutineSavedToFieldErrors() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -225,7 +225,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(2, compilation.errors().size()); @@ -245,7 +245,7 @@ class IncorrectCoroutineUseDetectorTest { void coroutineSavedToVariableIsAllowed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -262,7 +262,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -273,7 +273,7 @@ class IncorrectCoroutineUseDetectorTest { void coroutineSavedToFieldViaMethodCannotBeDetected() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @@ -296,7 +296,7 @@ class IncorrectCoroutineUseDetectorTest { .withOptions(kJavaVersionOptions) .compile( JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), - JavaFileObjects.forSourceString("frc.robot.Example", source)); + JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java index 48abec7d3e..5742a26713 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java @@ -18,7 +18,7 @@ class ReturnValueUsedListenerTest { void nodiscardReturnValueIsUsed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -35,7 +35,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -44,7 +44,7 @@ class ReturnValueUsedListenerTest { void nodiscardReturnValueUnused() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -61,7 +61,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -73,7 +73,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnClass() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -90,13 +90,13 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); var error = compilation.errors().get(0); assertEquals( - "Result of method returning @NoDiscard type frc.robot.Example is ignored", + "Result of method returning @NoDiscard type wpilib.robot.Example is ignored", error.getMessage(null)); } @@ -104,7 +104,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnClassCustomMessage() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -121,7 +121,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -133,7 +133,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnClassAndMethod() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -151,7 +151,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(2, compilation.errors().size()); @@ -159,7 +159,7 @@ class ReturnValueUsedListenerTest { var error2 = compilation.errors().get(1); assertEquals("Result of @NoDiscard method is ignored", error1.getMessage(null)); assertEquals( - "Result of method returning @NoDiscard type frc.robot.Example is ignored", + "Result of method returning @NoDiscard type wpilib.robot.Example is ignored", error2.getMessage(null)); } @@ -167,7 +167,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnInheritedClass() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -186,7 +186,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -198,7 +198,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnSingleInterface() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -217,7 +217,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -229,7 +229,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnMultipleInterfaces() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -251,7 +251,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(2, compilation.errors().size()); @@ -265,7 +265,7 @@ class ReturnValueUsedListenerTest { void nodiscardCustomMessage() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -282,7 +282,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -294,7 +294,7 @@ class ReturnValueUsedListenerTest { void nodiscardMessageEmptyString() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -311,7 +311,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -323,7 +323,7 @@ class ReturnValueUsedListenerTest { void nodiscardOnVoidMethod() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -340,7 +340,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -349,7 +349,7 @@ class ReturnValueUsedListenerTest { void suppressWarningsOnNoDiscardMethod() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -367,7 +367,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -376,7 +376,7 @@ class ReturnValueUsedListenerTest { void suppressWarningsAllOnNoDiscardMethod() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -394,7 +394,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -403,7 +403,7 @@ class ReturnValueUsedListenerTest { void suppressWarningsOnNoDiscardClass() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -421,7 +421,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -430,7 +430,7 @@ class ReturnValueUsedListenerTest { void suppressWarningsAllOnNoDiscardClass() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.annotation.NoDiscard; @@ -448,7 +448,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -457,7 +457,7 @@ class ReturnValueUsedListenerTest { void commandsv2CommandFactoryResultIsAssigned() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; @@ -477,7 +477,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -486,7 +486,7 @@ class ReturnValueUsedListenerTest { void commandsv2CommandFactoryResultIsPassed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; @@ -506,7 +506,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -515,7 +515,7 @@ class ReturnValueUsedListenerTest { void commandsv2CommandFactoryResultIsChainedAndUsed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; @@ -535,7 +535,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); } @@ -544,7 +544,7 @@ class ReturnValueUsedListenerTest { void commandsv2CommandFactoryResultNotUsed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; @@ -564,7 +564,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -577,7 +577,7 @@ class ReturnValueUsedListenerTest { void commandsv2CommandFactoryResultIsChainedAndNotUsed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; @@ -597,7 +597,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size()); @@ -610,7 +610,7 @@ class ReturnValueUsedListenerTest { void commandsv2NewCommandInstanceNotUsed() { String source = """ - package frc.robot; + package wpilib.robot; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; @@ -627,7 +627,7 @@ class ReturnValueUsedListenerTest { Compilation compilation = javac() .withOptions(kJavaVersionOptions) - .compile(JavaFileObjects.forSourceString("frc.robot.Example", source)); + .compile(JavaFileObjects.forSourceString("wpilib.robot.Example", source)); assertThat(compilation).failed(); assertEquals(1, compilation.errors().size());