From 612bffcb9e01ec73a33e90335baa0c02938623c2 Mon Sep 17 00:00:00 2001
From: Rick Ossendrijver <rick.ossendrijver@gmail.com>
Date: Wed, 30 Aug 2023 13:05:05 +0200
Subject: [PATCH] Revert to Mo s suggestion

---
 error-prone-contrib/pom.xml                     |  5 +++++
 .../bugpatterns/DirectReturnTest.java           | 17 ++++-------------
 pom.xml                                         |  5 +++++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/error-prone-contrib/pom.xml b/error-prone-contrib/pom.xml
index cd4016dfe84..d04e1b5ef5c 100644
--- a/error-prone-contrib/pom.xml
+++ b/error-prone-contrib/pom.xml
@@ -181,6 +181,11 @@
             <artifactId>mongodb-driver-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
diff --git a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/DirectReturnTest.java b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/DirectReturnTest.java
index f5d3e15298c..19af8b4a34c 100644
--- a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/DirectReturnTest.java
+++ b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/DirectReturnTest.java
@@ -226,18 +226,8 @@ void replacement() {
 
   @Test
   void ignoreClassesAnnotatedWithLombokData() {
-    BugCheckerRefactoringTestHelper.newInstance(DirectReturn.class, getClass())
-        .addInputLines("Data.java", "package lombok;", "", "public @interface Data {}")
-        .expectUnchanged()
-        .addInputLines(
-            "A.java",
-            "import lombok.Data;",
-            "",
-            "@Data",
-            "class A {",
-            "  private String field;",
-            "}")
-        .addOutputLines(
+    CompilationTestHelper.newInstance(DirectReturn.class, getClass())
+        .addSourceLines(
             "A.java",
             "import lombok.Data;",
             "",
@@ -245,6 +235,7 @@ void ignoreClassesAnnotatedWithLombokData() {
             "class A {",
             "  private String field;",
             "}")
-        .doTest(TestMode.TEXT_MATCH);
+        .expectNoDiagnostics()
+        .doTest();
   }
 }
diff --git a/pom.xml b/pom.xml
index c0f42f13293..615b4bd8c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -456,6 +456,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.28</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>