Merge pull request #3262 from LorenzoBettini/lb_1072

Remove duplicate TemporaryFolders
eclipse-xtext · Nov 27, 2024 · 053d760 · 053d760
2 parents 4eebe72 + ad2befb
commit 053d760
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 566 deletions.
diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/AbstractXtendTestCase.java b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/AbstractXtendTestCase.java
@@ -18,7 +18,6 @@
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtend.core.tests.util.TemporaryFolder;
 import org.eclipse.xtend.core.xtend.XtendAnnotationType;
 import org.eclipse.xtend.core.xtend.XtendClass;
 import org.eclipse.xtend.core.xtend.XtendConstructor;
@@ -31,6 +30,7 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.testing.XtextRunner;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.LazyStringInputStream;

diff --git a/...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.xtend b/...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.xtend
@@ -18,7 +18,7 @@ import org.eclipse.xtend.lib.macro.CodeGenerationContext
 import org.eclipse.xtend.lib.macro.TransformationContext
 import org.eclipse.xtend.lib.macro.declaration.ClassDeclaration
 import org.eclipse.xtend.lib.macro.declaration.MutableClassDeclaration
-import org.eclipse.xtext.xbase.testing.TemporaryFolder
+import org.eclipse.xtext.testing.TemporaryFolder
 import org.eclipse.xtext.xbase.testing.CompilationTestHelper
 import org.junit.Rule
 import org.junit.Test

diff --git a/...tend.core.tests/src/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.xtend b/...tend.core.tests/src/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.xtend
@@ -22,12 +22,12 @@ import org.eclipse.xtend.core.validation.IssueCodes
 import org.eclipse.xtend.core.xtend.XtendFile
 import org.eclipse.xtend.core.xtend.XtendPackage
 import org.eclipse.xtext.diagnostics.Severity
+import org.eclipse.xtext.resource.XtextResource
+import org.eclipse.xtext.resource.XtextResourceSet
 import org.eclipse.xtext.testing.InjectWith
-import org.eclipse.xtend.core.tests.util.TemporaryFolder
+import org.eclipse.xtext.testing.TemporaryFolder
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.testing.validation.ValidationTestHelper
-import org.eclipse.xtext.resource.XtextResource
-import org.eclipse.xtext.resource.XtextResourceSet
 import org.eclipse.xtext.util.CancelIndicator
 import org.eclipse.xtext.validation.CheckMode
 import org.eclipse.xtext.validation.Issue

diff --git a/...clipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/JavaIoFileSystemTest.xtend b/...clipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/JavaIoFileSystemTest.xtend
@@ -14,9 +14,9 @@ import java.io.FileInputStream
 import org.eclipse.xtend.core.macro.JavaIOFileSystemSupport
 import org.eclipse.xtend.lib.macro.file.MutableFileSystemSupport
 import org.eclipse.xtend.lib.macro.file.Path
-import org.eclipse.xtext.xbase.testing.TemporaryFolder
 import org.eclipse.xtext.parser.IEncodingProvider
 import org.eclipse.xtext.resource.XtextResourceSet
+import org.eclipse.xtext.testing.TemporaryFolder
 import org.eclipse.xtext.workspace.FileProjectConfig
 import org.junit.Before
 import org.junit.Rule

diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/naming/NamingTest.java b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/naming/NamingTest.java
@@ -46,7 +46,7 @@ public class NamingTest extends AbstractXtendTestCase {
 
 	@Test public void testQualifiedNameProvider_1() throws Exception {
 		XtendFile file = file("package foo class Bar { def baz() {this} }");
-		XtendFunction function = (XtendFunction) ((XtendClass) file.getXtendTypes().get(0)).getMembers().get(0);
+		XtendFunction function = (XtendFunction) file.getXtendTypes().get(0).getMembers().get(0);
 		assertEquals(QualifiedName.create("foo", "Bar", "baz"), nameProvider.getFullyQualifiedName(function));
 		assertEquals(QualifiedName.create("foo", "Bar", "baz"),
 				nameProvider.getFullyQualifiedName(associations.getDirectlyInferredOperation(function)));

diff --git a/....xtend.core.tests/src/org/eclipse/xtend/core/tests/richstring/RichStringCompilerTest.java b/....xtend.core.tests/src/org/eclipse/xtend/core/tests/richstring/RichStringCompilerTest.java
@@ -8,8 +8,8 @@
  *******************************************************************************/
 package org.eclipse.xtend.core.tests.richstring;
 
-import org.eclipse.xtend.core.tests.util.TemporaryFolder;
 import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/util/TemporaryFolder.java b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/util/TemporaryFolder.java
diff --git a/...end.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.java b/...end.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.java
@@ -17,13 +17,13 @@
 import java.util.Objects;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.util.IAcceptor;
 import org.eclipse.xtext.xbase.lib.Conversions;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.testing.CompilationTestHelper;
-import org.eclipse.xtext.xbase.testing.TemporaryFolder;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.java b/...core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.java
@@ -20,7 +20,6 @@
 import org.eclipse.xtend.core.macro.AnnotationProcessor;
 import org.eclipse.xtend.core.macro.declaration.CompilationUnitImpl;
 import org.eclipse.xtend.core.tests.RuntimeInjectorProvider;
-import org.eclipse.xtend.core.tests.util.TemporaryFolder;
 import org.eclipse.xtend.core.validation.IssueCodes;
 import org.eclipse.xtend.core.xtend.XtendFile;
 import org.eclipse.xtend.core.xtend.XtendPackage;
@@ -29,6 +28,7 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.testing.XtextRunner;
 import org.eclipse.xtext.testing.validation.ValidationTestHelper;
 import org.eclipse.xtext.util.CancelIndicator;

diff --git a/...e.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/JavaIoFileSystemTest.java b/...e.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/JavaIoFileSystemTest.java
@@ -19,6 +19,7 @@
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.parser.IEncodingProvider;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.workspace.FileProjectConfig;
 import org.eclipse.xtext.workspace.IProjectConfigProvider;
 import org.eclipse.xtext.xbase.lib.Exceptions;
@@ -27,7 +28,6 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.ObjectExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-import org.eclipse.xtext.xbase.testing.TemporaryFolder;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/AbstractXtendTestCase.java b/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/AbstractXtendTestCase.java
@@ -31,12 +31,12 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.testing.XtextRunner;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.StringInputStream;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.Issue;
-import org.eclipse.xtext.xbase.testing.TemporaryFolder;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.runner.RunWith;

diff --git a/...eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/macros/JavaIoFileSystemTest.xtend b/...eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/macros/JavaIoFileSystemTest.xtend
@@ -16,8 +16,8 @@ import org.eclipse.xtend.lib.macro.file.MutableFileSystemSupport
 import org.eclipse.xtend.lib.macro.file.Path
 import org.eclipse.xtext.parser.IEncodingProvider
 import org.eclipse.xtext.resource.XtextResourceSet
+import org.eclipse.xtext.testing.TemporaryFolder
 import org.eclipse.xtext.workspace.FileProjectConfig
-import org.eclipse.xtext.xbase.testing.TemporaryFolder
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

diff --git a/...se.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/macros/JavaIoFileSystemTest.java b/...se.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/macros/JavaIoFileSystemTest.java
@@ -19,6 +19,7 @@
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.parser.IEncodingProvider;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.workspace.FileProjectConfig;
 import org.eclipse.xtext.workspace.IProjectConfigProvider;
 import org.eclipse.xtext.xbase.lib.Exceptions;
@@ -27,7 +28,6 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.ObjectExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-import org.eclipse.xtext.xbase.testing.TemporaryFolder;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...ilder.tests/src/org/eclipse/xtext/builder/builderState/AbstractEMFBasedPersisterTest.java b/...ilder.tests/src/org/eclipse/xtext/builder/builderState/AbstractEMFBasedPersisterTest.java
@@ -24,7 +24,7 @@
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.resource.IReferenceDescription;
 import org.eclipse.xtext.resource.IResourceDescription;
-import org.eclipse.xtext.tests.TemporaryFolder;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.ui.shared.SharedStateModule;
 import org.eclipse.xtext.util.EmfStructureComparator;
 import org.junit.Assert;

diff --git a/org.eclipse.xtext.purexbase.tests/src/org/eclipse/xtext/purexbase/tests/CompilerTest.java b/org.eclipse.xtext.purexbase.tests/src/org/eclipse/xtext/purexbase/tests/CompilerTest.java
@@ -11,10 +11,10 @@
 import java.io.IOException;
 
 import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.TemporaryFolder;
 import org.eclipse.xtext.testing.XtextRunner;
 import org.eclipse.xtext.util.Strings;
 import org.eclipse.xtext.xbase.testing.CompilationTestHelper;
-import org.eclipse.xtext.xbase.testing.TemporaryFolder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;