Add support for eclipse feature tests

40 files changed, 1263 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 2417108c..d4285573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /website/lombokSupporters
 /pom.xml
 /jvm.locations
+/testenv
\ No newline at end of file
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index afd799d0..db60f6f4 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -43,7 +43,7 @@
 		<dependency org="org.apache.ant" name="ant-junit" rev="1.10.5" conf="build->default" />
 		
 		<!-- test deps -->
-		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; sources" />
+		<dependency org="junit" name="junit" rev="4.13.2" conf="test->default; sources" />
 		<dependency org="log4j" name="log4j" rev="1.2.17" conf="test->default; sources" />
 		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.17.1" conf="test->default; sources" />
 		<dependency org="commons-logging" name="commons-logging" rev="1.2" conf="test->default; sources" />
diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml
index 2a9104eb..87a3593a 100644
--- a/buildScripts/setup.ant.xml
+++ b/buildScripts/setup.ant.xml
@@ -34,8 +34,10 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 	
 	<property name="jdk6-rt.loc" location="lib/openjdk6_rt.jar" />
 	<property name="jdk8-rt.loc" location="lib/openjdk8_rt.jar" />
+	<property name="rtstubs18.loc" location="lib/rtstubs18.jar" />
 	<available file="${jdk6-rt.loc}" property="jdk6-rt.available" />
 	<available file="${jdk8-rt.loc}" property="jdk8-rt.available" />
+	<available file="${rtstubs18.loc}" property="rtstubs18.available" />
 	<property name="ssh.configuration.file" location="ssh.configuration" />
 	
 	<target name="-setup.ssh.ask">
@@ -167,6 +169,12 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 		<get src="https://projectlombok.org/ivyrepo/langtools/rt-openjdk8.jar" dest="${jdk8-rt.loc}" verbose="true" usetimestamp="true" />
 	</target>
 	
+	<target name="deps.rtstubs18" unless="rtstubs18.available">
+		<echo>To test in eclipse, we need a java runtime, which will now be downloaded...</echo>
+		<mkdir dir="lib" />
+		<get src="https://github.com/eclipse-jdt/eclipse.jdt.ui/raw/master/org.eclipse.jdt.ui.tests/testresources/rtstubs18.jar" dest="${rtstubs18.loc}" verbose="true" usetimestamp="true" />
+	</target>
+	
 	<target name="deps.jdk-runtime" depends="deps.jdk6-runtime, deps.jdk8-runtime" />
 	
 	<target name="deps.custom" depends="ivy.config" description="Download the dependencies that comprise a configuration (from ivy.xml)">
@@ -175,6 +183,14 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 		<ivy:retrieve symlink="true" />
 	</target>
 	
+	<target name="deps.eclipse.oxygen" depends="deps.rtstubs18, compile.support">
+		<fetchdep.eclipse.osgi name="oxygen" version="4.7/R-4.7-201706120950" />
+	</target>
+	
+	<target name="deps.eclipse.2022-03" depends="deps.rtstubs18, compile.support">
+		<fetchdep.eclipse.osgi name="2022-03" version="4.23/R-4.23-202203080310" />
+	</target>
+	
 	<macrodef name="fetchdep.ecj">
 		<attribute name="version" />
 		<sequential>
@@ -195,6 +211,132 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 		</sequential>
 	</macrodef>
 	
+	<macrodef name="fetchdep.eclipse.osgi">
+		<attribute name="target" default="testenv" />
+		<attribute name="name" />
+		<attribute name="version" />
+		<sequential>
+			<java classname="lombok.eclipse.dependencies.DownloadEclipseDependencies" failonerror="true">
+				<classpath>
+					<path refid="cp.buildtools" />
+					<pathelement location="build/support" />
+				</classpath>
+				<arg value="@{target}" />
+				<arg value="eclipse-@{name}" />
+				<arg value="https://download.eclipse.org/eclipse/updates/@{version}/plugins/" />
+				<arg value="com.ibm.icu" />
+				<arg value="com.sun.jna" />
+				<arg value="com.sun.jna.platform" />
+				<arg value="javax.inject" />
+				<arg value="javax.annotation" />
+				<arg value="org.apache.batik.constants" />
+				<arg value="org.apache.batik.css" />
+				<arg value="org.apache.batik.i18n" />
+				<arg value="org.apache.batik.util" />
+				<arg value="org.apache.commons.io" />
+				<arg value="org.apache.commons.logging" />
+				<arg value="org.apache.commons.jxpath" />
+				<arg value="org.apache.felix.scr" />
+				<arg value="org.apache.xmlgraphics" />
+				<arg value="org.bouncycastle.bcpg" />
+				<arg value="org.bouncycastle.bcprov" />
+				<arg value="org.eclipse.compare" />
+				<arg value="org.eclipse.compare.core" />
+				<arg value="org.eclipse.core.commands" />
+				<arg value="org.eclipse.core.contenttype" />
+				<arg value="org.eclipse.core.databinding" />
+				<arg value="org.eclipse.core.databinding.observable" />
+				<arg value="org.eclipse.core.databinding.property" />
+				<arg value="org.eclipse.core.expressions" />
+				<arg value="org.eclipse.core.filebuffers" />
+				<arg value="org.eclipse.core.filesystem" />
+				<arg value="org.eclipse.core.jobs" />
+				<arg value="org.eclipse.core.resources" />
+				<arg value="org.eclipse.core.runtime" />
+				<arg value="org.eclipse.core.variables" />
+				<arg value="org.eclipse.debug.core" />
+				<arg value="org.eclipse.debug.ui" />
+				<arg value="org.eclipse.e4.core.commands" />
+				<arg value="org.eclipse.e4.core.contexts" />
+				<arg value="org.eclipse.e4.core.di" />
+				<arg value="org.eclipse.e4.core.di.annotations" />
+				<arg value="org.eclipse.e4.core.di.extensions" />
+				<arg value="org.eclipse.e4.core.di.extensions.supplier" />
+				<arg value="org.eclipse.e4.core.services" />
+				<arg value="org.eclipse.e4.emf.xpath" />
+				<arg value="org.eclipse.e4.ui.bindings" />
+				<arg value="org.eclipse.e4.ui.css.core" />
+				<arg value="org.eclipse.e4.ui.css.swt" />
+				<arg value="org.eclipse.e4.ui.css.swt.theme" />
+				<arg value="org.eclipse.e4.ui.di" />
+				<arg value="org.eclipse.e4.ui.dialogs" />
+				<arg value="org.eclipse.e4.ui.ide" />
+				<arg value="org.eclipse.e4.ui.model.workbench" />
+				<arg value="org.eclipse.e4.ui.services" />
+				<arg value="org.eclipse.e4.ui.widgets" />
+				<arg value="org.eclipse.e4.ui.workbench" />
+				<arg value="org.eclipse.e4.ui.workbench.addons.swt" />
+				<arg value="org.eclipse.e4.ui.workbench.renderers.swt" />
+				<arg value="org.eclipse.e4.ui.workbench.swt" />
+				<arg value="org.eclipse.e4.ui.workbench3" />
+				<arg value="org.eclipse.emf.common" />
+				<arg value="org.eclipse.emf.ecore" />
+				<arg value="org.eclipse.emf.ecore.change" />
+				<arg value="org.eclipse.emf.ecore.xmi" />
+				<arg value="org.eclipse.equinox.app" />
+				<arg value="org.eclipse.equinox.bidi" />
+				<arg value="org.eclipse.equinox.common" />
+				<arg value="org.eclipse.equinox.p2.artifact.repository" />
+				<arg value="org.eclipse.equinox.p2.core" />
+				<arg value="org.eclipse.equinox.p2.engine" />
+				<arg value="org.eclipse.equinox.p2.jarprocessor" />
+				<arg value="org.eclipse.equinox.p2.metadata" />
+				<arg value="org.eclipse.equinox.p2.metadata.repository" />
+				<arg value="org.eclipse.equinox.p2.repository" />
+				<arg value="org.eclipse.equinox.preferences" />
+				<arg value="org.eclipse.equinox.registry" />
+				<arg value="org.eclipse.equinox.security" />
+				<arg value="org.eclipse.help" />
+				<arg value="org.eclipse.jdt.core" />
+				<arg value="org.eclipse.jdt.core.manipulation" />
+				<arg value="org.eclipse.jdt.debug" />
+				<arg value="org.eclipse.jdt.launching" />
+				<arg value="org.eclipse.jdt.ui" />
+				<arg value="org.eclipse.jface" />
+				<arg value="org.eclipse.jface.databinding" />
+				<arg value="org.eclipse.jface.text" />
+				<arg value="org.eclipse.ltk.core.refactoring" />
+				<arg value="org.eclipse.ltk.ui.refactoring" />
+				<arg value="org.eclipse.osgi" />
+				<arg value="org.eclipse.osgi.services" />
+				<arg value="org.eclipse.osgi.util" />
+				<arg value="org.eclipse.search" />
+				<arg value="org.eclipse.swt" />
+				<arg value="org.eclipse.swt.gtk.linux.x86_64" />
+				<arg value="org.eclipse.team.core" />
+				<arg value="org.eclipse.team.ui" />
+				<arg value="org.eclipse.text" />
+				<arg value="org.eclipse.ui" />
+				<arg value="org.eclipse.ui.console" />
+				<arg value="org.eclipse.ui.editors" />
+				<arg value="org.eclipse.ui.forms" />
+				<arg value="org.eclipse.ui.ide" />
+				<arg value="org.eclipse.ui.navigator" />
+				<arg value="org.eclipse.ui.navigator.resources" />
+				<arg value="org.eclipse.ui.views" />
+				<arg value="org.eclipse.ui.views.properties.tabbed" />
+				<arg value="org.eclipse.ui.workbench" />
+				<arg value="org.eclipse.ui.workbench.texteditor" />
+				<arg value="org.eclipse.urischeme" />
+				<arg value="org.tukaani.xz" />
+				<arg value="org.w3c.css.sac" />
+				<arg value="org.w3c.dom.events" />
+				<arg value="org.w3c.dom.smil" />
+				<arg value="org.w3c.dom.svg" />
+			</java>
+		</sequential>
+	</macrodef>
+	
 	<target name="deps" depends="ivy.config, deps.jdk-runtime" description="Downloads all dependencies needed for common tasks">
 		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="javac6,javac8,ecj8,build,eclipse-oxygen,mapstruct,sources,stripe,buildtools,test" />
 		<ivy:retrieve symlink="true" />
diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml
index 0191d642..34d99527 100644
--- a/buildScripts/tests.ant.xml
+++ b/buildScripts/tests.ant.xml
@@ -55,6 +55,24 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 		</ivy:compile>
 	</target>
 	
+	<target name="test.eclipse.compile" depends="deps.eclipse.oxygen, compile" description="compiles the eclipse tests" unless="skip.tests">
+		<mkdir dir="build/tests" />
+		<path id="cp.eclipse">
+			<fileset dir="testenv/eclipse-oxygen/plugins">
+				<include name="*.jar" />
+			</fileset>
+		</path>
+		<ivy:compile destdir="build/tests" source="1.8" target="1.8" ecj="true" nowarn="true">
+			<bootclasspath path="${jdk8-rt.loc}" />
+			<classpath refid="cp.eclipse" />
+			<classpath refid="cp.test" />
+			<classpath refid="cp.javac8" />
+			<classpath refid="packing.basedirs.path" />
+			<classpath path="build/tests" />
+			<src path="test/eclipse/src" />
+		</ivy:compile>
+	</target>
+	
 	<target name="test.ecj11.call" depends="deps, dist" description="Runs a few ecj-specific tests" unless="skip.tests">
 		<java jar="lib/ecj11/org.eclipse.jdt-ecj.jar" fork="true" failonerror="true">
 			<jvmarg value="-javaagent:dist/lombok.jar=ecj" />
@@ -226,6 +244,38 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 		<test.ecj-X version="16" />
 	</target>
 	
+	<macrodef name="test.eclipse-X-full">
+		<attribute name="version" />
+		<sequential>
+			<path id="cp.eclipse-@{version}">
+				<fileset dir="testenv/eclipse-@{version}/plugins">
+					<include name="*.jar" />
+				</fileset>
+			</path>
+			<echo>Running EclipseTests on eclipse-@{version} on JVM${ant.java.version}</echo>
+			<junit haltonfailure="yes" fork="true" forkmode="once">
+				<formatter classname="lombok.ant.SimpleTestFormatter" usefile="false" unless="tests.quiet" />
+				<jvmarg value="-javaagent:dist/lombok.jar" />
+				<jvmarg value="-Dlombok.testenv=testenv/eclipse-@{version}" />
+				<classpath refid="cp.eclipse-@{version}" />
+				<classpath location="build/ant" />
+				<classpath refid="cp.test" />
+				<classpath refid="cp.eclipse-@{version}" />
+				<classpath refid="packing.basedirs.path" />
+				<classpath location="build/tests" />
+				<test name="lombok.eclipse.EclipseTests" />
+			</junit>
+		</sequential>
+	</macrodef>
+
+	<target name="test.eclipse-oxygen-full" depends="test.formatter.compile, test.eclipse.compile, deps.eclipse.oxygen" description="runs the full eclipse tests on your default VM, testing the oxygen release of eclipse">
+		<test.eclipse-X-full version="oxygen" />
+	</target>
+	
+	<target name="test.eclipse-2022-03-full" depends="test.formatter.compile, test.eclipse.compile, deps.eclipse.2022-03" description="runs the full eclipse tests on your default VM, testing the 2022-03 release of eclipse">
+		<test.eclipse-X-full version="2022-03" />
+	</target>
+	
 	<target name="test" depends="test.javacCurrent, test.eclipse-202006" description="runs the tests against the default JVM, javac, and eclipse" />
 	<target name="test.broad" depends="test.javac8, test.javac17, test.javac18, test.eclipse-oxygen, test.eclipse-202006, test.eclipse-202006-jdk8" description="runs the tests against the default JVM, javac, and eclipse" />
 </project>
diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
index d893b724..c0bfbe09 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
@@ -109,6 +109,8 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
 		patchRenameField(sm);
 		patchNullCheck(sm);
 		
+		patchForTests(sm);
+		
 		if (reloadExistingClasses) sm.reloadClasses(instrumentation);
 	}
 	
@@ -1007,5 +1009,13 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
 				.transplant()
 				.build());
 	}
+	
+	private static void patchForTests(ScriptManager sm) {
+		sm.addScriptIfWitness(new String[] {"lombok/eclipse/EclipseTests"}, ScriptBuilder.wrapReturnValue()
+				.target(new MethodTarget("org.osgi.framework.FrameworkUtil", "getBundle", "org.osgi.framework.Bundle", "java.lang.Class"))
+				.request(StackRequest.RETURN_VALUE, StackRequest.PARAM1)
+				.wrapMethod(new Hook("lombok.launch.PatchFixesHider$Tests", "getBundle", "java.lang.Object", "java.lang.Object", "java.lang.Class"))
+				.build());
+	}
 
 }
diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
index a844239f..c7bdbc31 100755
--- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java
+++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
@@ -27,6 +27,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.security.CodeSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
@@ -854,4 +855,28 @@ final class PatchFixesHider {
 			return isGenerated(adjustment.getMember());
 		}
 	}
+	
+	public static class Tests {
+		public static Object getBundle(Object original, Class<?> c) {
+			if (original != null) {
+				return original;
+			}
+			
+			CodeSource codeSource = c.getProtectionDomain().getCodeSource();
+			if (codeSource == null) {
+				return null;
+			}
+			
+			String jar = codeSource.getLocation().getFile();
+			String bundleName = jar.substring(jar.lastIndexOf("/") + 1, jar.indexOf("_"));
+			
+			org.osgi.framework.Bundle[] bundles = org.eclipse.core.runtime.adaptor.EclipseStarter.getSystemBundleContext().getBundles();
+			for (org.osgi.framework.Bundle bundle : bundles) {
+				if (bundleName.equals(bundle.getSymbolicName())) {
+					return bundle;
+				}
+			}
+			return null;
+		}
+	}
 }
diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java
new file mode 100644
index 00000000..06e26bb6
--- /dev/null
+++ b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java
@@ -0,0 +1,131 @@
+package lombok.eclipse.dependencies;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Download eclipse bundles.
+ */
+public class DownloadEclipseDependencies {
+	
+	public static void main(String[] args) throws IOException {
+		String target = args[0];
+		String eclipseVersion = args[1];
+		String updatePage = args[2];
+		String[] packages = Arrays.copyOfRange(args, 3, args.length);
+		
+		String pluginTarget = target + "/" + eclipseVersion + "/plugins/";
+		
+		String indexData = readUrlAsString(updatePage);
+		
+		for (String pkg : packages) {
+			Matcher matcher = Pattern.compile("(" + pkg.replace(".", "\\.") + "_.*?\\.jar)").matcher(indexData);
+			if (matcher.find()) {
+				String path = matcher.group(1);
+				
+				try {
+					downloadFile(path, updatePage, pluginTarget);
+				} catch (Exception e) {
+				}
+				try {
+					int index = path.lastIndexOf("_");
+					String source = path.substring(0, index) + ".source" + path.substring(index);
+					downloadFile(source, updatePage, pluginTarget);
+				} catch (Exception e) {
+				}
+			} else {
+				System.out.println("Bundle \"" + pkg + "\" not found");
+			}
+		}
+		
+		writeEclipseLibrary(target, eclipseVersion);
+	}
+	
+	private static String readUrlAsString(String url) throws MalformedURLException, IOException {
+		InputStream in = getStreamForUrl(url);
+		
+		StringBuilder sb = new StringBuilder();
+		
+		int bufferSize = 1024;
+		char[] buffer = new char[bufferSize];
+		InputStreamReader reader = new InputStreamReader(in, "UTF-8");
+		for (int count = 0;  (count = reader.read(buffer, 0, bufferSize)) > 0;) {
+			sb.append(buffer, 0, count);
+		}
+		return sb.toString();
+	}
+	
+	private static void downloadFile(String filename, String repositoryUrl, String target) throws IOException {
+		Files.createDirectories(Paths.get(target));
+		Path targetFile = Paths.get(target, filename);
+		if (Files.exists(targetFile)) {
+			System.out.println("File '" + filename + "' already exists");
+			return;
+		}
+		System.out.print("Downloading '" + filename + "'... ");
+		try {
+			Files.copy(getStreamForUrl(repositoryUrl + filename), targetFile, StandardCopyOption.REPLACE_EXISTING);
+			System.out.println("[done]");
+		} catch(IOException e) {
+			System.out.println("[error]");
+		}
+	}
+	
+	private static InputStream getStreamForUrl(String url) throws IOException, MalformedURLException {
+		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+		connection.setRequestProperty("User-Agent", "lombok");
+		connection.setRequestProperty("Accept", "*/*");
+		InputStream in = new BufferedInputStream(connection.getInputStream());
+		return in;
+	}
+
+	private static void writeEclipseLibrary(String target, String eclipseVersion) throws IOException {
+		StringBuilder sb = new StringBuilder();
+		sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
+		sb.append("<eclipse-userlibraries version=\"2\">\n");
+		sb.append("<library name=\"");
+		sb.append(eclipseVersion);
+		sb.append("\" systemlibrary=\"false\">\n");
+		
+		File[] files = new File(new File(target, eclipseVersion), "plugins").listFiles(new FilenameFilter() {
+			@Override public boolean accept(File dir, String name) {
+				return name.endsWith(".jar") && !name.contains(".source_");
+			}
+		});
+		Arrays.sort(files);
+		
+		for (File file : files) {
+			sb.append("<archive path=\"");
+			sb.append(file.getAbsolutePath());
+			sb.append("\"");
+			
+			String path = file.getAbsolutePath();
+			int index = path.lastIndexOf("_");
+			
+			sb.append(" source=\"");
+			sb.append(path.substring(0, index) + ".source" + path.substring(index));
+			sb.append("\"");
+			
+			sb.append(" />\n");
+		}
+		
+		sb.append("</library>\n");
+		sb.append("</eclipse-userlibraries>\n");
+		
+		Files.writeString(Paths.get(target, eclipseVersion + ".userlibraries"), sb.toString());
+	}
+}
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 60a6e92a..8de9cd9c 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -289,6 +289,10 @@ public class RunTestsViaEcj extends AbstractRunTests {
 		@Override public char[][] getPackageName() {
 			return null;
 		}
+
+		@Override public boolean ignoreOptionalProblems() {
+			return false;
+		}
 	}
 	
 	private static final class TestCompilationUnitEclipse extends org.eclipse.jdt.internal.core.CompilationUnit {
@@ -324,7 +328,7 @@ public class RunTestsViaEcj extends AbstractRunTests {
 			return null;
 		}
 		
-		@Override public char[] getModuleName() {
+		public char[] getModuleName() {
 			return null;
 		}
 	}
diff --git a/test/eclipse/resource/cleanup/useThis/after/A.java b/test/eclipse/resource/cleanup/useThis/after/A.java
new file mode 100644
index 00000000..58913c6c
--- /dev/null
+++ b/test/eclipse/resource/cleanup/useThis/after/A.java
@@ -0,0 +1,18 @@
+package pkg;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.With;
+import lombok.experimental.WithBy;
+
+@Data
+@Builder
+@With
+@WithBy
+public class A {
+	private String string;
+	
+	public void a() {
+		this.string = "a";
+	}
+}
\ No newline at end of file
diff --git a/test/eclipse/resource/cleanup/useThis/before/A.java b/test/eclipse/resource/cleanup/useThis/before/A.java
new file mode 100644
index 00000000..2eb74ebe
--- /dev/null
+++ b/test/eclipse/resource/cleanup/useThis/before/A.java
@@ -0,0 +1,18 @@
+package pkg;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.With;
+import lombok.experimental.WithBy;
+
+@Data
+@Builder
+@With
+@WithBy
+public class A {
+	private String string;
+	
+	public void a() {
+		string = "a";
+	}
+}
\ No newline at end of file
diff --git a/test/eclipse/resource/extractinterface/simple/after/A.java b/test/eclipse/resource/extractinterface/simple/after/A.java
new file mode 100644
index 00000000..66744a22
--- /dev/null
+++ b/test/eclipse/resource/extractinterface/simple/after/A.java
@@ -0,0 +1,15 @@
+package pkg;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@EqualsAndHashCode
+@Getter
+@Setter
+@ToString
+public class A implements Interface {
+	private String string;
+	private int integer;
+}
\ No newline at end of file
diff --git a/test/eclipse/resource/extractinterface/simple/after/Interface.java b/test/eclipse/resource/extractinterface/simple/after/Interface.java
new file mode 100644
index 00000000..f7fa896d
--- /dev/null
+++ b/test/eclipse/resource/extractinterface/simple/after/Interface.java
@@ -0,0 +1,21 @@
+package pkg;
+
+public interface Interface {
+
+	boolean equals(java.lang.Object o);
+
+	boolean canEqual(java.lang.Object other);
+
+	int hashCode();
+
+	String getString();
+
+	int getInteger();
+
+	void setString(String string);
+
+	void setInteger(int integer);
+
+	java.lang.String toString();
+
+}
\ No newline at end of file
diff --git a/test/eclipse/resource/extractinterface/simple/before/A.java b/test/eclipse/resource/extractinterface/simple/before/A.java
new file mode 100644
index 00000000..87a6a8e4
--- /dev/null
+++ b/test/eclipse/resource/extractinterface/simple/before/A.java
@@ -0,0 +1,15 @@
+package pkg;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@EqualsAndHashCode
+@Getter
+@Setter
+@ToString
+public class A {
+	private String string;
+	private int integer;
+}
\ No newline at end of file
diff --git a/test/eclipse/resource/extractinterface/usage/after/A.java b/test/eclipse/resource/extractinterface/usage/after/A.java
new file mode 100644
index 00000000..66744a22
--- /dev/null
+++ b/test/eclipse/resource/extractinterface/usage/after/A.java
@@ -0,0 +1,15 @@
+package pkg;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Sett