From 160d62f8be50f68722033fbb649847c182969796 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Mon, 11 Feb 2013 02:02:48 +0100 Subject: [PATCH] [xtext] Clean-up, Organize imports --- .../src/org/eclipse/xtext/mwe/AbstractReaderTest.java | 3 --- .../xtext/parsetree/formatter/FormatterTest.java | 1 - .../formatter/FormatterTestLanguageRuntimeModule.java | 1 - .../xtext/parsetree/formatter/XtextFormatterTest.java | 1 - .../org/eclipse/xtext/service/GenericModuleTest.java | 2 -- .../xtext/validation/DeclarativeValidatorTest.java | 10 ---------- .../eclipse/xtext/validation/ValidationTestHelper.java | 1 - .../org/eclipse/xtext/xtext/XtextValidationTest.java | 1 - 8 files changed, 20 deletions(-) diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java index 8bebd4a23..3d6952f29 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/AbstractReaderTest.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.List; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.mwe.core.WorkflowContext; import org.eclipse.emf.mwe.core.WorkflowContextDefaultImpl; import org.eclipse.emf.mwe.core.WorkflowInterruptedException; @@ -28,8 +27,6 @@ import org.eclipse.xtext.index.indexTestLanguage.IndexTestLanguagePackage; import org.eclipse.xtext.junit4.AbstractXtextTests; import org.junit.Test; -import com.google.common.base.Predicate; - /** * @author Sven Efftinge - Initial contribution and API */ diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java index 036198468..ef22d1535 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java @@ -23,7 +23,6 @@ import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic; import org.eclipse.xtext.serializer.sequencer.IHiddenTokenSequencer; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; -import org.junit.Ignore; import org.junit.Test; public class FormatterTest extends AbstractXtextTests { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java index 5b873154c..3155b4ddc 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageRuntimeModule.java @@ -5,7 +5,6 @@ package org.eclipse.xtext.parsetree.formatter; import org.eclipse.xtext.formatting.IFormatter; import org.eclipse.xtext.formatting.ILineSeparatorInformation; -import org.eclipse.xtext.formatting.IWhitespaceInformationProvider; /** * used to register components to be used within the IDE. diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java index 7f8894a48..5bdaa6688 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterTest.java @@ -7,7 +7,6 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.conversion.impl.DeclarativeValueConverterServiceTest; import org.eclipse.xtext.formatting.ILineSeparatorInformation; import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.Serializer; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java index 55a3397b1..499634608 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/GenericModuleTest.java @@ -192,7 +192,6 @@ public class GenericModuleTest extends Assert { Foo.instantiations = 0; AbstractGenericModule m = new AbstractGenericModule() { - @SuppressWarnings("unused") @SingletonBinding() public Class bindFoo() { return Foo.class; @@ -212,7 +211,6 @@ public class GenericModuleTest extends Assert { Foo.instantiations = 0; AbstractGenericModule m = new AbstractGenericModule() { - @SuppressWarnings("unused") @SingletonBinding(eager = true) public Class bindFoo() { return Foo.class; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java index 4db071fbd..681b5dcd8 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/DeclarativeValidatorTest.java @@ -20,8 +20,6 @@ import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceImpl; -import org.eclipse.xtext.XtextFactory; -import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.validation.ValidationTestHelper.TestChain; import org.junit.After; import org.junit.Assert; @@ -73,7 +71,6 @@ public class DeclarativeValidatorTest extends Assert { @SuppressWarnings("serial") @Test public void testSkipExpensive() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { - @SuppressWarnings("unused") @Check(CheckType.EXPENSIVE) public void bar(Object x) { error("fooObject", EcorePackage.Literals.ECLASS__EALL_ATTRIBUTES); @@ -110,7 +107,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testGuard() throws Exception { AbstractDeclarativeValidator validator = new AbstractDeclarativeValidator() { - @SuppressWarnings("unused") @Check public void guarded(EClass x) { guard("".equals(x.getName())); @@ -203,7 +199,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testError() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check - @SuppressWarnings("unused") public void foo(Object x) { error("Error Message", EcorePackage.Literals.ENAMED_ELEMENT__NAME); } @@ -221,7 +216,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testErrorWithSource() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check - @SuppressWarnings("unused") public void foo(Object x) { error( "Error Message", @@ -243,7 +237,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testErrorWithCode() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check - @SuppressWarnings("unused") public void foo(Object x) { error( "Error Message", @@ -267,7 +260,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testWarning() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check - @SuppressWarnings("unused") public void foo(Object x) { warning("Error Message", EcorePackage.Literals.ENAMED_ELEMENT__NAME); } @@ -285,7 +277,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testWarningWithSource() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check - @SuppressWarnings("unused") public void foo(Object x) { warning( "Error Message", @@ -307,7 +298,6 @@ public class DeclarativeValidatorTest extends Assert { @Test public void testWarningWithCode() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check - @SuppressWarnings("unused") public void foo(Object x) { warning( "Error Message", diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java index 470346682..6ad4b162f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidationTestHelper.java @@ -99,7 +99,6 @@ public class ValidationTestHelper { } } - @SuppressWarnings("unused") @Check private void foo(EClass x) { error("fooString", EcorePackage.Literals.ECLASS__ABSTRACT); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java index 58b680de4..cfa082dd7 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java @@ -41,7 +41,6 @@ import org.eclipse.xtext.TypeRef; import org.eclipse.xtext.UnorderedGroup; import org.eclipse.xtext.XtextFactory; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.diagnostics.Severity; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.StringInputStream; import org.eclipse.xtext.validation.AbstractValidationMessageAcceptingTestCase;