diff --git a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF index 60ee6920e..7729a1959 100644 --- a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext Junit4 Support Bundle-SymbolicName: org.eclipse.xtext.junit4 -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Vendor: Eclipse Modeling Project Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.xtext.junit4, diff --git a/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index 53e0f33ae..008544902 100644 --- a/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -1,15 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Xtext Generator Tests +Bundle-Name: Xtext Tests Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true -Bundle-Version: 2.2.1.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Vendor: Eclipse.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0", org.eclipse.xtext.generator;bundle-version="2.0.0", - org.junit;bundle-version="[3.0.0,4.0.0)", org.easymock;bundle-version="2.3.0", - org.eclipse.xtext.junit;bundle-version="2.0.0", org.eclipse.emf.mwe.utils;bundle-version="1.0.0", org.eclipse.xtext.util;bundle-version="2.0.0", org.eclipse.emf.ecore, @@ -18,9 +16,13 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0", org.eclipse.xtext.ecore;bundle-version="2.0.0", org.eclipse.emf.mwe2.launch;bundle-version="2.2.0";resolution:=optional, org.eclipse.xtext.testlanguages;bundle-version="2.0.0", - org.antlr.runtime + org.antlr.runtime, + org.eclipse.xtext.junit4;bundle-version="2.3.0" Bundle-ClassPath: lib/simple.jar,. -Import-Package: org.apache.log4j +Import-Package: org.apache.log4j, + org.junit;version="4.5.0", + org.junit.runner;version="4.5.0", + org.junit.runners;version="4.5.0" Export-Package: org.eclipse.xtext.generator.ecore, org.eclipse.xtext.generator.ecore.services, org.eclipse.xtext.generator.ecore.superPackage, diff --git a/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch b/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch index f949927e5..1e7b84abd 100644 --- a/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch +++ b/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java index b3181de57..08d1a077f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AllContentsPerformanceTest.java @@ -15,8 +15,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.util.concurrent.IUnitOfWork; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,39 +25,39 @@ import org.eclipse.xtext.util.concurrent.IUnitOfWork; public class AllContentsPerformanceTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } private static int LOOPS = 50 /* 000 */; - public void testDummy() { + @Test public void testDummy() { EcorePackage.eINSTANCE.getEAnnotation(); XtextPackage.eINSTANCE.getEAnnotations(); } - public void testEcore() { + @Test public void testEcore() { doTest(EcorePackage.eINSTANCE); } - public void testEcoreUoW() throws Exception { + @Test public void testEcoreUoW() throws Exception { doTestUoW(EcorePackage.eINSTANCE); } - public void testXtext() { + @Test public void testXtext() { doTest(XtextPackage.eINSTANCE); } - public void testXtextUoW() throws Exception { + @Test public void testXtextUoW() throws Exception { doTestUoW(XtextPackage.eINSTANCE); } - public void testXtextGrammar() { + @Test public void testXtextGrammar() { doTest(getGrammarAccess().getGrammar()); } - public void testXtextGrammarUoW() throws Exception { + @Test public void testXtextGrammarUoW() throws Exception { doTestUoW(getGrammarAccess().getGrammar()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java index 45924e61b..6af2ff5e6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/EcoreUtil2Test.java @@ -27,8 +27,9 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.util.Strings; +import org.junit.Test; import com.google.common.collect.Sets; @@ -51,7 +52,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { return result; } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { ResourceSet rs = new ResourceSetImpl(); Resource foo = rs.createResource(URI.createURI("foo.xmi"), ContentHandler.UNSPECIFIED_CONTENT_TYPE); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); @@ -62,7 +63,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertEquals(true, EcoreUtil2.isValidUri(ePackage, URI.createURI("bar.xmi"))); } - public void testEPackageURI() throws Exception { + @Test public void testEPackageURI() throws Exception { ResourceSet rs = new ResourceSetImpl(); Resource foo = rs.createResource(URI.createURI("foo.xmi"), ContentHandler.UNSPECIFIED_CONTENT_TYPE); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); @@ -71,7 +72,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertEquals(true, EcoreUtil2.isValidUri(ePackage, URI.createURI(EcorePackage.eNS_URI))); } - public void testClone() throws Exception { + @Test public void testClone() throws Exception { Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); EPackage.Registry.INSTANCE.put(EcorePackage.eINSTANCE.getNsURI(), EcorePackage.eINSTANCE); @@ -108,7 +109,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(b.getESuperTypes().get(0),a); } - public void testCommonCompatibleType01() { + @Test public void testCommonCompatibleType01() { EClass a = createEClass("a"); EClass b = createEClass("b"); EClass c = createEClass("c"); @@ -131,7 +132,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(EOBJECT, EcoreUtil2.getCompatibleType(b, c)); } - public void testCommonCompatibleType02() { + @Test public void testCommonCompatibleType02() { EClass a = createEClass("a"); EClass b = createEClass("b"); EClass c = createEClass("c"); @@ -152,7 +153,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(a, EcoreUtil2.getCompatibleType(d, e)); } - public void testGetCompatibleType_01() { + @Test public void testGetCompatibleType_01() { EDataType aString = createEDataType("a", String.class); EDataType anotherString = createEDataType("b", String.class); @@ -160,7 +161,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(anotherString, EcoreUtil2.getCompatibleType(anotherString, aString, null)); } - public void testGetCompatibleType_02() { + @Test public void testGetCompatibleType_02() { EDataType aString = createEDataType("a", String.class); EDataType anObject = createEDataType("b", Object.class); @@ -168,7 +169,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(anObject, EcoreUtil2.getCompatibleType(anObject, aString, null)); } - public void testGetCompatibleType_03() { + @Test public void testGetCompatibleType_03() { EDataType aCharSequence = createEDataType("a", CharSequence.class); EDataType anAppendable = createEDataType("b", Appendable.class); @@ -176,7 +177,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(null, EcoreUtil2.getCompatibleType(anAppendable, aCharSequence, null)); } - public void testGetCompatibleType_04() { + @Test public void testGetCompatibleType_04() { EDataType aString = createEDataType("a", String.class); EDataType anotherString = createEDataType("b", String.class); @@ -184,7 +185,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(anotherString, EcoreUtil2.getCompatibleType(anotherString, aString)); } - public void testGetCompatibleType_05() { + @Test public void testGetCompatibleType_05() { EDataType aString = createEDataType("a", String.class); EDataType anObject = createEDataType("b", Object.class); @@ -192,7 +193,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(anObject, EcoreUtil2.getCompatibleType(anObject, aString)); } - public void testGetCompatibleType_06() { + @Test public void testGetCompatibleType_06() { EDataType aCharSequence = createEDataType("a", CharSequence.class); EDataType anAppendable = createEDataType("b", Appendable.class); @@ -200,7 +201,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertSame(null, EcoreUtil2.getCompatibleType(anAppendable, aCharSequence)); } - public void testGetAllSuperTypesWithCycle() { + @Test public void testGetAllSuperTypesWithCycle() { EClass a = createEClass("a"); EClass b = createEClass("b"); b.getESuperTypes().add(a); @@ -215,7 +216,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { assertTrue(EcoreUtil2.getAllSuperTypes(b).contains(b)); } - public void testGetAllReferencedObjects() { + @Test public void testGetAllReferencedObjects() { EClass a = createEClass("a"); EClass b = createEClass("b"); @@ -240,7 +241,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { objA.eSet(ref, objB); } - public void testExternalFormOfEReference() throws Exception { + @Test public void testExternalFormOfEReference() throws Exception { Registry registry = EPackage.Registry.INSTANCE; Set uris = Sets.newHashSet(registry.keySet()); for (String string : uris) { @@ -260,7 +261,7 @@ public class EcoreUtil2Test extends AbstractXtextTests { /** * This test assumes that an EPackage with indexed references is no longer available. */ - public void testExternalFormOfEReferenceNoNPE() throws Exception { + @Test public void testExternalFormOfEReferenceNoNPE() throws Exception { EReference reference = EcorePackage.Literals.EATTRIBUTE__EATTRIBUTE_TYPE; URI uri = EcoreUtil.getURI(reference); String externalForm = uri.toString(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java index 0a4eae23c..4fe9d23be 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilGetReferenceTest.java @@ -8,7 +8,8 @@ package org.eclipse.xtext; import org.eclipse.emf.ecore.EReference; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -16,12 +17,12 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class GrammarUtilGetReferenceTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testGetReference_01() throws Exception { + @Test public void testGetReference_01() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: model=[Model];"; @@ -33,7 +34,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("Model", reference.getEContainingClass().getName()); } - public void testGetReference_02() throws Exception { + @Test public void testGetReference_02() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: {SubModel} model=[Model];"; @@ -47,7 +48,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("SubModel", reference.getEContainingClass().getName()); } - public void testGetReference_03() throws Exception { + @Test public void testGetReference_03() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: {SubModel1} model=[Model] | {SubModel2} model=[Model];"; @@ -62,7 +63,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("Model", reference.getEContainingClass().getName()); } - public void testGetReference_04() throws Exception { + @Test public void testGetReference_04() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: {SubModel1} model=[Model] | {SubModel2} model=[Model];"; @@ -77,7 +78,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("Model", reference.getEContainingClass().getName()); } - public void testGetReference_05() throws Exception { + @Test public void testGetReference_05() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: {SubModel1} model1=[Model] | {SubModel2} model2=[Model];"; @@ -92,7 +93,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("SubModel1", reference.getEContainingClass().getName()); } - public void testGetReference_06() throws Exception { + @Test public void testGetReference_06() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: {SubModel1} model1=[Model] | {SubModel2} model2=[Model];"; @@ -107,7 +108,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("SubModel2", reference.getEContainingClass().getName()); } - public void testGetReference_07() throws Exception { + @Test public void testGetReference_07() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: model1=[Model] & model2=[Model|STRING];"; @@ -121,7 +122,7 @@ public class GrammarUtilGetReferenceTest extends AbstractXtextTests { assertEquals("Model", reference.getEContainingClass().getName()); } - public void testGetReference_08() throws Exception { + @Test public void testGetReference_08() throws Exception { String grammarAsString = "grammar foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + "Model: {SubModel} (model1=[Model] & model2=[Model|STRING]);"; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.java index 4f6aabf0c..f2650da6b 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GrammarUtilTest.java @@ -12,10 +12,12 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; +import org.eclipse.xtext.linking.langATestLanguage.Main; import org.eclipse.xtext.linking.services.LangATestLanguageGrammarAccess; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API @@ -23,7 +25,7 @@ import org.eclipse.xtext.resource.XtextResource; */ public class GrammarUtilTest extends AbstractXtextTests { - public void testAllMetamodelDeclarations_01() throws Exception { + @Test public void testAllMetamodelDeclarations_01() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar foo with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + @@ -48,7 +50,7 @@ public class GrammarUtilTest extends AbstractXtextTests { assertEquals("http://3", decl.getEPackage().getNsURI()); } - public void testAllMetamodelDeclarations_02() throws Exception { + @Test public void testAllMetamodelDeclarations_02() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar foo with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' as bar " + @@ -80,7 +82,7 @@ public class GrammarUtilTest extends AbstractXtextTests { assertSame(decls.get(1), abstractRule.getType().getMetamodel()); } - public void testAllMetamodelDeclarations_03() throws Exception { + @Test public void testAllMetamodelDeclarations_03() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar foo with org.eclipse.xtext.common.Terminals " + "generate g 'http://3' as bar " + @@ -113,14 +115,14 @@ public class GrammarUtilTest extends AbstractXtextTests { assertSame(decls.get(0), abstractRule.getType().getMetamodel()); } - public void testGetReference() throws Exception { + @Test public void testGetReference() throws Exception { with(LangATestLanguageStandaloneSetup.class); XtextResource resource = getResourceFromStringAndExpect("type A extends B", 1); Assignment asExtends = get(LangATestLanguageGrammarAccess.class).getTypeAccess().getExtendsAssignment_2_1(); CrossReference xref = (CrossReference) asExtends.getTerminal(); - EObject model = getModel(resource); - EObject typeA = (EObject) invokeWithXtend("types.first()", model); + Main model = (Main) getModel(resource); + EObject typeA = model.getTypes().get(0); EReference ref = GrammarUtil.getReference(xref, typeA.eClass()); assertNotNull(ref); assertEquals("extends", ref.getName()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java index e63534735..c88e85dac 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/XtextGrammarTest.java @@ -9,8 +9,10 @@ package org.eclipse.xtext; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; +import org.eclipse.xtext.xtextTest.Assignment; +import org.eclipse.xtext.xtextTest.Grammar; /** * @author Sven Efftinge - Initial contribution and API @@ -19,15 +21,15 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class XtextGrammarTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextGrammarTestLanguageStandaloneSetup.class); } - public void testInstantiate() throws Exception { - EObject grammar = getModelAndExpect("grammar foo generate foo 'bar' Foo : name=ID;", 2); - assertWithXtend("'Foo'","rules.first().name",grammar); - assertWithXtend("'name'","rules.first().alternatives.feature",grammar); + @Test public void testInstantiate() throws Exception { + Grammar grammar = (Grammar) getModelAndExpect("grammar foo generate foo 'bar' Foo : name=ID;", 2); + assertEquals("Foo", grammar.getRules().get(0).getName()); + assertEquals("name", ((Assignment) grammar.getRules().get(0).getAlternatives()).getFeature()); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java index c8a50b013..d64d7c466 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/actions/AntlrParserTest.java @@ -7,7 +7,7 @@ *******************************************************************************/ package org.eclipse.xtext.actions; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; @@ -19,6 +19,7 @@ import org.eclipse.xtext.testlanguages.actionLang.ActionLangPackage; import org.eclipse.xtext.testlanguages.actionLang.Model; import org.eclipse.xtext.testlanguages.actionLang.Parent; import org.eclipse.xtext.testlanguages.services.ActionTestLanguageGrammarAccess; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -31,7 +32,7 @@ public class AntlrParserTest extends AbstractXtextTests { private ParserTestHelper helper; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ActionTestLanguageStandaloneSetup.class); grammarAccess = get(ActionTestLanguageGrammarAccess.class); @@ -39,7 +40,7 @@ public class AntlrParserTest extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { grammarAccess = null; super.tearDown(); } @@ -55,7 +56,7 @@ public class AntlrParserTest extends AbstractXtextTests { * LeafNode (GrammarElement: RuleCall[ID], Element: null) * */ - public void testParseWithoutActionCall() throws Exception { + @Test public void testParseWithoutActionCall() throws Exception { XtextResource resource = helper.getResourceFromString("myID"); assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -91,7 +92,7 @@ public class AntlrParserTest extends AbstractXtextTests { * LeafNode (GrammarElement: RuleCall[ID], Element: null) * */ - public void testParseWithActionCall() throws Exception { + @Test public void testParseWithActionCall() throws Exception { XtextResource resource = helper.getResourceFromString("myID otherID"); assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java index bb1b7535d..f27f18aab 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/common/services/DefaultTerminalConverterTest.java @@ -8,18 +8,18 @@ *******************************************************************************/ package org.eclipse.xtext.common.services; -import junit.framework.TestCase; - import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.conversion.impl.INTValueConverter; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API */ -public class DefaultTerminalConverterTest extends TestCase { +public class DefaultTerminalConverterTest extends Assert { - public void testINT() throws Exception { + @Test public void testINT() throws Exception { IValueConverter valueConverter = new INTValueConverter(); try { valueConverter.toValue("", null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java index a3ff7964c..9fd080817 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/concurrent/ReadWriteAccessTest.java @@ -14,20 +14,20 @@ import java.util.List; import org.eclipse.xtext.util.concurrent.AbstractReadWriteAcces; import org.eclipse.xtext.util.concurrent.IUnitOfWork; - -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API * */ -public class ReadWriteAccessTest extends TestCase { +public class ReadWriteAccessTest extends Assert { public static class Foo { public String val = "foo"; } - public void testModifyAndRead() throws Exception { + @Test public void testModifyAndRead() throws Exception { final Foo foo = new Foo(); final AbstractReadWriteAcces access = new AbstractReadWriteAcces() { @Override diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java index ea943ab0e..1d7c5d6f7 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/conversion/impl/DeclarativeValueConverterServiceTest.java @@ -12,8 +12,9 @@ import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.conversion.ValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.INode; +import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Inject; @@ -87,7 +88,7 @@ public class DeclarativeValueConverterServiceTest extends AbstractXtextTests { private String expectedIdent = null; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new XtextStandaloneSetup() { @Override @@ -111,19 +112,19 @@ public class DeclarativeValueConverterServiceTest extends AbstractXtextTests { assertEquals(expectedIdent, ident); } - public void testSimpleIdConverter() { + @Test public void testSimpleIdConverter() { IValueConverterService converter = get(SimpleIdConverter.class); expectedIdent = "idConverter"; converter.toValue("Foo", "ID", null); } - public void testOverriddenIdConverter() { + @Test public void testOverriddenIdConverter() { IValueConverterService converter = get(OverriddenIdConverter.class); expectedIdent = "overriddenIdConverter"; converter.toString("Foo", "ID"); } - public void testDuplicateConverters() { + @Test public void testDuplicateConverters() { IValueConverterService converter = get(DuplicateConverters.class); try { converter.toString("Foo", "unknown"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java index fff290c6a..bd66c848c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/documentation/impl/MultiLineCommentDocumentationProviderTest.java @@ -13,7 +13,8 @@ package org.eclipse.xtext.documentation.impl; import org.eclipse.xtext.dummy.DummyTestLanguageStandaloneSetup; import org.eclipse.xtext.dummy.dummyLang.Element; import org.eclipse.xtext.dummy.dummyLang.Model; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Christoph Kulla - Initial contribution and API @@ -25,7 +26,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest final String document = "element A;"; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DummyTestLanguageStandaloneSetup.class); } @@ -47,7 +48,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest return mlcdp.getDocumentation(element); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String documentation = getComment ( "/**\n" + "* " + expectedDocumentation + "\n" + @@ -56,7 +57,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testMissingStartTag() throws Exception { + @Test public void testMissingStartTag() throws Exception { String documentation = getComment ( "/*\n" + "* " + expectedDocumentation + "\n" + @@ -65,7 +66,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testRect() throws Exception { + @Test public void testRect() throws Exception { String documentation = getComment ( "/********************************************\n" + " ** **\n" + @@ -76,7 +77,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testWhitespace() throws Exception { + @Test public void testWhitespace() throws Exception { String documentation = getComment ( " \t \t /***\n" + "** " + expectedDocumentation + " \t \t ** \t \t \n" + @@ -85,7 +86,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testWithSingleLineComment() throws Exception { + @Test public void testWithSingleLineComment() throws Exception { String documentation = getComment ( "/**\n" + "* " + expectedDocumentation + "\n" + @@ -95,7 +96,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testMultipleCommentsForOneObject() throws Exception { + @Test public void testMultipleCommentsForOneObject() throws Exception { String documentation = getComment ( "/**\n" + "* " + expectedDocumentation + "2\n" + @@ -107,7 +108,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testMultipleComments() throws Exception { + @Test public void testMultipleComments() throws Exception { String s = "/**\n" + "* " + expectedDocumentation + "\n" + "*/\n" + @@ -117,7 +118,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals (expectedDocumentation, documentation); } - public void testMultipleMultiLineComments() throws Exception { + @Test public void testMultipleMultiLineComments() throws Exception { String documentation = getComment ("/**\n" + "* " + expectedDocumentation + "\n" + "*/\n" + @@ -126,7 +127,7 @@ public class MultiLineCommentDocumentationProviderTest extends AbstractXtextTest assertEquals ("", documentation); } - public void testNoComment() throws Exception { + @Test public void testNoComment() throws Exception { String documentation = getComment (document); assertNull (documentation); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java index 757e8a656..8a5f5c91d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/ecore/EcoreSupportTest.java @@ -9,14 +9,13 @@ package org.eclipse.xtext.ecore; import org.eclipse.xtext.resource.IResourceServiceProvider; import org.eclipse.xtext.resource.impl.ResourceServiceProviderRegistryImpl; - -import junit.framework.TestCase; - +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API */ -public class EcoreSupportTest extends TestCase { +public class EcoreSupportTest extends Assert { /** * @author Sven Efftinge - Initial contribution and API @@ -33,7 +32,7 @@ public class EcoreSupportTest extends TestCase { } } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { final ResourceServiceProviderRegistryImpl registry = new ResourceServiceProviderRegistryImpl(); EcoreSupport support = new EcoreSupport(); support.setGuiceModule(new EcoreRuntimeModuleForTest(registry)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java index edfcd2c80..9a7d2a2ec 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/AbstractEnumRulesTest.java @@ -9,7 +9,7 @@ package org.eclipse.xtext.enumrules; import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.enumrules.enums.EnumsPackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,7 +17,7 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public abstract class AbstractEnumRulesTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); EnumsPackage pack = EnumsPackage.eINSTANCE; EPackage.Registry.INSTANCE.put(pack.getNsURI(), pack); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java index 9a469e160..2df422bbf 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/EnumAndReferenceTest.java @@ -8,10 +8,11 @@ package org.eclipse.xtext.enumrules; import org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.EntityWithEnumAndReference; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.parser.ParserTestHelper; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -20,19 +21,19 @@ public class EnumAndReferenceTest extends AbstractXtextTests { private ParserTestHelper helper; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EnumAndReferenceTestLanguageStandaloneSetup.class); helper = new ParserTestHelper(getResourceFactory(), getParser(), get(Keys.RESOURCE_SET_KEY),getCurrentFileExtension()); } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { helper = null; super.tearDown(); } - public void testSemantic() throws Exception { + @Test public void testSemantic() throws Exception { String modelAsString = "kindOfKeyword Hoo reference Hoo"; EntityWithEnumAndReference model = (EntityWithEnumAndReference) helper.getModel(modelAsString); assertNotNull(model); @@ -41,7 +42,7 @@ public class EnumAndReferenceTest extends AbstractXtextTests { assertEquals(model, model.getRef()); } - public void testNodes() throws Exception { + @Test public void testNodes() throws Exception { String modelAsString = "kindOfKeyword Hoo reference Hoo"; EntityWithEnumAndReference model = (EntityWithEnumAndReference) helper.getModel(modelAsString); ICompositeNode node = NodeModelUtils.getNode(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java index 9c67d3422..b5715dfee 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java @@ -19,6 +19,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.enumrules.enums.ExistingEnum; import org.eclipse.xtext.xtext.ecoreInference.TransformationDiagnostic; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -26,7 +27,7 @@ import org.eclipse.xtext.xtext.ecoreInference.TransformationDiagnostic; public class GrammarParserTest extends AbstractEnumRulesTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -38,7 +39,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { } } - public void testEnum_01() throws Exception { + @Test public void testEnum_01() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/AbstractEnumRulesTest/TestEnum/1'\n" + @@ -58,7 +59,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("Value1", value.getLiteral()); } - public void testEnum_02() throws Exception { + @Test public void testEnum_02() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/AbstractEnumRulesTest/TestEnum/2'\n" + @@ -78,7 +79,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("Value1", value.getLiteral()); } - public void testEnum_03() throws Exception { + @Test public void testEnum_03() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/AbstractEnumRulesTest/TestEnum/3'\n" + @@ -98,7 +99,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("value", value.getLiteral()); } - public void testEnum_04() throws Exception { + @Test public void testEnum_04() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -126,7 +127,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals(value.getLiteral(), decl.getLiteral().getValue()); } - public void testEnum_05() throws Exception { + @Test public void testEnum_05() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -154,7 +155,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("value", decl.getLiteral().getValue()); } - public void testEnum_06() throws Exception { + @Test public void testEnum_06() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/AbstractEnumRulesTest/TestEnum/6'\n" + @@ -184,7 +185,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("Value3", value.getLiteral()); } - public void testEnum_07() throws Exception { + @Test public void testEnum_07() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/AbstractEnumRulesTest/TestEnum/7'\n" + @@ -204,7 +205,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("Value", value.getLiteral()); } - public void testEnum_08() throws Exception { + @Test public void testEnum_08() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/AbstractEnumRulesTest/TestEnum/8'\n" + @@ -224,7 +225,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("Value", value.getLiteral()); } - public void testEnum_09() throws Exception { + @Test public void testEnum_09() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.common.Terminals\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -238,7 +239,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals(modelAsString.lastIndexOf("Absent"), offset); } - public void testEnum_10() throws Exception { + @Test public void testEnum_10() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -266,7 +267,7 @@ public class GrammarParserTest extends AbstractEnumRulesTest { assertEquals("SameName", decl.getLiteral().getValue()); } - public void testEnum_11() throws Exception { + @Test public void testEnum_11() throws Exception { String modelAsString = "grammar TestLanguage with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore' as existing\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java index 9733b4964..8f943ab21 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/ParserTest.java @@ -13,6 +13,7 @@ import org.eclipse.xtext.enumrules.enumRulesTestLanguage.Model; import org.eclipse.xtext.enumrules.enums.EnumsPackage; import org.eclipse.xtext.enumrules.enums.ExistingEnum; import org.eclipse.xtext.parser.ParserTestHelper; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -22,19 +23,19 @@ public class ParserTest extends AbstractEnumRulesTest { private ParserTestHelper helper; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EnumRulesTestLanguageStandaloneSetup.class); helper = new ParserTestHelper(getResourceFactory(), getParser(), get(Keys.RESOURCE_SET_KEY),getCurrentFileExtension()); } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { helper = null; super.tearDown(); } - public void testParseSameName() throws Exception { + @Test public void testParseSameName() throws Exception { String modelAsString = "existing SameName"; Model model = (Model) helper.getModel(modelAsString); assertNotNull(model); @@ -42,7 +43,7 @@ public class ParserTest extends AbstractEnumRulesTest { assertEquals(EnumRulesTestLanguagePackage.Literals.GENERATED_ENUM.getDefaultValue(), model.getGenerated()); } - public void testParseSameName2() throws Exception { + @Test public void testParseSameName2() throws Exception { String modelAsString = "generated SameName"; Model model = (Model) helper.getModel(modelAsString); assertNotNull(model); @@ -50,7 +51,7 @@ public class ParserTest extends AbstractEnumRulesTest { assertEquals(EnumsPackage.Literals.EXISTING_ENUM.getDefaultValue(), model.getExisting()); } - public void testParseOverridden() throws Exception { + @Test public void testParseOverridden() throws Exception { String modelAsString = "existing overridden"; Model model = (Model) helper.getModel(modelAsString); assertNotNull(model); @@ -58,7 +59,7 @@ public class ParserTest extends AbstractEnumRulesTest { assertEquals(EnumRulesTestLanguagePackage.Literals.GENERATED_ENUM.getDefaultValue(), model.getGenerated()); } - public void testParseDifferentName() throws Exception { + @Test public void testParseDifferentName() throws Exception { String modelAsString = "existing DifferentLiteral"; Model model = (Model) helper.getModel(modelAsString); assertNotNull(model); @@ -66,7 +67,7 @@ public class ParserTest extends AbstractEnumRulesTest { assertEquals(EnumRulesTestLanguagePackage.Literals.GENERATED_ENUM.getDefaultValue(), model.getGenerated()); } - public void testParseDifferentName2() throws Exception { + @Test public void testParseDifferentName2() throws Exception { String modelAsString = "generated DifferentLiteral"; Model model = (Model) helper.getModel(modelAsString); assertNotNull(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java index 2b7e09ab4..e41ecdd73 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/SerializationTest.java @@ -13,6 +13,7 @@ import org.eclipse.xtext.enumrules.enumRulesTestLanguage.Model; import org.eclipse.xtext.enumrules.enums.ExistingEnum; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,7 +25,7 @@ public class SerializationTest extends AbstractEnumRulesTest { private Model model; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EnumRulesTestLanguageStandaloneSetup.class); resourceSet = get(XtextResourceSet.class); @@ -35,7 +36,7 @@ public class SerializationTest extends AbstractEnumRulesTest { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { model = null; resource = null; resourceSet = null; @@ -53,7 +54,7 @@ public class SerializationTest extends AbstractEnumRulesTest { assertEquals("generated SameName", result); } - public void testSerialize_02() throws Exception { + @Test public void testSerialize_02() throws Exception { model.setExisting(ExistingEnum.DIFFERENT_NAME); String result = serialize(model); assertEquals("existing DifferentLiteral", result); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java index 0083ec2d9..2cd165bd9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/AbstractLargeMetamodelTest.java @@ -9,7 +9,7 @@ package org.eclipse.xtext.generator; //import org.eclipse.xtext.generator.generatorTestLanguage.GeneratorTestLanguagePackage; //import org.eclipse.xtext.generator.generatorTestLanguage.Rule; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,17 +17,17 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public abstract class AbstractLargeMetamodelTest extends AbstractXtextTests { // @Override -// protected void setUp() throws Exception { +// public void setUp() throws Exception { // super.setUp(); // with(GeneratorTestLanguageStandaloneSetup.class); // } // -// public void testRuleClass() { +// @Test public void testRuleClass() { // Class ruleClass = Rule.class; // assertNotNull(ruleClass); // } // -// public void testEPackage() { +// @Test public void testEPackage() { // GeneratorTestLanguagePackage instance = GeneratorTestLanguagePackage.eINSTANCE; // assertNotNull(instance); // } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java index d19a9e03e..273fffd89 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/CompositeGeneratorFragmentTest.java @@ -9,16 +9,16 @@ package org.eclipse.xtext.generator; import java.util.Set; -import junit.framework.TestCase; - import org.eclipse.xtext.Grammar; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API */ -public class CompositeGeneratorFragmentTest extends TestCase { +public class CompositeGeneratorFragmentTest extends Assert { - public void testFinalBindingsPersist() throws Exception { + @Test public void testFinalBindingsPersist() throws Exception { CompositeGeneratorFragment fragment = new CompositeGeneratorFragment(); fragment.addFragment(new DefaultGeneratorFragment() { @Override @@ -45,7 +45,7 @@ public class CompositeGeneratorFragmentTest extends TestCase { assertEquals("BAR", bindings.iterator().next().getValue().getTypeName()); } - public void testNonFinalBindingsOverride() throws Exception { + @Test public void testNonFinalBindingsOverride() throws Exception { CompositeGeneratorFragment fragment = new CompositeGeneratorFragment(); fragment.addFragment(new DefaultGeneratorFragment() { @Override @@ -72,7 +72,7 @@ public class CompositeGeneratorFragmentTest extends TestCase { assertEquals("FOO", bindings.iterator().next().getValue().getTypeName()); } - public void testFinalBindingsConflict() throws Exception { + @Test public void testFinalBindingsConflict() throws Exception { CompositeGeneratorFragment fragment = new CompositeGeneratorFragment(); fragment.addFragment(new DefaultGeneratorFragment() { @Override diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java index dc8d6c0ff..38667c99e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaFileTest.java @@ -7,16 +7,16 @@ *******************************************************************************/ package org.eclipse.xtext.generator; -import junit.framework.TestCase; - import org.eclipse.xtext.generator.serializer.JavaFile; +import org.junit.Assert; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class JavaFileTest extends TestCase { +public class JavaFileTest extends Assert { - public void testMain() { + @Test public void testMain() { JavaFile file = new JavaFile("foo"); assertEquals("Foo", file.imported("foo.Foo")); assertEquals("bar.Foo", file.imported("bar.Foo")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java index dd6e5bae0..67520311b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java @@ -11,14 +11,15 @@ import java.io.File; import org.eclipse.emf.common.util.URI; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class JavaIoFileSystemAccessTest extends TestCase { +public class JavaIoFileSystemAccessTest extends Assert { - public void testDirsAreCreated() throws Exception { + @Test public void testDirsAreCreated() throws Exception { String tempDir = System.getProperties().getProperty("java.io.tmpdir") + File.separator; File tmpDir = new File(tempDir); JavaIoFileSystemAccess fileSystemAccess = new JavaIoFileSystemAccess(); @@ -34,7 +35,7 @@ public class JavaIoFileSystemAccessTest extends TestCase { dir.delete(); } - public void testURI() throws Exception { + @Test public void testURI() throws Exception { JavaIoFileSystemAccess fileSystemAccess = new JavaIoFileSystemAccess(); fileSystemAccess.setOutputPath("testOutput", "/testDir"); URI uri = fileSystemAccess.getURI("testFile", "testOutput"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java index f1b507ab2..296a20609 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ManifestMergerTest.java @@ -16,19 +16,19 @@ import java.util.LinkedHashSet; import java.util.jar.Attributes; import java.util.jar.Manifest; -import junit.framework.TestCase; - import org.eclipse.xtext.util.MergeableManifest; import org.eclipse.xtext.util.StringInputStream; import org.eclipse.xtext.util.Wrapper; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API * */ -public class ManifestMergerTest extends TestCase { +public class ManifestMergerTest extends Assert { - public void testMergeRequiredBundles() throws Exception { + @Test public void testMergeRequiredBundles() throws Exception { String packageName = getClass().getPackage().getName().replace('.', '/'); InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF"); MergeableManifest manifest = new MergeableManifest(resourceAsStream); @@ -39,7 +39,7 @@ public class ManifestMergerTest extends TestCase { assertEquals(before + ",foo.bar.baz", after.replaceAll("\\s","")); } - public void testMergeExportedPackages() throws Exception { + @Test public void testMergeExportedPackages() throws Exception { String packageName = getClass().getPackage().getName().replace('.', '/'); InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF"); MergeableManifest manifest = new MergeableManifest(resourceAsStream); @@ -55,7 +55,7 @@ public class ManifestMergerTest extends TestCase { assertFalse(manifest.isModified()); } - public void testNoLongLine() throws Exception { + @Test public void testNoLongLine() throws Exception { String packageName = getClass().getPackage().getName().replace('.', '/'); InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF"); MergeableManifest manifest = new MergeableManifest(resourceAsStream); @@ -73,7 +73,7 @@ public class ManifestMergerTest extends TestCase { assertEquals(result, ' ', result.charAt(idx + 2)); } - public void testSplit512Length() throws Exception { + @Test public void testSplit512Length() throws Exception { String packageName = getClass().getPackage().getName().replace('.', '/'); InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF"); MergeableManifest manifest = new MergeableManifest(resourceAsStream); @@ -91,7 +91,7 @@ public class ManifestMergerTest extends TestCase { } } - public void testNoChanges() throws Exception { + @Test public void testNoChanges() throws Exception { String packageName = getClass().getPackage().getName().replace('.', '/'); InputStream resourceAsStream = getClass().getResourceAsStream("/" + packageName + "/Test_Manifest.MF"); MergeableManifest manifest = new MergeableManifest(resourceAsStream); @@ -102,7 +102,7 @@ public class ManifestMergerTest extends TestCase { assertEquals(before + ",foo.bar.baz", after.replaceAll("\\s","")); } - public void testMergeIntoCommaSeparatedList() throws Exception { + @Test public void testMergeIntoCommaSeparatedList() throws Exception { LinkedHashSet toMerge = new LinkedHashSet(); toMerge.add("foo"); toMerge.add("bar"); @@ -123,7 +123,7 @@ public class ManifestMergerTest extends TestCase { return s==null?null:s.replaceAll("\\s", ""); } - public void testMergeIntoCommaSeparatedListWithParams() throws Exception { + @Test public void testMergeIntoCommaSeparatedListWithParams() throws Exception { LinkedHashSet toMerge = new LinkedHashSet(); toMerge.add("foo"); toMerge.add("bar"); @@ -135,7 +135,7 @@ public class ManifestMergerTest extends TestCase { "bar;special=foo , x", toMerge, Wrapper.wrap(false)))); } - public void testMergeIntoCommaSeparatedListWithCommaSeparatedParams() throws Exception { + @Test public void testMergeIntoCommaSeparatedListWithCommaSeparatedParams() throws Exception { LinkedHashSet toMerge = new LinkedHashSet(); toMerge.add("foo"); toMerge.add("bar"); @@ -145,7 +145,7 @@ public class ManifestMergerTest extends TestCase { "bar;x-friends=\"xxx,foo,bar,zzz\"", toMerge, Wrapper.wrap(false)))); } - public void testMergeIntoCommaSeparatedListInvalidParam() throws Exception { + @Test public void testMergeIntoCommaSeparatedListInvalidParam() throws Exception { LinkedHashSet toMerge = new LinkedHashSet(); toMerge.add("foo;foo=version"); toMerge.add("bar"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java index cb3fb4b77..4b7bdbfc5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTestGenerator.java @@ -43,17 +43,17 @@ public class GenModelAccessTestGenerator extends AbstractWorkflowComponent2 { print.println(); print.println("import org.eclipse.xtext.generator.ecore.genmodelaccess.nestedPackage1.NestedPackage1Package;"); print.println("import org.eclipse.xtext.generator.ecore.genmodelaccess.noLiterals.NoLiteralsPackage;"); - print.println("import junit.framework.TestCase;"); - print.println("import junit.framework.Assert;"); + print.println("import org.junit.Assert;"); + print.println("import org.junit.Test;"); print.println(); - print.println("public abstract class AccessTest extends TestCase {"); + print.println("public abstract class AccessTest extends Assert {"); EClass rootClass = (EClass) root.getEClassifier("RootClass"); EReference rootRef = (EReference) rootClass.getEStructuralFeature("reference1"); EAttribute rootAttr = (EAttribute) rootClass.getEStructuralFeature("attribute1"); EDataType rootDataType = (EDataType) root.getEClassifier("RootDataType"); EEnum rootEnum = (EEnum) root.getEClassifier("RootEnum"); - print.println(" public void testRootPackage() {"); + print.println(" @Test public void testRootPackage() {"); print.println(" Assert.assertNotNull(" + GenModelAccess.getGenTypeLiteral(root, rs) + ");"); print.println(" Assert.assertNotNull(" + GenModelAccess.getGenTypeLiteral(rootClass, rs) + ");"); print.println(" Assert.assertNotNull(" + GenModelAccess.getGenTypeLiteral(rootDataType, rs) + ");"); @@ -69,7 +69,7 @@ public class GenModelAccessTestGenerator extends AbstractWorkflowComponent2 { EPackage nested = root.getESubpackages().get(0); EClass nestedClass = (EClass) nested.getEClassifier("NestedClass1"); - print.println(" public void testNestedPackage() {"); + print.println(" @Test public void testNestedPackage() {"); print.println(" Assert.assertNotNull(" + GenModelAccess.getGenTypeLiteral(nested, rs) + ");"); print.println(" Assert.assertNotNull(" + GenModelAccess.getGenTypeLiteral(nestedClass, rs) + ");"); print.println(" Assert.assertEquals(0," + GenModelAccess.getGenIntLiteral(nestedClass, rs) + ");"); @@ -81,7 +81,7 @@ public class GenModelAccessTestGenerator extends AbstractWorkflowComponent2 { EReference noLitRef = (EReference) noLitClass.getEStructuralFeature("reference2"); EAttribute noLitAttr = (EAttribute) noLitClass.getEStructuralFeature("attribute2"); EDataType noLitEnum = (EDataType) noLit.getEClassifier("NoLitEnum"); - print.println(" public void testNoLiteralPackage() {"); + print.println(" @Test public void testNoLiteralPackage() {"); print.println(" Assert.assertNotNull(" + GenModelAccess.getGenTypeLiteral(noLit, rs) + ");"); print.println(" Assert.assertFalse(" + GenModelAccess.getGenPackage(noLit, rs).isLiteralsInterface() + ");"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java index e76c9b296..a18adcddc 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ElementFinderTest.java @@ -14,9 +14,10 @@ import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API @@ -24,7 +25,7 @@ import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFin public class ElementFinderTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -41,25 +42,25 @@ public class ElementFinderTest extends AbstractXtextTests { }; } - public void testKeywords() { + @Test public void testKeywords() { assertEquals(3, grammarFinder().findKeywords("myKeyword", "myKeyword2").size()); } - public void testKeywordsFromSuperGrammar() { + @Test public void testKeywordsFromSuperGrammar() { assertEquals(1, grammarFinder().findKeywords("superKeyword").size()); } - public void testKeywordPairs() { + @Test public void testKeywordPairs() { assertEquals(3, grammarFinder().findKeywordPairs("begin", "end").size()); } - public void testFindRuleCalls() { + @Test public void testFindRuleCalls() { AbstractGrammarElementFinder f = grammarFinder(); AbstractRule r = GrammarUtil.findRuleForName(f.getGrammar(), "FinderKeywords"); assertEquals(2, f.findRuleCalls(r).size()); } - public void testFindCrossReferences() { + @Test public void testFindCrossReferences() { AbstractGrammarElementFinder f = grammarFinder(); AbstractRule r = GrammarUtil.findRuleForName(f.getGrammar(), "FQN"); assertNotNull(r); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java index 8f343ba71..2c4d61e41 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/FragmentFakingEcoreResourceTest.java @@ -16,8 +16,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.AsubpackagePackage; import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.emptyPackage.subsubpackage.SubsubpackagePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -27,7 +28,7 @@ public class FragmentFakingEcoreResourceTest extends AbstractXtextTests { private EPackage metamodel; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); XtextResourceSet set = new XtextResourceSet(); set.setClasspathURIContext(getClass()); @@ -36,12 +37,12 @@ public class FragmentFakingEcoreResourceTest extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { metamodel = null; super.tearDown(); } - public void testFakedURIs_01() { + @Test public void testFakedURIs_01() { ResourceSaveIndicator indicator = new ResourceSaveIndicator(); EPackage sub = metamodel.getESubpackages().get(0); Resource resource = new FragmentFakingEcoreResource(URI.createURI(sub.getNsURI()), indicator); @@ -65,7 +66,7 @@ public class FragmentFakingEcoreResourceTest extends AbstractXtextTests { } } - public void testFakedURIs_02() { + @Test public void testFakedURIs_02() { ResourceSaveIndicator indicator = new ResourceSaveIndicator(); EPackage sub = metamodel.getESubpackages().get(0); Resource resource = new FragmentFakingEcoreResource(URI.createURI(sub.getNsURI()), indicator); @@ -89,7 +90,7 @@ public class FragmentFakingEcoreResourceTest extends AbstractXtextTests { } } - public void testSetup() { + @Test public void testSetup() { assertNotNull(metamodel); assertTrue(metamodel.getEClassifiers().isEmpty()); assertFalse(metamodel.getESubpackages().isEmpty()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java index 7ad2a6656..bd02a51cd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GrammarAccessUtilTest.java @@ -8,13 +8,16 @@ package org.eclipse.xtext.generator.grammarAccess; import static org.eclipse.xtext.generator.grammarAccess.GrammarAccessUtil.*; -import junit.framework.TestCase; + +import org.junit.Assert; +import org.junit.Test; + /** * @author Sven Efftinge - Initial contribution and API */ -public class GrammarAccessUtilTest extends TestCase { +public class GrammarAccessUtilTest extends Assert { - public void testToJavaIdentifier() throws Exception { + @Test public void testToJavaIdentifier() throws Exception { assertEquals("FooBar",toJavaIdentifier("foo Bar", true)); assertEquals("Foo",toJavaIdentifier("foo;", true)); assertEquals("foo",toJavaIdentifier("foo;", false)); @@ -28,11 +31,11 @@ public class GrammarAccessUtilTest extends TestCase { /** * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=298492 */ - public void testBug() throws Exception { + @Test public void testBug() throws Exception { assertEquals("HiraganaLetterRu",toJavaIdentifier("\u308B",true)); } - public void testSmoke() throws Exception { + @Test public void testSmoke() throws Exception { for (int i = 0; i < 4000; i++) { String identifier = toJavaIdentifier(String.valueOf((char)i), false); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java index 1f396959b..285c9981d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java @@ -16,7 +16,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.AModel; import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.AsubpackagePackage; import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.emptyPackage.subsubpackage.SubsubpackagePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,14 +25,14 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class ParserTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); EPackage.Registry.INSTANCE.put(AsubpackagePackage.eNS_URI, AsubpackagePackage.eINSTANCE); EPackage.Registry.INSTANCE.put(SubsubpackagePackage.eNS_URI, SubsubpackagePackage.eINSTANCE); with(GrammarAccessTestLanguageStandaloneSetup.class); } - public void testInstantiate() throws Exception { + @Test public void testInstantiate() throws Exception { String modelAsText = "foo bar"; AModel model = (AModel) getModel(modelAsText); assertEquals(2, model.getElements().size()); @@ -39,7 +40,7 @@ public class ParserTest extends AbstractXtextTests { assertEquals(SubsubpackagePackage.Literals.ANOTHER_TYPE, model.getElements().get(1).eClass()); } - public void testUriFormat() throws Exception { + @Test public void testUriFormat() throws Exception { URI uri = EcoreUtil.getURI(SubsubpackagePackage.Literals.ANOTHER_TYPE); assertTrue(AsubpackagePackage.eNS_URI.equals(uri.trimFragment().toString())); ResourceSet set = new ResourceSetImpl(); @@ -47,7 +48,7 @@ public class ParserTest extends AbstractXtextTests { assertSame(SubsubpackagePackage.Literals.ANOTHER_TYPE, eObject); } - public void testUriFormat2() throws Exception { + @Test public void testUriFormat2() throws Exception { URI uri = EcoreUtil.getURI(AsubpackagePackage.Literals.ATYPE); assertTrue(AsubpackagePackage.eNS_URI.equals(uri.trimFragment().toString())); ResourceSet set = new ResourceSetImpl(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java index 418c11ef7..b23d4c9b0 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/SubPackageAwareGrammarAccessFragmentTest.java @@ -12,8 +12,9 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,7 +25,7 @@ public class SubPackageAwareGrammarAccessFragmentTest extends AbstractXtextTests private GrammarAccessFragment fragment; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); XtextResourceSet set = new XtextResourceSet(); set.setClasspathURIContext(getClass()); @@ -34,12 +35,12 @@ public class SubPackageAwareGrammarAccessFragmentTest extends AbstractXtextTests } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { metamodel = null; super.tearDown(); } - public void testMoveSubpackagesToNewResource() { + @Test public void testMoveSubpackagesToNewResource() { String expected = metamodel.getESubpackages().get(0).getNsURI(); ResourceSet set = new ResourceSetImpl(); fragment.moveSubpackagesToNewResource(metamodel, set); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java index 5588d677c..74b6c994a 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/UnicodeCharacterDatabaseNamesTest.java @@ -8,21 +8,23 @@ package org.eclipse.xtext.generator.grammarAccess; import static org.eclipse.xtext.generator.grammarAccess.UnicodeCharacterDatabaseNames.*; -import junit.framework.TestCase; + +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API */ -public class UnicodeCharacterDatabaseNamesTest extends TestCase { +public class UnicodeCharacterDatabaseNamesTest extends Assert { - public void testGetName() throws Exception { + @Test public void testGetName() throws Exception { assertEquals("LATIN SMALL LETTER U WITH DIAERESIS",getCharacterName('ü')); assertEquals("LATIN SMALL LETTER A WITH DIAERESIS",getCharacterName('ä')); assertEquals("DIGIT NINE",getCharacterName('9')); assertEquals("CJK UNIFIED IDEOGRAPH-4711",getCharacterName('\u4711')); } - public void testSmoke() throws Exception { + @Test public void testSmoke() throws Exception { for (int i = 0; i < 8000; i++) { String characterName = getCharacterName((char)i); assertNotNull("Character : "+((char)i),characterName); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java index 9badfc27f..eb8ae5e8f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AbstractAntlrSplitterTest.java @@ -8,7 +8,7 @@ *******************************************************************************/ package org.eclipse.xtext.generator.parser; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; /** * diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java index 91e5fc057..afc1067a4 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/AntlrGrammarGenUtilTest.java @@ -7,21 +7,21 @@ *******************************************************************************/ package org.eclipse.xtext.generator.parser; -import junit.framework.TestCase; - import org.eclipse.xtext.generator.parser.antlr.AntlrGrammarGenUtil; +import org.junit.Assert; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API */ -public class AntlrGrammarGenUtilTest extends TestCase { +public class AntlrGrammarGenUtilTest extends Assert { - public void testToAntlrString() throws Exception { + @Test public void testToAntlrString() throws Exception { assertEquals("a\\'b\\u00D6", AntlrGrammarGenUtil.toAntlrString("a'bÖ")); } - public void testToAntlrStringIgnoreCaseSimple() throws Exception { + @Test public void testToAntlrStringIgnoreCaseSimple() throws Exception { assertEquals("('A'|'a')", AntlrGrammarGenUtil.toAntlrStringIgnoreCase("a")); assertEquals("('A'|'a')", AntlrGrammarGenUtil.toAntlrStringIgnoreCase("A")); assertEquals("('A'|'a')('B'|'b')", AntlrGrammarGenUtil.toAntlrStringIgnoreCase("ab")); @@ -30,16 +30,15 @@ public class AntlrGrammarGenUtilTest extends TestCase { assertEquals("('A'|'a')('B'|'b')", AntlrGrammarGenUtil.toAntlrStringIgnoreCase("AB")); } - public void testToAntlrStringIgnoreCaseUmlauts() throws Exception { + @Test public void testToAntlrStringIgnoreCaseUmlauts() throws Exception { assertEquals("\u00D6", "Ö"); assertEquals("\u00F6", "ö"); assertEquals("('\\u00D6'|'\\u00F6')", AntlrGrammarGenUtil.toAntlrStringIgnoreCase("ö")); } - public void testToAntlrStringIgnoreNoCases() throws Exception { + @Test public void testToAntlrStringIgnoreNoCases() throws Exception { assertEquals("\u00DF", "ß"); - //I know, eszett will have a dedicated uppercase version in future. - //But for now... + //TODO: eszett will have a dedicated uppercase version in future. But for now... assertEquals(Character.toLowerCase('ß'), Character.toUpperCase('ß')); assertEquals("('A'|'a')'\\u00DF'('C'|'c')", AntlrGrammarGenUtil.toAntlrStringIgnoreCase("AßC")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java index d5d976186..bcab05d9f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/TerminalRuleToLexerBodyTest.java @@ -12,7 +12,8 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.generator.parser.antlr.TerminalRuleToLexerBody; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; //import org.eclipse.xtext.generator.parser.TerminalRuleToLexerBody; @@ -27,7 +28,7 @@ public class TerminalRuleToLexerBodyTest extends AbstractXtextTests { private TerminalRule workaroundString; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); String model = "grammar foo\n" + @@ -41,13 +42,13 @@ public class TerminalRuleToLexerBodyTest extends AbstractXtextTests { workaroundString = (TerminalRule) GrammarUtil.findRuleForName(grammar, "WORKAROUND_STRING"); } - public void testToLexerBody_01() { + @Test public void testToLexerBody_01() { String ada = TerminalRuleToLexerBody.toLexerBody(adaString); String expectation = "'\"' (~('\"')|'\"\"')* '\"'"; // '"' (~('"')|'""')* '"' assertEquals(expectation, ada); } - public void testToLexerBody_02() { + @Test public void testToLexerBody_02() { String workaround = TerminalRuleToLexerBody.toLexerBody(workaroundString); String expectation = "'\"' (~('\"')|'\"' '\"')* '\"'"; // '"' (~('"')|'"' '"')* '"' assertEquals(expectation, workaround); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java index 49eecff45..46cc5cdfd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/ex/common/KeywordHelperTest.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.xtext.generator.parser.antlr.ex.common.KeywordHelper; +import org.junit.Assert; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API */ -public class KeywordHelperTest extends TestCase { +public class KeywordHelperTest extends Assert { - public void testKeywordComparatorOnList() throws Exception { + @Test public void testKeywordComparatorOnList() throws Exception { List keywords = new ArrayList(); keywords.add("AAA"); keywords.add("BBBB"); @@ -33,7 +33,7 @@ public class KeywordHelperTest extends TestCase { assertEquals("CC", keywords.get(3)); } - public void testKeyComparatorIsolated() throws Exception { + @Test public void testKeyComparatorIsolated() throws Exception { assertTrue( KeywordHelper.keywordComparator.compare("A", "B") < 0); assertTrue( KeywordHelper.keywordComparator.compare("B", "A") > 0); assertTrue( KeywordHelper.keywordComparator.compare("AA", "A") < 0); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java index a3c12f37a..e2191e1b2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrLexerSplitterTest.java @@ -14,6 +14,7 @@ import java.util.regex.Pattern; import org.eclipse.xtext.generator.parser.AbstractAntlrSplitterTest; import org.eclipse.xtext.generator.parser.antlr.splitting.AntlrLexerSplitter; import org.eclipse.xtext.generator.parser.antlr.splitting.AntlrLexerSplitter.ExtractedMethod; +import org.junit.Test; /** @@ -22,13 +23,13 @@ import org.eclipse.xtext.generator.parser.antlr.splitting.AntlrLexerSplitter.Ext */ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { - public void testMethodSignaturePattern() throws Exception { + @Test public void testMethodSignaturePattern() throws Exception { Pattern p = AntlrLexerSplitter.METHOD_SIGNATURE_PATTERN; assertFalse(p.matcher(" public final void mRULE_ANY_OTHER() throws RecognitionException {").find()); assertTrue(p.matcher(" public void mTokens() throws RecognitionException {").find()); } - public void testAssignmentPattern() throws Exception { + @Test public void testAssignmentPattern() throws Exception { Pattern p = AntlrLexerSplitter.ASSIGNMENT_PATTERN; assertFalse(p.matcher(" string foo").find()); Matcher m = p.matcher(" int alt12=16;"); @@ -36,7 +37,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertEquals("alt12", m.group(1)); } - public void testIndentLevelPattern() throws Exception { + @Test public void testIndentLevelPattern() throws Exception { Pattern p = AntlrLexerSplitter.INDENT_LEVEL_PATTERN; assertFalse(p.matcher("").matches()); assertFalse(p.matcher("a b").matches()); @@ -46,7 +47,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { } - public void testTransform() throws Exception { + @Test public void testTransform() throws Exception { String content = readFileIntoString("org/eclipse/xtext/generator/parser/InternalLexerExample.java.txt"); AntlrLexerSplitter splitter = new AntlrLexerSplitter(content); String actual = splitter.transform(); @@ -55,13 +56,13 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertTrue(!actual.equals(content)); } - public void testDFAPattern() throws Exception { + @Test public void testDFAPattern() throws Exception { Pattern p = AntlrLexerSplitter.DFA_ASSIGNMENT_PATTERN; assertTrue(p.matcher(" alt12 = dfa12.predict(input);").find()); assertFalse(p.matcher(" int LA12_0 = input.LA(1);").find()); } - public void testNoDFATransform() throws Exception { + @Test public void testNoDFATransform() throws Exception { String content = readFileIntoString("org/eclipse/xtext/generator/parser/InternalLexerExample2.java.txt"); AntlrLexerSplitter splitter = new AntlrLexerSplitter(content); String actual = splitter.transform(); @@ -69,7 +70,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertTrue(actual.equals(content)); } - public void testOuterBraceInIfCascadePattern() throws Exception { + @Test public void testOuterBraceInIfCascadePattern() throws Exception { Pattern p = AntlrLexerSplitter.OUTER_BRACE_IN_IF_CASCADE_PATTERN; Matcher m = p.matcher(" alt13=62;} "); assertTrue(m.find()); @@ -77,7 +78,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertFalse(p.matcher(" alt13=62; ").find()); assertFalse(p.matcher(" } ").find()); } - public void testIfCascadeWithOneLineElse() throws Exception { + @Test public void testIfCascadeWithOneLineElse() throws Exception { String content = " public void mTokens() throws RecognitionException {\n" + " // ../org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/contentassist/antlr/internal/InternalDomainmodel.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n" + @@ -102,7 +103,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertNotNull(actual); } - public void testExtractedLine() throws Exception { + @Test public void testExtractedLine() throws Exception { ExtractedMethod m = new ExtractedMethod("myVar", 1); assertEquals("mTokensHelper001", m.getName()); assertEquals(" foo();", m.getAsExtractedLine(" foo();")); @@ -111,7 +112,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertEquals(" return 123;}", m.getAsExtractedLine(" myVar=123;}")); } - public void testExtectedMethodSimple() throws Exception { + @Test public void testExtectedMethodSimple() throws Exception { ExtractedMethod m = new ExtractedMethod("myVar", 1); m.addLine(" if ( someComplexExpression ) {"); m.addLine(" myVar=1;"); @@ -132,7 +133,7 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest { assertEquals(expected, sb.toString()); } - public void testExtectedMethodRemoveBreaks() throws Exception { + @Test public void testExtectedMethodRemoveBreaks() throws Exception { ExtractedMethod m = new ExtractedMethod("alt12", 1); m.addLine(" switch ( input.LA(2) ) {"); m.addLine(" case '*':"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java index 22ae7098e..1522dea16 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/AntlrParserSplitterTest.java @@ -13,6 +13,7 @@ import java.util.regex.Matcher; import org.eclipse.xtext.generator.parser.AbstractAntlrSplitterTest; import org.eclipse.xtext.generator.parser.antlr.splitting.AntlrParserSplitter; import org.eclipse.xtext.generator.parser.antlr.splitting.AntlrParserSplitter.ExtractedClass; +import org.junit.Test; /** @@ -41,7 +42,7 @@ public class AntlrParserSplitterTest extends AbstractAntlrSplitterTest { String DECL_AND_REF = DECLARATIONS + REFERENCES; - public void testDeclaration() throws Exception { + @Test public void testDeclaration() throws Exception { Matcher m = AntlrParserSplitter.DECLARATION_PATTERN.matcher(DECL_AND_REF); assertTrue(m.find()); @@ -53,7 +54,7 @@ public class AntlrParserSplitterTest extends AbstractAntlrSplitterTest { assertFalse(m.find()); } - public void testReference() throws Exception { + @Test public void testReference() throws Exception { Matcher m = AntlrParserSplitter.REFERENCE_PATTERN.matcher(DECL_AND_REF); assertTrue(m.find()); assertEquals("FOLLOW_ruleModel_in_entryRuleModel60", m.group(1)); @@ -67,7 +68,7 @@ public class AntlrParserSplitterTest extends AbstractAntlrSplitterTest { assertFalse(m.find()); } - public void testTransformer() throws Exception { + @Test public void testTransformer() throws Exception { AntlrParserSplitter splitter = new AntlrParserSplitter(REFERENCES + DECLARATIONS); String actual = splitter.transform(); assertNotNull(actual); @@ -78,7 +79,7 @@ public class AntlrParserSplitterTest extends AbstractAntlrSplitterTest { // System.out.println(ec.getContent()); } - public void testRealworld() throws Exception { + @Test public void testRealworld() throws Exception { String _class = readFileIntoString("org/eclipse/xtext/generator/parser/InternalParserExample.java.txt"); AntlrParserSplitter splitter = new AntlrParserSplitter(_class); String newClass = splitter.transform(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java index cdb4c288f..2c0fedc85 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/CondititionSimplifierTest.java @@ -11,8 +11,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.generator.parser.antlr.splitting.ConditionSimplifier; import org.eclipse.xtext.generator.parser.antlr.splitting.SimpleExpressionsStandaloneSetup; import org.eclipse.xtext.generator.parser.antlr.splitting.simpleExpressions.IfCondition; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.util.EmfFormatter; +import org.junit.Test; /** @@ -23,49 +24,49 @@ public class CondititionSimplifierTest extends AbstractXtextTests { private ConditionSimplifier conditionSimplifier; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleExpressionsStandaloneSetup.class); conditionSimplifier = new ConditionSimplifier(); } - public void testAorA() throws Exception { + @Test public void testAorA() throws Exception { String model = "if (a||a) {"; String expectation = "if (a) {"; check(expectation, model); } - public void testAandA() throws Exception { + @Test public void testAandA() throws Exception { String model = "if (a&&a) {"; String expectation = "if (a) {"; check(expectation, model); } - public void testNotNotA() throws Exception { + @Test public void testNotNotA() throws Exception { String model = "if (!(!a)) {"; String expectation = "if (a) {"; check(expectation, model); } - public void testAorAandB() throws Exception { + @Test public void testAorAandB() throws Exception { String model = "if (a||a&&b) {"; String expectation = "if (a) {"; check(expectation, model); } - public void testAandBorA() throws Exception { + @Test public void testAandBorA() throws Exception { String model = "if (a&&b||a) {"; String expectation = "if (a) {"; check(expectation, model); } - public void testAandBorAandB() throws Exception { + @Test public void testAandBorAandB() throws Exception { String model = "if (a&&b||a&&b) {"; String expectation = "if (a&&b) {"; check(expectation, model); } - public void testNotAorBorBorNotAorB() throws Exception { + @Test public void testNotAorBorBorNotAorB() throws Exception { String model = "if (!(a||b)||b||!(a||b)) {"; String expectation = "if (!(a||b)||b) {"; check(expectation, model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java index c9225b882..0caae3db3 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/parser/splitting/LexerSpecialStateTransitionSplitterTest.java @@ -7,15 +7,17 @@ *******************************************************************************/ package org.eclipse.xtext.generator.parser.splitting; -import junit.framework.TestCase; - import org.eclipse.xtext.generator.parser.antlr.splitting.internal.LexerSpecialStateTransitionSplitter; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class LexerSpecialStateTransitionSplitterTest extends TestCase { +public class LexerSpecialStateTransitionSplitterTest extends Assert { private String original = "public class InternalMyDslLexer extends Lexer {\n" + @@ -127,20 +129,18 @@ public class LexerSpecialStateTransitionSplitterTest extends TestCase { private LexerSpecialStateTransitionSplitter testMe; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { testMe = new LexerSpecialStateTransitionSplitter(true); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { original = null; transformed = null; - super.tearDown(); } - public void testTransformation() { + @Test public void testTransformation() { String actual = testMe.transform(original); assertEquals(transformed, actual); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java index 1c0726b45..44de16ae3 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java @@ -7,13 +7,14 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; public class ResourceTest extends AbstractXtextTests { // FIXME: Make this test work again -// public void testResource() throws Exception { +// @Test public void testResource() throws Exception { // new Object(); // workaround for Java bug on MacOSX // IServiceScope serviceScope = ServiceScopeFactory.get(ITestLanguage.ID); // IResourceFactory resourceFactory = ServiceRegistry.getService(serviceScope, IResourceFactory.class); @@ -39,7 +40,7 @@ public class ResourceTest extends AbstractXtextTests { // assertFalse(ecoreModelComparator.modelsDiffer(resource, resource1)); // } - public void testDoNothing(){ + @Test public void testDoNothing(){ // 'cause JUnit doesn't like test classes without test methods. } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java index e0702daa8..6b575d17e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AnotherInheritanceTest.java @@ -11,19 +11,20 @@ package org.eclipse.xtext.grammarinheritance; import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.grammarinheritance.ametamodel.AmetamodelPackage; import org.eclipse.xtext.grammarinheritance.services.InheritanceTest2LanguageGrammarAccess; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; public class AnotherInheritanceTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); EPackage aMetamodel = AmetamodelPackage.eINSTANCE; EPackage.Registry.INSTANCE.put(aMetamodel.getNsURI(), aMetamodel); with(new InheritanceTest2LanguageStandaloneSetup()); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { InheritanceTest2LanguageGrammarAccess g = (InheritanceTest2LanguageGrammarAccess) getGrammarAccess(); assertNotNull(g.getFQNAccess()); assertNotNull(g.getModelAccess()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java index 2c596f19c..bf4d98dff 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Bug265111Test.java @@ -10,7 +10,8 @@ package org.eclipse.xtext.grammarinheritance; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -18,12 +19,12 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class Bug265111Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testParseGrammar() throws Exception { + @Test public void testParseGrammar() throws Exception { String grammar = "grammar test with org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage\n" + "generate test 'http://test'\n" + "Root: A | Model;" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java index aa1fc5d7b..c6b4440f6 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/Inheritance2Test.java @@ -13,7 +13,8 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.grammarinheritance.services.InheritanceTestLanguageGrammarAccess; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -23,13 +24,13 @@ public class Inheritance2Test extends AbstractXtextTests { private InheritanceTestLanguageGrammarAccess grammarAccess; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(InheritanceTestLanguageStandaloneSetup.class); grammarAccess = get(InheritanceTestLanguageGrammarAccess.class); } - public void testReturnTypes_01() { + @Test public void testReturnTypes_01() { ParserRule rule = grammarAccess.getModelRule(); EClassifier classifier = rule.getType().getClassifier(); assertEquals("Model", classifier.getName()); @@ -43,7 +44,7 @@ public class Inheritance2Test extends AbstractXtextTests { assertEquals(grammarAccess.getGrammar().getUsedGrammars().get(0).getMetamodelDeclarations().get(0).getEPackage(), superPack); } - public void testReturnTypes_02() { + @Test public void testReturnTypes_02() { ParserRule rule = grammarAccess.getElementRule(); EClassifier classifier = rule.getType().getClassifier(); assertEquals("Element", classifier.getName()); @@ -52,7 +53,7 @@ public class Inheritance2Test extends AbstractXtextTests { assertEquals(grammarAccess.getGrammar().getMetamodelDeclarations().get(0).getEPackage(), pack); } - public void testParse_01() throws Exception { + @Test public void testParse_01() throws Exception { String model = "model foo { element bar }"; Resource resource = getResourceFromString(model); assertTrue(resource.getErrors().isEmpty()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java index 0fcc70e25..69e1f22e0 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java @@ -14,14 +14,15 @@ import java.util.Iterator; import java.util.Set; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.TypeRef; import org.eclipse.xtext.grammarinheritance.ametamodel.AmetamodelPackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.grammarinheritance.foo.ConcreteParserRule; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -35,21 +36,21 @@ public class InheritanceTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); EPackage aMetamodel = AmetamodelPackage.eINSTANCE; EPackage.Registry.INSTANCE.put(aMetamodel.getNsURI(), aMetamodel); with(new ConcreteTestLanguageStandaloneSetup()); } - public void testSimple() throws Exception { - EObject model = getModel("model 23.34 : element A element B"); - assertEquals(23.34, invokeWithXtend("magicNumber", model)); - assertWithXtend("'A'", "elements.get(0).name", model); - assertWithXtend("'B'", "elements.get(1).name", model); + @Test public void testSimple() throws Exception { + ConcreteParserRule model = (ConcreteParserRule) getModel("model 23.34 : element A element B"); + assertEquals(23.34, model.getMagicNumber(), 0.0001); + assertEquals("A", model.getElements().get(0).getName()); + assertEquals("B", model.getElements().get(1).getName()); } - public void testMetamodel() throws Exception { + @Test public void testMetamodel() throws Exception { AbstractRule rule = GrammarUtil.findRuleForName(getGrammarAccess().getGrammar(), "OverridableParserRule2"); assertNotNull("rule", rule); TypeRef ref = rule.getType(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java index 9e0d6d4a7..558f6b2b7 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java @@ -19,10 +19,11 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.grammarinheritance.ametamodel.AmetamodelPackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.xtext.ecoreInference.Xtext2EcoreTransformer; +import org.junit.Test; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -31,13 +32,13 @@ public class ToEcoreTrafoTest extends AbstractXtextTests { private static final Logger logger = Logger.getLogger(ToEcoreTrafoTest.class); @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new XtextStandaloneSetup()); EPackage.Registry.INSTANCE.put(AmetamodelPackage.eNS_URI, AmetamodelPackage.eINSTANCE); } - public void testAbstractLanguageToMetamodel() throws Exception { + @Test public void testAbstractLanguageToMetamodel() throws Exception { XtextResource r = getResource("classpath:/" + AbstractTestLanguage.class.getName().replace('.', '/') + ".xtext"); Grammar element = (Grammar) r.getParseResult().getRootASTElement(); if (!r.getErrors().isEmpty()) { @@ -55,7 +56,7 @@ public class ToEcoreTrafoTest extends AbstractXtextTests { assertEquals(0, list.size()); } - public void testConcreteLanguageToMetamodel() throws Exception { + @Test public void testConcreteLanguageToMetamodel() throws Exception { XtextResource r = getResource("classpath:/" + ConcreteTestLanguage.class.getName().replace('.', '/') + ".xtext"); Grammar element = (Grammar) r.getContents().get(0); List lexerRules = GrammarUtil.allTerminalRules(element); @@ -72,7 +73,7 @@ public class ToEcoreTrafoTest extends AbstractXtextTests { assertNotNull(feature.getEType()); } - public void testConcreteLanguageToMetamodel1() throws Exception { + @Test public void testConcreteLanguageToMetamodel1() throws Exception { XtextResource r = getResource("classpath:/" + ConcreteTestLanguage.class.getName().replace('.', '/') + ".xtext"); EObject element = r.getContents().get(0); Grammar g = (Grammar) element; @@ -97,8 +98,4 @@ public class ToEcoreTrafoTest extends AbstractXtextTests { return r; } - @Override - protected String[] importedExtensions() { - return new String[] { "org::eclipse::xtext::ecore::Xtext2Ecore" }; - } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java index 6c711f210..d2c7a1343 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug282355Test.java @@ -8,8 +8,9 @@ package org.eclipse.xtext.lexer; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.lexer.backtrackingTestLanguage.Model; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,12 +18,12 @@ import org.eclipse.xtext.lexer.backtrackingTestLanguage.Model; public class Bug282355Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(BacktrackingLexerTestLanguageStandaloneSetup.class); } - public void testBug282355_01() throws Exception { + @Test public void testBug282355_01() throws Exception { Resource resource = getResourceFromString("Abc Efg Xb"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -34,7 +35,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(0, model.getYcs().size()); } - public void testBug282355_02() throws Exception { + @Test public void testBug282355_02() throws Exception { Resource resource = getResourceFromString("Xb"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -46,7 +47,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(0, model.getYcs().size()); } - public void testBug282355_03() throws Exception { + @Test public void testBug282355_03() throws Exception { Resource resource = getResourceFromString("Ab"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -58,7 +59,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(0, model.getYcs().size()); } - public void testBug282355_04() throws Exception { + @Test public void testBug282355_04() throws Exception { Resource resource = getResourceFromString("Abc Efg Ab Xb"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -70,7 +71,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(0, model.getYcs().size()); } - public void testBug282355_05() throws Exception { + @Test public void testBug282355_05() throws Exception { Resource resource = getResourceFromString("AbcEfgAbXb"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -82,7 +83,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(0, model.getYcs().size()); } - public void testParse_Yc_01() throws Exception { + @Test public void testParse_Yc_01() throws Exception { Resource resource = getResourceFromString("Abc Efg Yc"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -94,7 +95,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(1, model.getYcs().size()); } - public void testParse_Yc_02() throws Exception { + @Test public void testParse_Yc_02() throws Exception { Resource resource = getResourceFromString("YcYc"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -106,7 +107,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(2, model.getYcs().size()); } - public void testParse_YcAA() throws Exception { + @Test public void testParse_YcAA() throws Exception { Resource resource = getResourceFromString("YcAA"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -118,7 +119,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(1, model.getYcs().size()); } - public void testParse_YA() throws Exception { + @Test public void testParse_YA() throws Exception { Resource resource = getResourceFromString("YA"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); @@ -130,7 +131,7 @@ public class Bug282355Test extends AbstractXtextTests { assertEquals(0, model.getYcs().size()); } - public void testParse_A() throws Exception { + @Test public void testParse_A() throws Exception { Resource resource = getResourceFromString("A"); assertTrue(resource.getErrors().isEmpty()); Model model = (Model) resource.getContents().get(0); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java index 0968a8808..3bd05ede5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/Bug313508Test.java @@ -12,8 +12,9 @@ import java.util.Map; import java.util.Set; import org.antlr.runtime.Token; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.antlr.ITokenDefProvider; +import org.junit.Test; import com.google.common.collect.Sets; @@ -25,7 +26,7 @@ public class Bug313508Test extends AbstractXtextTests { private Map map; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(BacktrackingLexerTestLanguageStandaloneSetup.class); ITokenDefProvider tokenDefProvider = get(ITokenDefProvider.class); @@ -33,16 +34,16 @@ public class Bug313508Test extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { map = null; super.tearDown(); } - public void testSize() { + @Test public void testSize() { assertEquals(8 /* terminal rules */ + 2 /* keywords */, map.size()); } - public void testKeys() { + @Test public void testKeys() { Set expected = Sets.newHashSet( Token.MIN_TOKEN_TYPE + 0, Token.MIN_TOKEN_TYPE + 1, @@ -58,7 +59,7 @@ public class Bug313508Test extends AbstractXtextTests { assertEquals(expected, map.keySet()); } - public void testValues() { + @Test public void testValues() { Collection tokens = map.values(); assertTrue(tokens.contains("'Abc'")); assertTrue(tokens.contains("'Efg'")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java index 2ac1c61f1..f32357707 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseTest.java @@ -7,9 +7,10 @@ *******************************************************************************/ package org.eclipse.xtext.lexer; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.lexer.ignoreCaseTestLanguage.Model; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API @@ -18,7 +19,7 @@ import org.eclipse.xtext.resource.XtextResource; public class IgnoreCaseTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(IgnoreCaseLexerTestLanguageStandaloneSetup.class); } @@ -28,46 +29,46 @@ public class IgnoreCaseTest extends AbstractXtextTests { return false; } - public void testLowercase() throws Exception { + @Test public void testLowercase() throws Exception { XtextResource resource = getResourceFromString("case case"); Model model = (Model) resource.getContents().get(0); assertNotNull(model); assertEquals("case", model.getValue()); } - public void testUppercase() throws Exception { + @Test public void testUppercase() throws Exception { XtextResource resource = getResourceFromString("CASE CASE"); Model model = (Model) resource.getContents().get(0); assertNotNull(model); assertEquals("CASE", model.getValue()); } - public void testMixedCase() throws Exception { + @Test public void testMixedCase() throws Exception { XtextResource resource = getResourceFromString("CaSe cAsE"); Model model = (Model) resource.getContents().get(0); assertNotNull(model); assertEquals("cAsE", model.getValue()); } - public void testSerializeLowercase() throws Exception { + @Test public void testSerializeLowercase() throws Exception { Model model = getModel("case case"); String serialized = serialize(model); assertEquals("case case", serialized); } - public void testSerializeUppercase() throws Exception { + @Test public void testSerializeUppercase() throws Exception { Model model = getModel("CASE CASE"); String serialized = serialize(model); assertEquals("CASE CASE", serialized); } - public void testSerializeMixedCase() throws Exception { + @Test public void testSerializeMixedCase() throws Exception { Model model = getModel("CaSe CaSe"); String serialized = serialize(model); assertEquals("CaSe CaSe", serialized); } - public void testSerializeInvertedMixedCase() throws Exception { + @Test public void testSerializeInvertedMixedCase() throws Exception { Model model = getModel("cAsE cAsE"); String serialized = serialize(model); assertEquals("cAsE cAsE", serialized); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java index ab5f6293f..b5390ae86 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java @@ -8,18 +8,18 @@ *******************************************************************************/ package org.eclipse.xtext.lexer; -import junit.framework.TestCase; - import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CommonTokenStream; import org.apache.log4j.Logger; import org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalSimpleExpressionsTestLanguageLexer; +import org.junit.Assert; +import org.junit.Test; -public class LexerErrorTest extends TestCase { +public class LexerErrorTest extends Assert { private static final Logger logger = Logger.getLogger(LexerErrorTest.class); - public void testLexerError() throws Exception { + @Test public void testLexerError() throws Exception { String model = "a /* uncomplete comment *"; InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer(); lexer.setCharStream(new ANTLRStringStream(model)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java index 5645be6cb..8859076c6 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerSLComment.java @@ -8,19 +8,19 @@ *******************************************************************************/ package org.eclipse.xtext.lexer; -import junit.framework.TestCase; - import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CommonToken; import org.antlr.runtime.CommonTokenStream; import org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalSimpleExpressionsTestLanguageLexer; +import org.junit.Assert; +import org.junit.Test; /** * @author Dennis Hübner - Initial contribution and API * */ -public class LexerSLComment extends TestCase { - public void testSlComment() { +public class LexerSLComment extends Assert { + @Test public void testSlComment() { String model = "//sl comment\na"; InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer(); lexer.setCharStream(new ANTLRStringStream(model)); @@ -34,7 +34,7 @@ public class LexerSLComment extends TestCase { * see BUG 234135: Comments on EOF not detected * https://bugs.eclipse.org/bugs/show_bug.cgi?id=234135 */ - public void testSlCommentEOF() { + @Test public void testSlCommentEOF() { String model = "a\n//sl comment"; InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer(); lexer.setCharStream(new ANTLRStringStream(model)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java index f709794ad..09c04eb2d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTest.java @@ -7,24 +7,25 @@ *******************************************************************************/ package org.eclipse.xtext.linking; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public abstract class AbstractIgnoreCaseLinkingTest extends AbstractXtextTests { - public void testSimpleModel() throws Exception { + @Test public void testSimpleModel() throws Exception { String input = "a A {}"; getModel(input); } - public void testNestedModel() throws Exception { + @Test public void testNestedModel() throws Exception { String input = "a A { b a { c B {} c a {} } }"; getModel(input); } - public void testUnresolvedLink() throws Exception { + @Test public void testUnresolvedLink() throws Exception { String input = "a notFound {}"; getModelAndExpect(input, 1); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java index 4eada4768..3fdc8143c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug266082Test.java @@ -19,9 +19,10 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.URIHandler; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -29,12 +30,12 @@ import org.eclipse.xtext.util.StringInputStream; public class Bug266082Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ImportUriTestLanguageStandaloneSetup.class); } - public void testCircularImports() { + @Test public void testCircularImports() { XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setClasspathURIContext(getClass().getClassLoader()); URI uri = URI.createURI("classpath:/org/eclipse/xtext/linking/01.importuritestlanguage"); @@ -44,7 +45,7 @@ public class Bug266082Test extends AbstractXtextTests { assertFalse(res.getErrors().toString(), res.getErrors().isEmpty()); } - public void testManyUnresolvedImports() throws Exception { + @Test public void testManyUnresolvedImports() throws Exception { StringBuilder model = new StringBuilder(200000); int max = 10000; for(int i = 1; i <= max; i++) { @@ -55,7 +56,7 @@ public class Bug266082Test extends AbstractXtextTests { assertEquals(res.getErrors().toString(), 1, res.getErrors().size()); } - public void testManyResolvedImports() throws Exception { + @Test public void testManyResolvedImports() throws Exception { StringBuilder model = new StringBuilder(2000); int max = 100; for(int i = 1; i <= max; i++) { @@ -133,7 +134,7 @@ public class Bug266082Test extends AbstractXtextTests { assertEquals(res.getErrors().toString(), 1, res.getErrors().size()); } - public void testRedundantImport() { + @Test public void testRedundantImport() { XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setClasspathURIContext(getClass().getClassLoader()); URI uri = URI.createURI("classpath:/org/eclipse/xtext/linking/03.importuritestlanguage"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java index c9249b59b..5375f8c9b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988Test.java @@ -8,10 +8,11 @@ package org.eclipse.xtext.linking; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.bug287988Test.BaseAttribute; import org.eclipse.xtext.linking.bug287988Test.Model; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -19,23 +20,17 @@ import org.eclipse.xtext.resource.XtextResource; public class Bug287988Test extends AbstractXtextTests { @Override - protected boolean shouldTestSerializer(XtextResource resource) { - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=361355 - return !"testInlinedActions_01".equals(getName()); - } - - @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug287988TestLanguageStandaloneSetup.class); } - public void testAction_01() throws Exception { + @Test public void testAction_01() throws Exception { String modelAsString = "actions master mytype attr1; attribute ref attr1 attr2;"; checkSecondAttrRefersToFirst(modelAsString); } - public void testAction_02() throws Exception { + @Test public void testAction_02() throws Exception { String modelAsString = "actions master mytype attr1; attribute myOtherType attr2;"; Model model = (Model) getModel(modelAsString); assertEquals(2, model.getAttributes().size()); @@ -43,7 +38,7 @@ public class Bug287988Test extends AbstractXtextTests { assertNull(baseAttribute.getTypeRef()); } - public void testAction_03() throws Exception { + @Test public void testAction_03() throws Exception { String modelAsString = "actions master mytype attr1; attribute ref attr3 attr2;"; Model model = (Model) getModelAndExpect(modelAsString, 1); assertEquals(2, model.getAttributes().size()); @@ -53,27 +48,29 @@ public class Bug287988Test extends AbstractXtextTests { assertTrue(eObject.eIsProxy()); } - public void testSimple_01() throws Exception { + @Test public void testSimple_01() throws Exception { String modelAsString = "simple mytype attr1; ref attr1 attr2;"; checkSecondAttrRefersToFirst(modelAsString); } - public void testRuleCall_01() throws Exception { + @Test public void testRuleCall_01() throws Exception { String modelAsString = "rulecall mytype attr1; ref attr1 attr2;"; checkSecondAttrRefersToFirst(modelAsString); } - public void testRuleCall_02() throws Exception { + @Test public void testRuleCall_02() throws Exception { String modelAsString = "rulecall2 attr1 mytype; attr2 ref attr1;"; checkSecondAttrRefersToFirst(modelAsString); } - public void testRuleCall_03() throws Exception { + @Test public void testRuleCall_03() throws Exception { String modelAsString = "rulecall3 call me attr1 mytype; call me attr2 ref attr1;"; checkSecondAttrRefersToFirst(modelAsString); } - public void testInlinedActions_01() throws Exception { + @Test public void testInlinedActions_01() throws Exception { + // TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=361355 + disableSerializerTest(); String modelAsString = "inlinedActions master mytype attr1; attribute ref attr1 attr2;"; checkSecondAttrRefersToFirst(modelAsString); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java index 7d26d9bcc..a75b4582f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug287988WithEagerLinkingTest.java @@ -18,6 +18,7 @@ import org.eclipse.xtext.linking.bug287988Test.Model; import org.eclipse.xtext.linking.impl.Linker; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -27,7 +28,7 @@ public class Bug287988WithEagerLinkingTest extends Bug287988Test { private ResourceFactoryImpl factory; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); factory = new ResourceFactoryImpl(){ @Override @@ -54,7 +55,7 @@ public class Bug287988WithEagerLinkingTest extends Bug287988Test { } @Override - public void testAction_03() throws Exception { + @Test public void testAction_03() throws Exception { String modelAsString = "actions master mytype attr1; attribute ref attr3 attr2;"; Model model = (Model) getModelAndExpect(modelAsString, 1); assertEquals(2, model.getAttributes().size()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java index e8362a4cd..23ad6a5d5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug313089Test.java @@ -7,7 +7,8 @@ *******************************************************************************/ package org.eclipse.xtext.linking; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -15,17 +16,17 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class Bug313089Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug313089TestLanguageStandaloneSetup.class); } - public void testUnassignedAction() throws Exception { + @Test public void testUnassignedAction() throws Exception { getModelAndExpect("foo bar foo", 0); } - public void testAssignedAction() throws Exception { + @Test public void testAssignedAction() throws Exception { getModelAndExpect("foo baz baz0 baz baz1 foo",0); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java index 454243655..f1b55c24a 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/Bug362902Test.java @@ -9,10 +9,11 @@ package org.eclipse.xtext.linking; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.bug362902.Model; import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic; import org.eclipse.xtext.resource.XtextSyntaxDiagnostic; +import org.junit.Test; /** * @author Holger Schill - Initial contribution and API @@ -20,12 +21,12 @@ import org.eclipse.xtext.resource.XtextSyntaxDiagnostic; public class Bug362902Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug362902StandaloneSetup.class); } - public void testNoExceptionUncaught() throws Exception { + @Test public void testNoExceptionUncaught() throws Exception { String modelAsString = "Hello max ! Hello peter! favourite peter"; Model model = (Model)getModelAndExpect(modelAsString, 2); EList errors = model.eResource().getErrors(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java index 299ec8479..677d93408 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java @@ -2,7 +2,6 @@ package org.eclipse.xtext.linking; import java.util.List; -import org.apache.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; @@ -13,7 +12,7 @@ import org.eclipse.xtext.Assignment; import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.IGrammarAccess; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.impl.DefaultLinkingService; import org.eclipse.xtext.linking.impl.IllegalNodeException; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguageFactory; @@ -32,13 +31,13 @@ import org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.ICrossReferenceSeri import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.service.SingletonBinding; +import org.junit.Test; import com.google.common.collect.Lists; import com.google.inject.Guice; import com.google.inject.Injector; public class CrossRefTest extends AbstractXtextTests { - private static final Logger logger = Logger.getLogger(CrossRefTest.class); private ICrossReferenceSerializer crossRefSerializer; private LangATestLanguageGrammarAccess grammar; @@ -76,7 +75,7 @@ public class CrossRefTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new LangATestLanguageStandaloneSetup() { @Override @@ -94,21 +93,20 @@ public class CrossRefTest extends AbstractXtextTests { grammar = (LangATestLanguageGrammarAccess) get(IGrammarAccess.class); } - public void testSimple() throws Exception { - EObject model = getModel("type A extends B type B extends A"); - logger.debug(invokeWithXtend("types.collect(e|e.name+' '+e.extends.name).toString(',')", model)); - assertWithXtend("'B'", "types.first().extends.name", model); - assertWithXtend("types.first()", "types.first().extends.extends", model); + @Test public void testSimple() throws Exception { + Main model = (Main) getModel("type A extends B type B extends A"); + assertEquals("B", model.getTypes().get(0).getExtends().getName()); + assertEquals(model.getTypes().get(0), model.getTypes().get(0).getExtends().getExtends()); } - public void testGetLinkedObjects() throws Exception { + @Test public void testGetLinkedObjects() throws Exception { XtextResource r = getResourceFromString("type TypeA extends TypeB type TypeB extends TypeA type AnotherType extends TypeA"); - EObject model = r.getParseResult().getRootASTElement(); + Main model = (Main) r.getParseResult().getRootASTElement(); ILeafNode leaf = NodeModelUtils.findLeafNodeAtOffset(r.getParseResult().getRootNode(), 6); - assertWithXtend("3", "types.size", model); + assertEquals(3, model.getTypes().size()); - EObject context = (EObject) invokeWithXtend("types.first()", model); + EObject context = model.getTypes().get(0); Assignment asExtends = get(LangATestLanguageGrammarAccess.class).getTypeAccess().getExtendsAssignment_2_1(); CrossReference xref = (CrossReference) asExtends.getTerminal(); EReference ref = GrammarUtil.getReference(xref, context.eClass()); @@ -116,7 +114,7 @@ public class CrossRefTest extends AbstractXtextTests { assertEquals(1, getLinkingService().getLinkedObjects(context, ref, leaf).size()); } - public void testGetSingleValuedLinkText() throws Exception { + @Test public void testGetSingleValuedLinkText() throws Exception { XtextResource r = getResourceFromStringAndExpect("type TypeA extends ^extends type ^extends extends ^type", 1); Main model = (Main) r.getContents().get(0); assertEquals(2, model.getTypes().size()); @@ -140,7 +138,7 @@ public class CrossRefTest extends AbstractXtextTests { assertNull(linkText); } - public void testGetMultiValuedLinkText() throws Exception { + @Test public void testGetMultiValuedLinkText() throws Exception { with(LazyLinkingTestLanguageStandaloneSetup.class); crossRefSerializer = get(ICrossReferenceSerializer.class); LazyLinkingTestLanguageGrammarAccess g = (LazyLinkingTestLanguageGrammarAccess) get(IGrammarAccess.class); @@ -182,7 +180,7 @@ public class CrossRefTest extends AbstractXtextTests { } /* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=287813 */ - public void testNonDefaultLinkText() throws Exception { + @Test public void testNonDefaultLinkText() throws Exception { XtextResource r = getResourceFromString("type TypeA extends ^TypeB type TypeB"); Main model = (Main) r.getContents().get(0); assertEquals(2, model.getTypes().size()); @@ -197,7 +195,7 @@ public class CrossRefTest extends AbstractXtextTests { } /* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=325435 */ - public void testSerializingProxiedCrossReference() throws Exception { + @Test public void testSerializingProxiedCrossReference() throws Exception { XtextResource r = getResourceFromString("type TypeA extends ^TypeB type TypeB "); Main model = (Main) r.getContents().get(0); @@ -215,7 +213,7 @@ public class CrossRefTest extends AbstractXtextTests { } /* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=287813 */ - public void testOutOfSyncNodeModel() throws Exception { + @Test public void testOutOfSyncNodeModel() throws Exception { XtextResource r = getResourceFromString("type TypeA extends ^TypeB type TypeB "); Main model = (Main) r.getContents().get(0); @@ -228,7 +226,7 @@ public class CrossRefTest extends AbstractXtextTests { } /* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=298506 */ - public void testCrossReferenceValueConverter() throws Exception { + @Test public void testCrossReferenceValueConverter() throws Exception { Resource r = get(XtextResourceSet.class).createResource(URI.createURI("test." + getCurrentFileExtension())); Main main = LangATestLanguageFactory.eINSTANCE.createMain(); Type ele = LangATestLanguageFactory.eINSTANCE.createType(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java index a3c921402..f7852c70f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithDifferentWildcardTest.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.linking; import org.eclipse.xtext.scoping.IScopeProvider; import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider; import org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider; +import org.junit.Test; import com.google.inject.Binder; import com.google.inject.Guice; @@ -29,7 +30,7 @@ public class IgnoreCaseLinkingWithDifferentWildcardTest extends AbstractIgnoreCa } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new IgnoreCaseNamespacesTestLanguageStandaloneSetup() { @Override @@ -45,22 +46,22 @@ public class IgnoreCaseLinkingWithDifferentWildcardTest extends AbstractIgnoreCa } @Override - public void testWithImports() throws Exception { + @Test public void testWithImports() throws Exception { String input = "'a.b.all' a C { b a { c B {} d a {} } }"; getModel(input); } - public void testWithImportsIgnoreCase_01() throws Exception { + @Test public void testWithImportsIgnoreCase_01() throws Exception { String input = "'A.B.all' a C { b a { c B {} d a {} } }"; getModel(input); } - public void testWithImportsIgnoreCase_02() throws Exception { + @Test public void testWithImportsIgnoreCase_02() throws Exception { String input = "'A.B.ALL' a C { b a { c B {} d a {} } }"; getModel(input); } - public void testWithImportsIgnoreCase_03() throws Exception { + @Test public void testWithImportsIgnoreCase_03() throws Exception { String input = "'a.b.ALL' a C { b a { c B {} d a {} } }"; getModel(input); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java index d64bfc1ae..b7b829321 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithNamespaceImportsTest.java @@ -7,24 +7,26 @@ *******************************************************************************/ package org.eclipse.xtext.linking; +import org.junit.Test; + /** * @author Sebastian Zarnekow - Initial contribution and API */ public class IgnoreCaseLinkingWithNamespaceImportsTest extends AbstractIgnoreCaseLinkingTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(IgnoreCaseNamespacesTestLanguageStandaloneSetup.class); } @Override - public void testWithImports() throws Exception { + @Test public void testWithImports() throws Exception { String input = "'a.b.*' a C { b a { c B {} d a {} } }"; getModel(input); } - public void testWithImportsIgnoreCase_01() throws Exception { + @Test public void testWithImportsIgnoreCase_01() throws Exception { String input = "'A.B.*' a C { b a { c B {} d a {} } }"; getModel(input); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java index fd26d29a7..e1af9dc0b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseLinkingWithURIImportsTest.java @@ -13,6 +13,7 @@ import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.scoping.impl.SyntheticModelAwareURIConverter; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -20,13 +21,13 @@ import org.eclipse.xtext.util.StringInputStream; public class IgnoreCaseLinkingWithURIImportsTest extends AbstractIgnoreCaseLinkingTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(IgnoreCaseImportsTestLanguageStandaloneSetup.class); } @Override - public void testWithImports() throws Exception { + @Test public void testWithImports() throws Exception { SyntheticModelAwareURIConverter uriConverter = new SyntheticModelAwareURIConverter(); XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setURIConverter(uriConverter); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java index 9ad3815e1..72c6fff19 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingErrorTest.java @@ -14,8 +14,10 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.diagnostics.Diagnostic; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.linking.langATestLanguage.Main; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API @@ -25,23 +27,23 @@ public class LinkingErrorTest extends AbstractXtextTests { private static final Logger logger = Logger.getLogger(CrossRefTest.class); @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LangATestLanguageStandaloneSetup.class); } - public void testNoErrors() throws Exception { + @Test public void testNoErrors() throws Exception { XtextResource resource = getResourceFromString(" type A extends B \n type B extends A"); - EObject model = getModel(resource); - assertWithXtend("2", "types.size", model); + Main model = (Main) getModel(resource); + assertEquals(2, model.getTypes().size()); assertEquals(0, resource.getErrors().size()); assertEquals(0, resource.getWarnings().size()); } - public void testLinkError() throws Exception { + @Test public void testLinkError() throws Exception { XtextResource resource = getResourceFromStringAndExpect(" type A extends B \n type B extends C", 1); - EObject model = getModel(resource); - assertWithXtend("2", "types.size", model); + Main model = (Main) getModel(resource); + assertEquals(2, model.getTypes().size()); assertEquals(1, resource.getErrors().size()); assertEquals(0, resource.getWarnings().size()); @@ -52,7 +54,7 @@ public class LinkingErrorTest extends AbstractXtextTests { assertEquals(1, verboseError.getLength()); } - public void testLinkingErrorMessage() throws Exception { + @Test public void testLinkingErrorMessage() throws Exception { XtextResource resource = getResourceFromStringAndExpect("type A extends B", 1); assertEquals(1, resource.getErrors().size()); Diagnostic error = (Diagnostic) resource.getErrors().get(0); @@ -79,17 +81,17 @@ public class LinkingErrorTest extends AbstractXtextTests { return getTreeIteratorContentSize(iterator); } - public void testReparse() throws Exception { + @Test public void testReparse() throws Exception { String modelText = " type A extends B \n type B extends C"; XtextResource resource = getResourceFromStringAndExpect(modelText, 1); - EObject model = getModel(resource); - - assertWithXtend("2", "types.size", model); + Main model = (Main) getModel(resource); + + assertEquals(2, model.getTypes().size()); assertEquals(4, getContentSize(model)); resource.reparse(modelText); - model = getModel(resource); - assertWithXtend("2", "types.size", model); + model = (Main) getModel(resource); + assertEquals(2, model.getTypes().size()); assertEquals(4, getContentSize(model)); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java index bcb748c2a..5c7224774 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/LinkingWarningsTest.java @@ -10,8 +10,9 @@ package org.eclipse.xtext.linking; import org.eclipse.xtext.diagnostics.Diagnostic; import org.eclipse.xtext.diagnostics.DiagnosticMessage; import org.eclipse.xtext.diagnostics.Severity; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; @@ -29,7 +30,7 @@ public class LinkingWarningsTest extends AbstractXtextTests implements ILinkingD private final String expected = "Expected Message"; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new LangATestLanguageStandaloneSetup() { @Override @@ -48,13 +49,13 @@ public class LinkingWarningsTest extends AbstractXtextTests implements ILinkingD return new DiagnosticMessage(expected, Severity.WARNING, Diagnostic.LINKING_DIAGNOSTIC); } - public void testNoErrors() throws Exception { + @Test public void testNoErrors() throws Exception { XtextResource resource = getResourceFromString(" type A extends B \n type B extends A"); assertTrue(resource.getErrors().isEmpty()); assertTrue(resource.getWarnings().isEmpty()); } - public void testLinkingProblemAsWarning() throws Exception { + @Test public void testLinkingProblemAsWarning() throws Exception { String modelAsText = "type A extends B \n type B extends C"; XtextResource resource = getResourceFromStringAndExpect(modelAsText, 0); assertTrue(resource.getErrors().isEmpty()); @@ -65,7 +66,7 @@ public class LinkingWarningsTest extends AbstractXtextTests implements ILinkingD assertEquals(expected, warning.getMessage()); } - public void testFixedLinkingProblem() throws Exception { + @Test public void testFixedLinkingProblem() throws Exception { String modelAsText = "type A extends B \n type B extends C"; XtextResource resource = getResourceFromStringAndExpect(modelAsText, 0); assertTrue(resource.getErrors().isEmpty()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java index c7518d87b..7bc762825 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/PartialLinkingTest.java @@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.impl.DefaultLinkingService; import org.eclipse.xtext.linking.impl.Linker; import org.eclipse.xtext.linking.impl.LinkingDiagnosticMessageProvider; @@ -33,6 +33,7 @@ import org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider; import org.eclipse.xtext.scoping.impl.LoadOnDemandResourceDescriptions; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; import org.eclipse.xtext.util.IResourceScopeCache; +import org.junit.Test; import com.google.inject.Provider; @@ -56,7 +57,7 @@ public class PartialLinkingTest extends AbstractXtextTests implements IScopeProv private EReference reference; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ReferenceGrammarTestLanguageStandaloneSetup.class); IQualifiedNameConverter nameConverter = new IQualifiedNameConverter.DefaultImpl(); @@ -115,7 +116,7 @@ public class PartialLinkingTest extends AbstractXtextTests implements IScopeProv } @SuppressWarnings("unchecked") - public void testPartialLinking() { + @Test public void testPartialLinking() { int idx = modelAsText.indexOf("Bommel2 2"); resource.update(idx + 1, 1, "o"); EList content = (EList) context.eGet(reference); @@ -123,7 +124,7 @@ public class PartialLinkingTest extends AbstractXtextTests implements IScopeProv } @SuppressWarnings("unchecked") - public void testPartialLinkingTwice() { + @Test public void testPartialLinkingTwice() { int idx = modelAsText.indexOf("Bommel2 2"); resource.update(idx + 1, 1, "o"); resource.update(idx + 1, 1, "o"); @@ -132,7 +133,7 @@ public class PartialLinkingTest extends AbstractXtextTests implements IScopeProv } @SuppressWarnings("unchecked") - public void testPartialLinkingFakedScope() { + @Test public void testPartialLinkingFakedScope() { replaceLinker(resource); assertTrue(resource.getErrors().isEmpty()); int idx = modelAsText.indexOf("Bommel2 2"); @@ -145,7 +146,7 @@ public class PartialLinkingTest extends AbstractXtextTests implements IScopeProv } @SuppressWarnings("unchecked") - public void testLinking() { + @Test public void testLinking() { EList content = (EList) context.eGet(reference); assertEquals(1, content.size()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java index 9cb680d21..337c07b06 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/SimpleAttributeResolverTest.java @@ -10,19 +10,20 @@ package org.eclipse.xtext.linking; import java.util.Arrays; import java.util.Iterator; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.xtext.util.SimpleAttributeResolver; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class SimpleAttributeResolverTest extends TestCase { +public class SimpleAttributeResolverTest extends Assert { private EcoreFactory factory; @@ -31,22 +32,21 @@ public class SimpleAttributeResolverTest extends TestCase { @SuppressWarnings("rawtypes") private SimpleAttributeResolver superClassResolver; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { factory = EcoreFactory.eINSTANCE; nameResolver = SimpleAttributeResolver.newResolver(String.class, "name"); superClassResolver = SimpleAttributeResolver.newResolver(EList.class, "eSuperTypes"); } - public void testGetNameValue() { + @Test public void testGetNameValue() { EClass clazz = factory.createEClass(); clazz.setName("ClassName"); String name = nameResolver.getValue(clazz); assertEquals("ClassName", name); } - public void testGetNameValueTwice() { + @Test public void testGetNameValueTwice() { EClass clazz = factory.createEClass(); clazz.setName("ClassName"); assertEquals(0, clazz.eAdapters().size()); @@ -58,13 +58,13 @@ public class SimpleAttributeResolverTest extends TestCase { assertEquals("ClassName2", name); } - public void testGetUnknownValue() { + @Test public void testGetUnknownValue() { EFactory fact = factory.createEFactory(); String name = nameResolver.getValue(fact); assertNull(name); } - public void testGetNameMatches() { + @Test public void testGetNameMatches() { EClass clazzMatch = factory.createEClass(); EClass clazzNoMatch = factory.createEClass(); clazzMatch.setName("ClassName"); @@ -77,7 +77,7 @@ public class SimpleAttributeResolverTest extends TestCase { assertFalse(iter.hasNext()); } - public void testGetListValue() { + @Test public void testGetListValue() { EClass clazz = factory.createEClass(); assertNotNull(clazz.getESuperTypes()); EList superTypes = superClassResolver.getValue(clazz); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java index 8008fcb0b..f0ec65213 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/BasicLazyLinkingTest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; import org.eclipse.xtext.linking.lazy.lazyLinking.Model; import org.eclipse.xtext.linking.lazy.lazyLinking.Property; @@ -24,6 +24,7 @@ import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -37,12 +38,12 @@ public class BasicLazyLinkingTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new LazyLinkingTestLanguageStandaloneSetup()); } - public void testLazyLinking() throws Exception { + @Test public void testLazyLinking() throws Exception { XtextResource resource = getResource(new StringInputStream("type A extends B.id{} type B { A id; }")); doTest(resource); } @@ -58,17 +59,17 @@ public class BasicLazyLinkingTest extends AbstractXtextTests { assertEquals(typeB.getProperties().get(0),parentId); } - public void testRecursion() throws Exception { + @Test public void testRecursion() throws Exception { XtextResource resource = getResource(new StringInputStream("type A extends B.a { B b; } type B extends A.b { A a; }")); doTest(resource); } - public void testBackwardDependency() throws Exception { + @Test public void testBackwardDependency() throws Exception { XtextResource resource = getResource(new StringInputStream("type A for a in B { B b; } type B for b in A { A a; }")); doTest(resource); } - public void testLazyMultiRef() throws Exception { + @Test public void testLazyMultiRef() throws Exception { XtextResource resource = getResource(new StringInputStream("type A {} type B { A B a; }")); Model m = (Model) resource.getContents().get(0); Type t2 = m.getTypes().get(1); @@ -81,7 +82,7 @@ public class BasicLazyLinkingTest extends AbstractXtextTests { assertFalse(((InternalEObject)types.get(1)).eIsProxy()); } - public void testLazyMultiRefDuplicates() throws Exception { + @Test public void testLazyMultiRefDuplicates() throws Exception { XtextResource resource = getResource(new StringInputStream("type A {} type B { A B A a; }")); Model m = (Model) resource.getContents().get(0); Type t1 = m.getTypes().get(0); @@ -98,7 +99,7 @@ public class BasicLazyLinkingTest extends AbstractXtextTests { assertEquals(t1, types.get(2)); } - public void testBug281775_01() throws Exception { + @Test public void testBug281775_01() throws Exception { String model = "type A {\n" + " A B a;\n" + "}\n" + @@ -123,7 +124,7 @@ public class BasicLazyLinkingTest extends AbstractXtextTests { assertEquals(t1, propB.getType().get(1)); } - public void testBug281775_02() throws Exception { + @Test public void testBug281775_02() throws Exception { String model = "type A {\n" + " unresolved A B a;\n" + "}\n" + @@ -152,7 +153,7 @@ public class BasicLazyLinkingTest extends AbstractXtextTests { // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=282486 // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=303441 @SuppressWarnings("unchecked") - public void testReferenceWithOpposite() throws Exception { + @Test public void testReferenceWithOpposite() throws Exception { XtextResource resource = getResourceAndExpect(new StringInputStream("type foo {} type bar extends foo {}"), 1); Model model = (Model) resource.getContents().get(0); Type typeFoo = model.getTypes().get(0); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java index 429d3f26d..ac09fde2f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug281990Test.java @@ -8,10 +8,11 @@ package org.eclipse.xtext.linking.lazy; import org.eclipse.emf.ecore.EReference; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.lazy.lazyLinking.Type; import org.eclipse.xtext.scoping.IScope; import org.eclipse.xtext.scoping.IScopeProvider; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -26,7 +27,7 @@ public class Bug281990Test extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new LazyLinkingTestLanguageRuntimeModule() { @Override @@ -37,7 +38,7 @@ public class Bug281990Test extends AbstractXtextTests { new LazyLinkingTestLanguageStandaloneSetup().register(getInjector()); } - public void testRecursionErrorMessage() throws Exception { + @Test public void testRecursionErrorMessage() throws Exception { try { getModel("type Foo extends Foo.bar { Foo foo; }"); fail("Exception expected."); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java index 7f62a8876..ecd48bd8f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug289059Test.java @@ -7,9 +7,10 @@ *******************************************************************************/ package org.eclipse.xtext.linking.lazy; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.Bug289059TestLanguageStandaloneSetup; import org.eclipse.xtext.linking.bug289059Test.Model; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,18 +18,18 @@ import org.eclipse.xtext.linking.bug289059Test.Model; public class Bug289059Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug289059TestLanguageStandaloneSetup.class); } - public void testModelLinked_01() throws Exception { + @Test public void testModelLinked_01() throws Exception { String modelAsText = "model model"; Model model = (Model) getModel(modelAsText); assertSame(model, model.getReference()); } - public void testModelLinked_02() throws Exception { + @Test public void testModelLinked_02() throws Exception { String modelAsText = "model enabled model"; Model model = (Model) getModel(modelAsText); assertSame(model, model.getReference()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java index e51731f7b..9c3497d18 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug311337Test.java @@ -7,8 +7,9 @@ *******************************************************************************/ package org.eclipse.xtext.linking.lazy; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.lazy.bug311337.Model; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -16,12 +17,12 @@ import org.eclipse.xtext.linking.lazy.bug311337.Model; public class Bug311337Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new Bug311337TestLanguageStandaloneSetup()); } - public void testNoCyclicLinkingException() throws Exception { + @Test public void testNoCyclicLinkingException() throws Exception { Model model = (Model) getModel( "/************************************/\n"+ "(def) local :\n"+ diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java index b7d53911a..dc5bdae7c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkerTest.java @@ -28,7 +28,7 @@ import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextFactory; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.LeafNode; @@ -38,6 +38,7 @@ import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.resource.impl.ListBasedDiagnosticConsumer; import org.eclipse.xtext.util.Pair; +import org.junit.Test; import com.google.common.collect.Lists; import com.google.inject.AbstractModule; @@ -52,7 +53,7 @@ public class LazyLinkerTest extends AbstractXtextTests { private XtextResourceSet resourceSet; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new AbstractModule() { @Override @@ -85,14 +86,14 @@ public class LazyLinkerTest extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { lazyLinkingPackage = null; linker = null; resourceSet = null; super.tearDown(); } - public void testSingleValuedResolveProxiesReference() throws Exception { + @Test public void testSingleValuedResolveProxiesReference() throws Exception { final EObject foo = newEObject("Foo"); final EObject bar = newEObject("Bar"); final Resource resource = new ResourceImpl(URI.createURI("http://foo/bar.ecore")) { @@ -114,7 +115,7 @@ public class LazyLinkerTest extends AbstractXtextTests { assertEquals(bar, foo.eGet(eReference, false)); } - public void testManyValuedResolveProxiesReference() throws Exception { + @Test public void testManyValuedResolveProxiesReference() throws Exception { final EObject foo = newEObject("Foo"); final List bars = Lists.newArrayList(newEObject("Bar"), newEObject("Bar")); final Iterator barsIterator = bars.iterator(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java index 0d1e4df71..c873c688b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingResourceTest.java @@ -36,7 +36,7 @@ import org.eclipse.xtext.diagnostics.Severity; import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; import org.eclipse.xtext.index.indexTestLanguage.Entity; import org.eclipse.xtext.index.indexTestLanguage.IndexTestLanguagePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.ILinkingService; import org.eclipse.xtext.linking.impl.IllegalNodeException; import org.eclipse.xtext.linking.impl.LinkingDiagnosticMessageProvider; @@ -54,6 +54,7 @@ import org.eclipse.xtext.util.CancelIndicator; import org.eclipse.xtext.util.StringInputStream; import org.eclipse.xtext.util.Triple; import org.eclipse.xtext.util.Tuples; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Lists; @@ -66,7 +67,7 @@ import com.google.inject.Injector; */ public class LazyLinkingResourceTest extends AbstractXtextTests { - public void testEObjectReference() throws Exception { + @Test public void testEObjectReference() throws Exception { final EAnnotation source = EcoreFactory.eINSTANCE.createEAnnotation(); final EObject referencedObject = XtextFactory.eINSTANCE.createGrammar(); @@ -99,7 +100,7 @@ public class LazyLinkingResourceTest extends AbstractXtextTests { assertEquals(referencedObject, res.getEObject("foo")); } - public void testWarningInsteadOfError() throws Exception { + @Test public void testWarningInsteadOfError() throws Exception { final EAnnotation source = EcoreFactory.eINSTANCE.createEAnnotation(); LazyLinkingResource res = new LazyLinkingResource(); res.setEncoder(new LazyURIEncoder() { @@ -159,7 +160,7 @@ public class LazyLinkingResourceTest extends AbstractXtextTests { } }; - public void testResolveLazyCrossReferences() throws Exception { + @Test public void testResolveLazyCrossReferences() throws Exception { with(testLangaugeSetup()); ResourceSetImpl rs = new ResourceSetImpl(); final Resource res1 = rs.createResource(URI.createURI("file1.indextestlanguage")); @@ -195,7 +196,7 @@ public class LazyLinkingResourceTest extends AbstractXtextTests { assertFalse(((EObject)e.getProperties().get(1).eGet(IndexTestLanguagePackage.Literals.PROPERTY__TYPE, false)).eIsProxy()); } - public void testResolveLazyCrossReferences_01() throws Exception { + @Test public void testResolveLazyCrossReferences_01() throws Exception { with(testLangaugeSetup()); ResourceSetImpl rs = new ResourceSetImpl(); final Resource res1 = rs.createResource(URI.createURI("file1.indextestlanguage")); @@ -250,7 +251,7 @@ public class LazyLinkingResourceTest extends AbstractXtextTests { }; } - public void testResolveLazyCrossReferences_02() throws Exception { + @Test public void testResolveLazyCrossReferences_02() throws Exception { with(lazyLinkingTestLangaugeSetup()); ResourceSetImpl rs = new ResourceSetImpl(); final Resource res1 = rs.createResource(URI.createURI("file1.lazylinkingtestlanguage")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java index 9161fff08..94dc97cae 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageScopeProvider.java @@ -17,6 +17,7 @@ import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider; import org.eclipse.xtext.scoping.impl.SimpleScope; + import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java index 289f80fd0..c3c9024bf 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyURIEncoderTest.java @@ -15,16 +15,18 @@ import org.eclipse.xtext.nodemodel.impl.AbstractNode; import org.eclipse.xtext.nodemodel.impl.CompositeNode; import org.eclipse.xtext.nodemodel.impl.LeafNode; import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder; - -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API * */ -public class LazyURIEncoderTest extends TestCase { +public class LazyURIEncoderTest extends Assert { - public void testNodePath() throws Exception { + @Test public void testNodePath() throws Exception { NodeModelBuilder builder = new NodeModelBuilder(); ICompositeNode n = new CompositeNode(); ICompositeNode n1 = new CompositeNode(); @@ -45,16 +47,14 @@ public class LazyURIEncoderTest extends TestCase { private LazyURIEncoder encoder; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { encoder = new LazyURIEncoder(); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { encoder = null; - super.tearDown(); } private INode find(INode parent, INode toFind) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java index ab2b61714..4cad48d33 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/scoping/URINormalizationTest.java @@ -11,7 +11,7 @@ import static com.google.common.collect.Iterables.*; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.EcoreUtil2; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.ImportUriTestLanguageStandaloneSetup; import org.eclipse.xtext.linking.importedURI.ImportedURIPackage; import org.eclipse.xtext.linking.importedURI.Main; @@ -19,13 +19,14 @@ import org.eclipse.xtext.linking.importedURI.Type; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; import org.eclipse.xtext.scoping.IScopeProvider; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ public class URINormalizationTest extends AbstractXtextTests { - public void testGetElementByClasspathURIEObject() throws Exception { + @Test public void testGetElementByClasspathURIEObject() throws Exception { with(ImportUriTestLanguageStandaloneSetup.class); Main main = (Main) getModel("import 'classpath:/org/eclipse/xtext/linking/05.importuritestlanguage'\n" + "type Bar extends Foo"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext index 5867c543a..f5da6b1f6 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.xtext @@ -73,6 +73,19 @@ ExtendsPluginEObject: )? ; +Unused_01 returns ExtendsNsURIEObject: + {MyNamedElement_01} name = ValidID +; + +Unused_02 returns ExtendsResourceEObject: + {MyNamedElement_02} name = ValidID +; + +Unused_03 returns ExtendsPluginEObject: + {MyNamedElement_03} name = ValidID +; + + ExtendsResourceEObject: 'ExtendsResourceEObject' name=ValidID ( diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java index a869ebe08..a85d308a0 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/ExceptionTest.java @@ -8,8 +8,9 @@ package org.eclipse.xtext.metamodelreferencing.tests; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,12 +18,12 @@ import org.eclipse.xtext.resource.XtextResource; public class ExceptionTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testExceptionOnRegenerate() throws Exception { + @Test public void testExceptionOnRegenerate() throws Exception { String model = "grammar org.eclipse.xtext.ExceptionTest with org.eclipse.xtext.common.Terminals\n" + "generate existing 'http://www.eclipse.org/xtext/tests/grammarinheritance'\n" + "import 'classpath:/org/eclipse/xtext/grammarinheritance/ametamodel.ecore' as existing\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java index 76227fdf6..fdbf2272e 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java @@ -8,21 +8,21 @@ *******************************************************************************/ package org.eclipse.xtext.metamodelreferencing.tests; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.Foo; +import org.junit.Test; public class MetamodelRefTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new MetamodelRefTestLanguageStandaloneSetup()); } - public void testStuff() throws Exception { - Object parse = getModelAndExpect("foo bar", 1); - assertWithXtend("'org::eclipse::xtext::metamodelreferencing::tests::anotherSimpleTest::impl::FooImpl'", - "metaType.name", parse); - assertWithXtend("'org::eclipse::xtext::impl::RuleCallImpl'", "nameRefs.first().metaType.name", parse); + @Test public void testStuff() throws Exception { + Foo parse = (Foo) getModelAndExpect("foo bar", 1); + assertEquals(1, parse.getNameRefs().size()); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java index e3bb468bb..72d46e771 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java @@ -8,24 +8,24 @@ *******************************************************************************/ package org.eclipse.xtext.metamodelreferencing.tests; -import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.metamodelreferencing.tests.simpleTest.Foo; +import org.junit.Test; public class MultiGenMMTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new XtextStandaloneSetup()); with(new MultiGenMMTestLanguageStandaloneSetup()); } - public void testStuff() throws Exception { - EObject parse = getModel("foo 'bar'"); - assertWithXtend("'org::eclipse::xtext::metamodelreferencing::tests::simpleTest::impl::FooImpl'", "metaType.name", parse); - assertWithXtend("'org::eclipse::xtext::metamodelreferencing::tests::otherTest::impl::FooBarImpl'", "nameRefs.first().metaType.name", parse); + @Test public void testStuff() throws Exception { + Foo parse = (Foo) getModel("foo 'bar'"); + assertEquals(1, parse.getNameRefs().size()); } } 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 b01589f48..a99119cb3 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 @@ -25,7 +25,8 @@ import org.eclipse.emf.mwe.core.monitor.ProgressMonitor; import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; import org.eclipse.xtext.index.indexTestLanguage.Entity; import org.eclipse.xtext.index.indexTestLanguage.IndexTestLanguagePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; import com.google.common.base.Predicate; @@ -34,7 +35,7 @@ import com.google.common.base.Predicate; */ public abstract class AbstractReaderTest extends AbstractXtextTests { - public void testLoadMatchNone() throws Exception { + @Test public void testLoadMatchNone() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -56,7 +57,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { assertTrue(slotContent.isEmpty()); } - public void testLoadMatchAll() throws Exception { + @Test public void testLoadMatchAll() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -86,7 +87,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testLoadByType() throws Exception { + @Test public void testLoadByType() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -102,7 +103,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testLoadBySuperType() throws Exception { + @Test public void testLoadBySuperType() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -117,7 +118,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { assertEquals(3, entities.size()); } - public void testLoadByType_FirstOnly() throws Exception { + @Test public void testLoadByType_FirstOnly() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -133,7 +134,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testLoadByType_withNsURI() throws Exception { + @Test public void testLoadByType_withNsURI() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -149,7 +150,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { assertEquals(2, entities.size()); } - public void testLoadByType_withUnkownNsURI() throws Exception { + @Test public void testLoadByType_withUnkownNsURI() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -178,7 +179,7 @@ public abstract class AbstractReaderTest extends AbstractXtextTests { }; } - public void testParseClassPath() throws Exception { + @Test public void testParseClassPath() throws Exception { Reader reader = getReader(); assertEquals(0, reader.getPathes().size()); reader.setUseJavaClassPath(true); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java index 1ca4ec445..d0a39a49b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/NameBasedFilterTest.java @@ -8,19 +8,19 @@ package org.eclipse.xtext.mwe; import org.eclipse.emf.common.util.URI; - -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class NameBasedFilterTest extends TestCase { +public class NameBasedFilterTest extends Assert { - public void testNullUri() { + @Test public void testNullUri() { assertFalse(new NameBasedFilter().matches(null)); } - public void testByFileExtension() { + @Test public void testByFileExtension() { NameBasedFilter filter = new NameBasedFilter(); filter.setExtension("foo"); URI match = URI.createFileURI("path/to/myFile.foo"); @@ -29,7 +29,7 @@ public class NameBasedFilterTest extends TestCase { assertFalse(filter.matches(mismatch)); } - public void testNoCriteria() { + @Test public void testNoCriteria() { NameBasedFilter filter = new NameBasedFilter(); URI match = URI.createFileURI("path/to/myFile.foo"); assertTrue(filter.matches(match)); @@ -37,7 +37,7 @@ public class NameBasedFilterTest extends TestCase { assertTrue(filter.matches(match)); } - public void testByRegularExpression() { + @Test public void testByRegularExpression() { NameBasedFilter filter = new NameBasedFilter(); filter.setRegularExpression("ile\\.fo"); URI match = URI.createFileURI("path/to/myFile.foo"); @@ -46,7 +46,7 @@ public class NameBasedFilterTest extends TestCase { assertFalse(filter.matches(mismatch)); } - public void testByExtensionAndRegExpr() { + @Test public void testByExtensionAndRegExpr() { NameBasedFilter filter = new NameBasedFilter(); filter.setRegularExpression("ath"); filter.setExtension("foo"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java index ec8e7beb5..af5627f20 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/PathTraverserTest.java @@ -9,16 +9,16 @@ package org.eclipse.xtext.mwe; import java.util.Set; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; +import org.junit.Assert; +import org.junit.Test; import com.google.common.base.Predicate; /** * @author Sven Efftinge - Initial contribution and API */ -public class PathTraverserTest extends TestCase { +public class PathTraverserTest extends Assert { public static Predicate everythingButDummy = new Predicate() { public boolean apply(URI input) { @@ -26,19 +26,19 @@ public class PathTraverserTest extends TestCase { } }; - public void testEmptyFolder() throws Exception { + @Test public void testEmptyFolder() throws Exception { String path = pathTo("emptyFolder"); Set uris = new PathTraverser().findAllResourceUris(path, everythingButDummy); assertTrue(uris.isEmpty()); } - public void testNonEmptyFolder() throws Exception { + @Test public void testNonEmptyFolder() throws Exception { String path = pathTo("nonemptyFolder"); Set uris = new PathTraverser().findAllResourceUris(path, everythingButDummy); assertEquals(2,uris.size()); } - public void testArchive() throws Exception { + @Test public void testArchive() throws Exception { String path = pathTo("nonemptyJar.jar"); Set uris = new PathTraverser().findAllResourceUris(path, everythingButDummy); assertEquals(3,uris.size()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java index 39e9bfac5..eea5c56d3 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java @@ -15,6 +15,7 @@ import org.eclipse.emf.mwe.core.issues.Issues; import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; import org.eclipse.xtext.index.indexTestLanguage.Datatype; import org.eclipse.xtext.index.indexTestLanguage.Entity; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -28,7 +29,7 @@ public class ReaderTest extends AbstractReaderTest { return new SlotEntry(); } - public void testLoadOne() throws Exception { + @Test public void testLoadOne() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -45,7 +46,7 @@ public class ReaderTest extends AbstractReaderTest { assertEquals("Person", ((Entity) ctx.get("model")).getName()); } - public void testLoadTwo() throws Exception { + @Test public void testLoadTwo() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -75,7 +76,7 @@ public class ReaderTest extends AbstractReaderTest { } @SuppressWarnings("unchecked") - public void testLoadAll() throws Exception { + @Test public void testLoadAll() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -90,7 +91,7 @@ public class ReaderTest extends AbstractReaderTest { } @SuppressWarnings("unchecked") - public void testShadowingPathes() throws Exception { + @Test public void testShadowingPathes() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("shadowingtest/folder 1")); reader.addPath(pathTo("shadowingtest/folder 2")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java index c87ab4247..aecb2d6d5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ResourceSetBasedSlotEntryReaderTest.java @@ -12,6 +12,7 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.mwe.core.WorkflowContext; import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -24,7 +25,7 @@ public class ResourceSetBasedSlotEntryReaderTest extends AbstractReaderTest { } @SuppressWarnings("unchecked") - public void testLoadAll() throws Exception { + @Test public void testLoadAll() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); @@ -39,7 +40,7 @@ public class ResourceSetBasedSlotEntryReaderTest extends AbstractReaderTest { } @SuppressWarnings("unchecked") - public void testLoadFileElements() throws Exception { + @Test public void testLoadFileElements() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("emptyFolder")); reader.addPath(pathTo("nonemptyFolder")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java index a277d3298..413bb1954 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java @@ -19,11 +19,12 @@ import org.eclipse.xtext.Constants; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.ImportUriTestLanguageStandaloneSetup; import org.eclipse.xtext.linking.importedURI.Type; import org.eclipse.xtext.resource.IResourceFactory; import org.eclipse.xtext.resource.IResourceServiceProvider; +import org.junit.Test; import com.google.inject.Binder; import com.google.inject.Guice; @@ -60,7 +61,7 @@ public class UriBasedReaderTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testTransitiveReferences() throws Exception { + @Test public void testTransitiveReferences() throws Exception { UriBasedReader reader = new UriBasedReader(); reader.addRegister(new ImportUriTestLanguageStandaloneSetup()); reader.addUri("file:" + pathTo("importUriSubfolder/Start.importuritestlanguage")); @@ -92,7 +93,7 @@ public class UriBasedReaderTest extends AbstractXtextTests { } } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { UriBasedReader reader = new UriBasedReader() { { getValidator().setStopOnError(false); @@ -115,7 +116,7 @@ public class UriBasedReaderTest extends AbstractXtextTests { assertEquals(issues.toString(), 1, issues.getErrors().length); } - public void testMissingRegistration() throws Exception { + @Test public void testMissingRegistration() throws Exception { with(new XtextErrorStandaloneSetup()); UriBasedReader reader = new UriBasedReader(); reader.setClasspathURIContext(getClass()); @@ -126,7 +127,7 @@ public class UriBasedReaderTest extends AbstractXtextTests { assertTrue(issues.hasErrors()); } - public void testMissingUri() throws Exception { + @Test public void testMissingUri() throws Exception { UriBasedReader reader = new UriBasedReader(); reader.setClasspathURIContext(getClass()); reader.addRegister(new XtextStandaloneSetup()); @@ -136,7 +137,7 @@ public class UriBasedReaderTest extends AbstractXtextTests { assertTrue(issues.hasErrors()); } - public void testIssuesInOtherResource() throws Exception { + @Test public void testIssuesInOtherResource() throws Exception { UriBasedReader reader = new UriBasedReader() { { getValidator().setStopOnError(false); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java index 9b4dce8f1..82ff2252e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ValidatorTest.java @@ -11,6 +11,7 @@ import org.eclipse.emf.mwe.core.WorkflowContext; import org.eclipse.emf.mwe.core.issues.Issues; import org.eclipse.emf.mwe.core.issues.MWEDiagnostic; import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Michael Clay - Initial contribution and API @@ -35,7 +36,7 @@ public class ValidatorTest extends AbstractReaderTest { /** * https://bugs.eclipse.org/bugs/show_bug.cgi?id=322645 */ - public void testBugFix322645() throws Exception { + @Test public void testBugFix322645() throws Exception { Reader reader = getReader(); reader.addPath(pathTo("nonemptyFolder")); reader.addRegister(new IndexTestLanguageStandaloneSetup()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java index 05d06ed21..3a3014a17 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/DeclarativeQualifiedNameConverterTest.java @@ -7,14 +7,15 @@ *******************************************************************************/ package org.eclipse.xtext.naming; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class DeclarativeQualifiedNameConverterTest extends TestCase { +public class DeclarativeQualifiedNameConverterTest extends Assert { - public void testQualifiedNameConverter() throws Exception { + @Test public void testQualifiedNameConverter() throws Exception { IQualifiedNameConverter qualifiedNameConverter = new IQualifiedNameConverter.DefaultImpl() { @Override public String getDelimiter() { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java index 49772b0bd..124b95cbd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/naming/QualifiedNameTest.java @@ -7,16 +7,17 @@ *******************************************************************************/ package org.eclipse.xtext.naming; -import com.google.common.base.Function; +import org.junit.Assert; +import org.junit.Test; -import junit.framework.TestCase; +import com.google.common.base.Function; /** * @author Jan Koehnlein - Initial contribution and API */ -public class QualifiedNameTest extends TestCase { +public class QualifiedNameTest extends Assert { - public void testCreateNull() { + @Test public void testCreateNull() { assertEquals(QualifiedName.EMPTY, QualifiedName.create()); assertEquals(QualifiedName.EMPTY, QualifiedName.create(new String[0])); assertEquals(QualifiedName.EMPTY, QualifiedName.create((String[]) null)); @@ -26,7 +27,7 @@ public class QualifiedNameTest extends TestCase { } catch(IllegalArgumentException e) {} } - public void testSegments() { + @Test public void testSegments() { QualifiedName qn = QualifiedName.create("foo", "bar", "baz"); assertEquals(3, qn.getSegmentCount()); assertEquals("foo", qn.getSegment(0)); @@ -36,7 +37,7 @@ public class QualifiedNameTest extends TestCase { assertEquals("baz", qn.getLastSegment()); } - public void testStartsWith() { + @Test public void testStartsWith() { QualifiedName qn = QualifiedName.create("foo", "bar", "baz"); QualifiedName qn1 = QualifiedName.create("foo", "bar"); assertTrue(qn.startsWith(qn1)); @@ -50,7 +51,7 @@ public class QualifiedNameTest extends TestCase { assertFalse(qn2.startsWithIgnoreCase(qn)); } - public void testSkip() throws Exception { + @Test public void testSkip() throws Exception { QualifiedName qn = QualifiedName.create("foo", "bar", "baz"); QualifiedName baz = qn.skipFirst(2); assertEquals(1, baz.getSegmentCount()); @@ -79,7 +80,7 @@ public class QualifiedNameTest extends TestCase { } catch(IllegalArgumentException e) {} } - public void testAppend() { + @Test public void testAppend() { QualifiedName qn = QualifiedName.create("foo"); QualifiedName fooBar = qn.append("bar"); assertEquals(2, fooBar.getSegmentCount()); @@ -94,7 +95,7 @@ public class QualifiedNameTest extends TestCase { assertEquals("bar", fooBarFooBar.getSegment(3)); } - public void testEquals() { + @Test public void testEquals() { QualifiedName qn = QualifiedName.create("foo", "bar"); assertEquals(qn, qn); assertNotSame(qn, qn.skipFirst(1)); @@ -109,7 +110,7 @@ public class QualifiedNameTest extends TestCase { } - public void testCompare() throws Exception { + @Test public void testCompare() throws Exception { QualifiedName a = QualifiedName.create("a"); QualifiedName b = QualifiedName.create("b"); assertTrue(a.compareTo(b) < 0); @@ -137,12 +138,12 @@ public class QualifiedNameTest extends TestCase { assertEquals(0, aa.compareToIgnoreCase(aA)); } - public void testToString() throws Exception { + @Test public void testToString() throws Exception { QualifiedName qn = QualifiedName.create("foo", "bar"); assertEquals("foo.bar", qn.toString()); } - public void testToCase() throws Exception { + @Test public void testToCase() throws Exception { QualifiedName qn = QualifiedName.create("foo", "bar"); QualifiedName qnUpper = qn.toUpperCase(); assertFalse(qnUpper.equals(qn)); @@ -152,7 +153,7 @@ public class QualifiedNameTest extends TestCase { assertEquals(qn.toString(), qnUpper.toLowerCase().toString()); } - public void testEmpty() { + @Test public void testEmpty() { assertEquals(0, QualifiedName.EMPTY.getSegmentCount()); assertTrue(QualifiedName.EMPTY.getSegments().isEmpty()); try { @@ -166,7 +167,7 @@ public class QualifiedNameTest extends TestCase { assertEquals("foo", foo.getLastSegment()); } - public void testWrapper() throws Exception { + @Test public void testWrapper() throws Exception { Function identity = new Function() { public String apply(String from) { return from; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java index d1800c646..b3f41f95a 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractCompositeNodeTest.java @@ -7,18 +7,20 @@ *******************************************************************************/ package org.eclipse.xtext.nodemodel; -import junit.framework.TestCase; - import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.xtext.nodemodel.impl.AbstractNode; import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public abstract class AbstractCompositeNodeTest extends TestCase { +public abstract class AbstractCompositeNodeTest extends Assert { private NodeModelBuilder mutator; @@ -32,19 +34,17 @@ public abstract class AbstractCompositeNodeTest extends TestCase { mutator.addChild(composite, leaf); } - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { this.mutator = new NodeModelBuilder(); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { this.mutator = null; - super.tearDown(); } - public void testAddChild_00() { + @Test public void testAddChild_00() { ICompositeNode composite = createCompositeNode(); LeafNode first = new LeafNode(); addChild(composite, first); @@ -54,7 +54,7 @@ public abstract class AbstractCompositeNodeTest extends TestCase { assertSame(first, first.basicGetPreviousSibling()); } - public void testAddChild_01() { + @Test public void testAddChild_01() { ICompositeNode composite = createCompositeNode(); LeafNode first = new LeafNode(); LeafNode second = new LeafNode(); @@ -69,7 +69,7 @@ public abstract class AbstractCompositeNodeTest extends TestCase { assertSame(composite, second.getParent()); } - public void testAddChild_02() { + @Test public void testAddChild_02() { ICompositeNode composite = createCompositeNode(); LeafNode first = new LeafNode(); LeafNode second = new LeafNode(); @@ -89,7 +89,7 @@ public abstract class AbstractCompositeNodeTest extends TestCase { assertSame(composite, third.getParent()); } - public void testActsAsAdapter() { + @Test public void testActsAsAdapter() { EObject object = EcoreFactory.eINSTANCE.createEObject(); ICompositeNode composite = createCompositeNode(); object.eAdapters().add((Adapter) composite); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java index b6c990985..82d77b758 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/AbstractNodeTest.java @@ -11,50 +11,50 @@ import java.util.NoSuchElementException; import org.eclipse.xtext.nodemodel.impl.AbstractNode; import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder; - -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public abstract class AbstractNodeTest extends TestCase { +public abstract class AbstractNodeTest extends Assert { protected NodeModelBuilder builder; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { builder = new NodeModelBuilder(); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { builder = null; - super.tearDown(); } protected abstract AbstractNode createNode(); - public void testGetParent() { + @Test public void testGetParent() { AbstractNode node = createNode(); ICompositeNode parent = builder.newRootNode("input"); builder.addChild(parent, node); assertSame(parent, node.getParent()); } - public void testGetParent_NoParent() { + @Test public void testGetParent_NoParent() { AbstractNode node = createNode(); assertNull(node.getParent()); } - public void testGetRootNode() { + @Test public void testGetRootNode() { AbstractNode node = createNode(); ICompositeNode rootNode = builder.newRootNode("My input"); builder.addChild(rootNode, node); assertSame(rootNode, node.getRootNode()); } - public void testGetRootNode_Parent() { + @Test public void testGetRootNode_Parent() { AbstractNode node = createNode(); ICompositeNode rootNode = builder.newRootNode("My input"); ICompositeNode parent = builder.newCompositeNode(null, 0, rootNode); @@ -62,19 +62,19 @@ public abstract class AbstractNodeTest extends TestCase { assertSame(rootNode, node.getRootNode()); } - public void testGetRootNode_NoParent() { + @Test public void testGetRootNode_NoParent() { AbstractNode node = createNode(); assertNull(node.getRootNode()); } - public void testGetRootNode_NoRoot() { + @Test public void testGetRootNode_NoRoot() { AbstractNode node = createNode(); ICompositeNode parent = new CompositeNode(); builder.addChild(parent, node); assertNull(node.getRootNode()); } - public void testIterator_Next() { + @Test public void testIterator_Next() { AbstractNode node = createNode(); BidiIterator iterator = node.iterator(); assertTrue(iterator.hasNext()); @@ -88,7 +88,7 @@ public abstract class AbstractNodeTest extends TestCase { } } - public void testIterator_Previous() { + @Test public void testIterator_Previous() { AbstractNode node = createNode(); BidiIterator iterator = node.iterator(); assertTrue(iterator.hasPrevious()); @@ -102,7 +102,7 @@ public abstract class AbstractNodeTest extends TestCase { } } - public void testIterator_Bidi() { + @Test public void testIterator_Bidi() { AbstractNode node = createNode(); BidiIterator iterator = node.iterator(); assertSame(node, iterator.next()); @@ -111,7 +111,7 @@ public abstract class AbstractNodeTest extends TestCase { assertTrue(iterator.hasNext()); } - public void testTreeIterator_Next() { + @Test public void testTreeIterator_Next() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode node = createNode(); builder.addChild(rootNode, node); @@ -127,7 +127,7 @@ public abstract class AbstractNodeTest extends TestCase { } } - public void testTreeIterator_Next_NoParent() { + @Test public void testTreeIterator_Next_NoParent() { AbstractNode node = createNode(); BidiIterator iterator = node.iterator(); assertTrue(iterator.hasNext()); @@ -141,7 +141,7 @@ public abstract class AbstractNodeTest extends TestCase { } } - public void testTreeIterator_Previous() { + @Test public void testTreeIterator_Previous() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode node = createNode(); builder.addChild(rootNode, node); @@ -157,7 +157,7 @@ public abstract class AbstractNodeTest extends TestCase { } } - public void testTreeIterator_Previous_NoParent() { + @Test public void testTreeIterator_Previous_NoParent() { AbstractNode node = createNode(); BidiIterator iterator = node.iterator(); assertTrue(iterator.hasPrevious()); @@ -171,7 +171,7 @@ public abstract class AbstractNodeTest extends TestCase { } } - public void testTreeIterator_Bidi() { + @Test public void testTreeIterator_Bidi() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode node = createNode(); builder.addChild(rootNode, node); @@ -182,7 +182,7 @@ public abstract class AbstractNodeTest extends TestCase { assertTrue(iterator.hasNext()); } - public void testTreeIterator_Bidi_NoParent() { + @Test public void testTreeIterator_Bidi_NoParent() { AbstractNode node = createNode(); BidiIterator iterator = node.iterator(); assertSame(node, iterator.next()); @@ -193,7 +193,7 @@ public abstract class AbstractNodeTest extends TestCase { public abstract void testGetText_Default(); - public void testGetText_NoParent() { + @Test public void testGetText_NoParent() { AbstractNode node = createNode(); assertNull(node.getText()); } @@ -212,7 +212,7 @@ public abstract class AbstractNodeTest extends TestCase { public abstract void testGetSemanticElement(); - public void testGetNextSibling_SingleChild() { + @Test public void testGetNextSibling_SingleChild() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode node = createNode(); builder.addChild(rootNode, node); @@ -220,7 +220,7 @@ public abstract class AbstractNodeTest extends TestCase { assertNull(node.getNextSibling()); } - public void testGetNextSibling_FirstChild() { + @Test public void testGetNextSibling_FirstChild() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode first = createNode(); AbstractNode second = createNode(); @@ -230,7 +230,7 @@ public abstract class AbstractNodeTest extends TestCase { assertSame(second, first.getNextSibling()); } - public void testGetNextSibling_LastChild() { + @Test public void testGetNextSibling_LastChild() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode first = createNode(); AbstractNode second = createNode(); @@ -240,7 +240,7 @@ public abstract class AbstractNodeTest extends TestCase { assertNull(second.getNextSibling()); } - public void testGetPreviousSibling_SingleChild() { + @Test public void testGetPreviousSibling_SingleChild() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode node = createNode(); builder.addChild(rootNode, node); @@ -249,7 +249,7 @@ public abstract class AbstractNodeTest extends TestCase { assertFalse(node.hasSiblings()); } - public void testGetPreviousSibling_FirstChild() { + @Test public void testGetPreviousSibling_FirstChild() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode first = createNode(); AbstractNode second = createNode(); @@ -260,7 +260,7 @@ public abstract class AbstractNodeTest extends TestCase { assertTrue(first.hasSiblings()); } - public void testGetPreviousSibling_LastChild() { + @Test public void testGetPreviousSibling_LastChild() { ICompositeNode rootNode = builder.newRootNode("input"); AbstractNode first = createNode(); AbstractNode second = createNode(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java index 6b936cb06..14b38ddcd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/CompositeNodeTest.java @@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.util.EcoreAdapterFactory; import org.eclipse.xtext.nodemodel.impl.AbstractNode; +import org.junit.Test; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; @@ -25,7 +26,7 @@ import com.google.common.collect.Iterables; public class CompositeNodeTest extends AbstractCompositeNodeTest { @Override - public void testTextOffsetLength() { + @Test public void testTextOffsetLength() { RootNode root = new RootNode(); String completeContent = " completeContent "; root.basicSetCompleteContent(completeContent); @@ -48,7 +49,7 @@ public class CompositeNodeTest extends AbstractCompositeNodeTest { assertEquals(completeContent.trim().length(), composite.getTotalLength()); } - public void testGetTotalOffsetWithoutChildren() { + @Test public void testGetTotalOffsetWithoutChildren() { RootNode rootNode = new RootNode(); rootNode.basicSetCompleteContent("my string"); LeafNode leafNode = new LeafNode(); @@ -84,7 +85,7 @@ public class CompositeNodeTest extends AbstractCompositeNodeTest { assertEquals(3, thirdGrandChild.getOffset()); } - public void testGetLeafNodes_01() { + @Test public void testGetLeafNodes_01() { RootNode rootNode = new RootNode(); rootNode.basicSetCompleteContent("my string"); CompositeNode first = new CompositeNode(); @@ -134,7 +135,7 @@ public class CompositeNodeTest extends AbstractCompositeNodeTest { return new CompositeNodeWithSemanticElement(); } - public void testIsAdapterForType() { + @Test public void testIsAdapterForType() { EObject object = EcoreFactory.eINSTANCE.createEObject(); CompositeNodeWithSemanticElement node = createCompositeNode(); object.eAdapters().add(node); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java index 50aa7218b..fbba80681 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LeafNodeTest.java @@ -9,6 +9,7 @@ package org.eclipse.xtext.nodemodel; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcoreFactory; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,42 +22,42 @@ public class LeafNodeTest extends AbstractNodeTest { } @Override - public void testGetText_Default() { + @Test public void testGetText_Default() { ICompositeNode rootNode = builder.newRootNode("my input!"); ILeafNode leafNode = builder.newLeafNode(3, 5, null, false, null, rootNode); assertEquals("input", leafNode.getText()); } @Override - public void testGetText_Empty() { + @Test public void testGetText_Empty() { ICompositeNode rootNode = builder.newRootNode("my input"); ILeafNode leafNode = builder.newLeafNode(0, 0, null, false, null, rootNode); assertEquals("", leafNode.getText()); } @Override - public void testTotalOffset() { + @Test public void testTotalOffset() { ICompositeNode rootNode = builder.newRootNode("my input"); ILeafNode leafNode = builder.newLeafNode(3, 5, null, false, null, rootNode); assertEquals(3, leafNode.getTotalOffset()); } @Override - public void testTotalEndOffset() { + @Test public void testTotalEndOffset() { ICompositeNode rootNode = builder.newRootNode("my input"); ILeafNode leafNode = builder.newLeafNode(3, 5, null, false, null, rootNode); assertEquals(8, leafNode.getTotalEndOffset()); } @Override - public void testTotalLength() { + @Test public void testTotalLength() { ICompositeNode rootNode = builder.newRootNode("my input"); ILeafNode leafNode = builder.newLeafNode(3, 5, null, false, null, rootNode); assertEquals(5, leafNode.getTotalLength()); } @Override - public void testGetGrammarElement() { + @Test public void testGetGrammarElement() { LeafNode leafNode = createNode(); EObject grammarElement = EcoreFactory.eINSTANCE.createEObject(); leafNode.basicSetGrammarElement(grammarElement); @@ -64,7 +65,7 @@ public class LeafNodeTest extends AbstractNodeTest { } @Override - public void testGetSyntaxErrorMessage() { + @Test public void testGetSyntaxErrorMessage() { LeafNode leafNode = createNode(); SyntaxErrorMessage errorMessage = new SyntaxErrorMessage("message", null); leafNode.basicSetSyntaxErrorMessage(errorMessage); @@ -72,7 +73,7 @@ public class LeafNodeTest extends AbstractNodeTest { } @Override - public void testGetSemanticElement() { + @Test public void testGetSemanticElement() { ICompositeNode rootNode = builder.newRootNode("input"); ICompositeNode parent = builder.newCompositeNode(null, 0, rootNode); EObject semanticElement = EcoreFactory.eINSTANCE.createEObject(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java index e153f54d7..9828b019a 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/LengthOffsetLineTest.java @@ -11,14 +11,12 @@ package org.eclipse.xtext.nodemodel; import java.util.Iterator; import org.eclipse.xtext.dummy.DummyTestLanguageStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.nodemodel.ICompositeNode; -import org.eclipse.xtext.nodemodel.ILeafNode; -import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; public class LengthOffsetLineTest extends AbstractXtextTests { - public void testOffset() throws Exception { + @Test public void testOffset() throws Exception { String model = "element foo;\nelement bar;"; ICompositeNode node = getRootNode(model); Iterator iter = node.getLeafNodes().iterator(); @@ -33,7 +31,7 @@ public class LengthOffsetLineTest extends AbstractXtextTests { assertEquals(24,iter.next().getTotalOffset()); } - public void testOffset2() throws Exception { + @Test public void testOffset2() throws Exception { String model = "element foo;\nelement bar;"; ICompositeNode node = getRootNode(model); Iterator iter = node.getChildren().iterator(); @@ -42,7 +40,7 @@ public class LengthOffsetLineTest extends AbstractXtextTests { assertFalse(iter.hasNext()); } - public void testLineForLeafnodes() throws Exception { + @Test public void testLineForLeafnodes() throws Exception { String model = "element foo;\nelement bar;"; ICompositeNode node = getRootNode(model); Iterator iter = node.getLeafNodes().iterator(); @@ -58,7 +56,7 @@ public class LengthOffsetLineTest extends AbstractXtextTests { assertFalse(iter.hasNext()); } - public void testLineForCompositeNodes() throws Exception { + @Test public void testLineForCompositeNodes() throws Exception { String model = "element foo;\nelement bar;\nelement bar;\nelement bar;"; ICompositeNode node = getRootNode(model); Iterator iter = node.getChildren().iterator(); @@ -72,7 +70,7 @@ public class LengthOffsetLineTest extends AbstractXtextTests { } - public void testErrors1() throws Exception { + @Test public void testErrors1() throws Exception { String model = "element # ;"; ICompositeNode node = getRootNodeAndExpect(model, 1); assertEquals(model, node.getText()); @@ -89,7 +87,7 @@ public class LengthOffsetLineTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DummyTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java index fdb6832a8..c72037358 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelStateTest.java @@ -7,10 +7,10 @@ *******************************************************************************/ package org.eclipse.xtext.nodemodel; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -28,7 +28,7 @@ public class NodeModelStateTest extends AbstractXtextTests { private String model; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ReferenceGrammarTestLanguageStandaloneSetup.class); model = "// comment before root\n" + @@ -46,131 +46,131 @@ public class NodeModelStateTest extends AbstractXtextTests { kindNode = kindLeaf.getParent(); } - public void testRootGetOffset() { + @Test public void testRootGetOffset() { assertEquals(model.indexOf("spielplatz"), rootNode.getOffset()); } - public void testRootGetTotalOffset() { + @Test public void testRootGetTotalOffset() { assertEquals(0, rootNode.getTotalOffset()); } - public void testRootGetLength() { + @Test public void testRootGetLength() { assertEquals(model.indexOf('}') - model.indexOf("spielplatz") + 1, rootNode.getLength()); } - public void testRootGetTotalLength() { + @Test public void testRootGetTotalLength() { assertEquals(model.length(), rootNode.getTotalLength()); } - public void testRootGetLine() { + @Test public void testRootGetLine() { assertEquals(3, rootNode.getStartLine()); } - public void testRootGetTotalLine() { + @Test public void testRootGetTotalLine() { assertEquals(1, rootNode.getTotalStartLine()); } - public void testRootEndLine() { + @Test public void testRootEndLine() { assertEquals(8, rootNode.getEndLine()); } - public void testRootTotalEndLine() { + @Test public void testRootTotalEndLine() { assertEquals(10, rootNode.getTotalEndLine()); } - public void testCompositeGetOffset() { + @Test public void testCompositeGetOffset() { assertEquals(model.indexOf("kind"), kindNode.getOffset()); } - public void testCompositeGetTotalOffset() { + @Test public void testCompositeGetTotalOffset() { assertEquals(model.indexOf("{") + 1, kindNode.getTotalOffset()); } - public void testCompositeGetLength() { + @Test public void testCompositeGetLength() { assertEquals(model.indexOf(')') - model.indexOf("kind") + 1, kindNode.getLength()); } - public void testCompositeGetTotalLength() { + @Test public void testCompositeGetTotalLength() { assertEquals(model.indexOf(')') - model.indexOf("{"), kindNode.getTotalLength()); } - public void testCompositeGetLine() { + @Test public void testCompositeGetLine() { assertEquals(5, kindNode.getStartLine()); } - public void testCompositeGetTotalLine() { + @Test public void testCompositeGetTotalLine() { assertEquals(3, kindNode.getTotalStartLine()); } - public void testCompositeEndLine() { + @Test public void testCompositeEndLine() { assertEquals(6, kindNode.getEndLine()); } - public void testCompositeTotalEndLine() { + @Test public void testCompositeTotalEndLine() { assertEquals(6, kindNode.getTotalEndLine()); } - public void testLeafGetOffset() { + @Test public void testLeafGetOffset() { assertEquals(model.indexOf("kind"), kindLeaf.getOffset()); } - public void testLeafGetTotalOffset() { + @Test public void testLeafGetTotalOffset() { assertEquals(model.indexOf("kind"), kindLeaf.getOffset()); } - public void testLeafGetLength() { + @Test public void testLeafGetLength() { assertEquals("kind".length(), kindLeaf.getLength()); } - public void testLeafGetTotalLength() { + @Test public void testLeafGetTotalLength() { assertEquals("kind".length(), kindLeaf.getLength()); } - public void testLeafGetLine() { + @Test public void testLeafGetLine() { assertEquals(5, kindLeaf.getStartLine()); } - public void testLeafGetTotalLine() { + @Test public void testLeafGetTotalLine() { assertEquals(5, kindLeaf.getTotalStartLine()); } - public void testLeafEndLine() { + @Test public void testLeafEndLine() { assertEquals(5, kindLeaf.getEndLine()); } - public void testLeafTotalEndLine() { + @Test public void testLeafTotalEndLine() { assertEquals(5, kindLeaf.getTotalEndLine()); } - public void testHiddenLeafGetOffset() { + @Test public void testHiddenLeafGetOffset() { assertEquals(model.indexOf("kind") + "kind".length(), hiddenLeaf.getOffset()); } - public void testHiddenLeafGetTotalOffset() { + @Test public void testHiddenLeafGetTotalOffset() { assertEquals(model.indexOf("kind") + "kind".length(), hiddenLeaf.getOffset()); } - public void testHiddenLeafGetLength() { + @Test public void testHiddenLeafGetLength() { assertEquals(" ".length(), hiddenLeaf.getLength()); } - public void testHiddenLeafGetTotalLength() { + @Test public void testHiddenLeafGetTotalLength() { assertEquals(" ".length(), hiddenLeaf.getLength()); } - public void testHiddenLeafGetLine() { + @Test public void testHiddenLeafGetLine() { assertEquals(5, hiddenLeaf.getStartLine()); } - public void testHiddenLeafGetTotalLine() { + @Test public void testHiddenLeafGetTotalLine() { assertEquals(5, hiddenLeaf.getTotalStartLine()); } - public void testHiddenLeafEndLine() { + @Test public void testHiddenLeafEndLine() { assertEquals(5, hiddenLeaf.getEndLine()); } - public void testHiddenLeafTotalEndLine() { + @Test public void testHiddenLeafTotalEndLine() { assertEquals(5, kindLeaf.getTotalEndLine()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java index 3eda5753d..252871df8 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/NodeModelTest.java @@ -21,14 +21,12 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.nodemodel.ICompositeNode; -import org.eclipse.xtext.nodemodel.ILeafNode; -import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSetup; import org.eclipse.xtext.testlanguages.TestLanguageStandaloneSetup; +import org.junit.Test; import com.google.common.collect.Lists; @@ -42,12 +40,12 @@ public class NodeModelTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(TestLanguageStandaloneSetup.class); } - public void testNavigabilityAst2Node() throws Exception { + @Test public void testNavigabilityAst2Node() throws Exception { EObject object = getModel(MODEL); checkNavigabilityAst2Node(object); for (Iterator i = object.eAllContents(); i.hasNext();) { @@ -55,7 +53,7 @@ public class NodeModelTest extends AbstractXtextTests { } } - public void testNavigabilityNode2Ast() throws Exception { + @Test public void testNavigabilityNode2Ast() throws Exception { EObject object = getModel(MODEL); EList adapters = object.eAdapters(); assertEquals(1 /* compositeNode */ + 1 /* cache */, adapters.size()); @@ -67,7 +65,7 @@ public class NodeModelTest extends AbstractXtextTests { } } - public void testGrammarElement() throws Exception { + @Test public void testGrammarElement() throws Exception { ICompositeNode rootNode = getRootNode(MODEL); EObject rootGrammarElement = rootNode.getGrammarElement(); assertTrue(rootGrammarElement instanceof ParserRule); @@ -114,7 +112,7 @@ public class NodeModelTest extends AbstractXtextTests { return false; } - public void testTokenTexts() throws Exception { + @Test public void testTokenTexts() throws Exception { Pattern whitespacePattern = Pattern.compile("\\s*"); String[] tokenTexts = MODEL.split(" "); int tokenIndex = 0; @@ -131,7 +129,7 @@ public class NodeModelTest extends AbstractXtextTests { } } - public void testKeywordInAlternative() throws Exception { + @Test public void testKeywordInAlternative() throws Exception { with(SimpleExpressionsTestLanguageStandaloneSetup.class); EObject object = getModel("d / e"); ICompositeNode root = NodeModelUtils.getNode(object).getRootNode(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java index 4eec4fba5..b9c9e9b32 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/RootNodeTest.java @@ -8,6 +8,7 @@ package org.eclipse.xtext.nodemodel; import org.eclipse.xtext.nodemodel.impl.AbstractNode; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -15,7 +16,7 @@ import org.eclipse.xtext.nodemodel.impl.AbstractNode; public class RootNodeTest extends AbstractCompositeNodeTest { @Override - public void testTextOffsetLength() { + @Test public void testTextOffsetLength() { RootNode rootNode = createCompositeNode(); String completeContent = "completeContent"; rootNode.basicSetCompleteContent(completeContent); @@ -34,7 +35,7 @@ public class RootNodeTest extends AbstractCompositeNodeTest { return new RootNode(); } - public void testIteratorForEmptyNode() { + @Test public void testIteratorForEmptyNode() { RootNode rootNode = createCompositeNode(); BidiTreeIterator forwardIterator = rootNode.basicIterator(); assertTrue(forwardIterator.hasNext()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java index 23fc9c786..0b7be4338 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/TreeIteratorTest.java @@ -8,10 +8,11 @@ package org.eclipse.xtext.nodemodel; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.impl.SyntheticCompositeNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -19,12 +20,12 @@ import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSe public class TreeIteratorTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleExpressionsTestLanguageStandaloneSetup.class); } - public void testTreeIteratorForSyntheticNodes_Forward() throws Exception { + @Test public void testTreeIteratorForSyntheticNodes_Forward() throws Exception { EObject object = getModel("(d - e) / e * d // fasdf s"); ICompositeNode root = NodeModelUtils.getNode(object).getRootNode(); INode firstChild = root.getFirstChild(); @@ -42,7 +43,7 @@ public class TreeIteratorTest extends AbstractXtextTests { assertEquals(expectedLastChild, lastChild); } - public void testTreeIteratorForSyntheticNodes_Backwards() throws Exception { + @Test public void testTreeIteratorForSyntheticNodes_Backwards() throws Exception { EObject object = getModel("d - e / e * d"); ICompositeNode root = NodeModelUtils.getNode(object).getRootNode(); INode firstChild = root.getFirstChild(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java index f145b5737..31b527243 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java @@ -21,11 +21,12 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.impl.SyntheticCompositeNode; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -33,12 +34,12 @@ import org.eclipse.xtext.nodemodel.impl.SyntheticCompositeNode; */ public class NodeModelUtilsTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new XtextStandaloneSetup()); } - public void testFindNodesForFeature() throws Exception { + @Test public void testFindNodesForFeature() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model : name=ID;"); List nodes = NodeModelUtils.findNodesForFeature(grammar, XtextPackage.eINSTANCE.getGrammar_Name()); assertEquals(1, nodes.size()); @@ -54,7 +55,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals("foo", nodes.get(0).getText().trim()); } - public void testFindNodesForFeature_MultipleFeature() throws Exception { + @Test public void testFindNodesForFeature_MultipleFeature() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model : foo=Foo; Foo : name=ID; "); List nodes = NodeModelUtils.findNodesForFeature(grammar, XtextPackage.eINSTANCE.getGrammar_Rules()); assertEquals(2, nodes.size()); @@ -62,7 +63,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals("Foo : name=ID;", nodes.get(1).getText().trim()); } - public void testFindNodesForFeature_CallToConcreteRule() throws Exception { + @Test public void testFindNodesForFeature_CallToConcreteRule() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model returns X: name='foo';"); AbstractRule rule = grammar.getRules().get(0); List nodes = NodeModelUtils.findNodesForFeature(rule, XtextPackage.eINSTANCE.getAbstractRule_Type()); @@ -70,7 +71,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals("X", nodes.get(0).getText().trim()); } - public void testFindNodesForFeature_Cardinality_0() throws Exception { + @Test public void testFindNodesForFeature_Cardinality_0() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model: name+='foo'*;"); Assignment assignment = (Assignment) grammar.getRules().get(0).getAlternatives(); List nodes = NodeModelUtils.findNodesForFeature(assignment, XtextPackage.eINSTANCE.getAbstractElement_Cardinality()); @@ -78,14 +79,14 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals("*", nodes.get(0).getText().trim()); } - public void testFindNodesForFeature_Cardinality_1() throws Exception { + @Test public void testFindNodesForFeature_Cardinality_1() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model: name+='foo'* name+='bar'*;"); Group group = (Group) grammar.getRules().get(0).getAlternatives(); List nodes = NodeModelUtils.findNodesForFeature(group, XtextPackage.eINSTANCE.getAbstractElement_Cardinality()); assertEquals(0, nodes.size()); } - public void testFindNodesForFeature_Cardinality_2() throws Exception { + @Test public void testFindNodesForFeature_Cardinality_2() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model: (name+='foo'*)?;"); Assignment assignment = (Assignment) grammar.getRules().get(0).getAlternatives(); List nodes = NodeModelUtils.findNodesForFeature(assignment, XtextPackage.eINSTANCE.getAbstractElement_Cardinality()); @@ -94,7 +95,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals("?", nodes.get(1).getText()); } - public void testFindNodesForFeature_Elements() throws Exception { + @Test public void testFindNodesForFeature_Elements() throws Exception { Grammar grammar = (Grammar) getModel("grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:name='foo'|name='bar';"); Alternatives body = (Alternatives) grammar.getRules().get(0).getAlternatives(); List nodes = NodeModelUtils.findNodesForFeature(body, XtextPackage.eINSTANCE.getCompoundElement_Elements()); @@ -103,7 +104,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals("name='bar'", nodes.get(1).getText()); } - public void testFindActualSemanticObjectFor_01() throws Exception { + @Test public void testFindActualSemanticObjectFor_01() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:((name=ID));"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode leafNode = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf('(')); @@ -111,7 +112,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_02() throws Exception { + @Test public void testFindActualSemanticObjectFor_02() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:((name=ID)*)?;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode star = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf('*')); @@ -122,7 +123,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_03() throws Exception { + @Test public void testFindActualSemanticObjectFor_03() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:name=ID;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode leafNode = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf('=')); @@ -130,7 +131,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_04() throws Exception { + @Test public void testFindActualSemanticObjectFor_04() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:name=ID;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode leafNode = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf("name")); @@ -138,7 +139,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_05() throws Exception { + @Test public void testFindActualSemanticObjectFor_05() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:name=ID;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode leafNode = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf("ID")); @@ -146,7 +147,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof RuleCall); } - public void testFindActualSemanticObjectFor_06() throws Exception { + @Test public void testFindActualSemanticObjectFor_06() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model: name=ID;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode leafNode = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.lastIndexOf(" ")); @@ -154,7 +155,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_07() throws Exception { + @Test public void testFindActualSemanticObjectFor_07() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:(name=ID|name=STRING?)*;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode star = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf('*')); @@ -165,7 +166,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_08() throws Exception { + @Test public void testFindActualSemanticObjectFor_08() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:/**/name=ID;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode leadingComment = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf('*')); @@ -173,7 +174,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof Assignment); } - public void testFindActualSemanticObjectFor_09() throws Exception { + @Test public void testFindActualSemanticObjectFor_09() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:name=ID/**/;"; Grammar grammar = (Grammar) getModel(grammarString); ILeafNode trailingComment = NodeModelUtils.findLeafNodeAtOffset(NodeModelUtils.getNode(grammar), grammarString.indexOf('*')); @@ -181,7 +182,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertTrue(object instanceof ParserRule); } - public void testCompactDump_1() throws Exception { + @Test public void testCompactDump_1() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model:name=ID;"; Grammar grammar = (Grammar) getModel(grammarString); String actual = NodeModelUtils.compactDump(NodeModelUtils.getNode(grammar.getMetamodelDeclarations().get(0)), true); @@ -197,7 +198,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testCompactDump_2() throws Exception { + @Test public void testCompactDump_2() throws Exception { String grammarString = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo x 'bar' Model:name=ID;"; Grammar grammar = (Grammar) getModelAndExpect(getAsStream(grammarString), 1); String actual = NodeModelUtils.compactDump(NodeModelUtils.getNode(grammar.getMetamodelDeclarations().get(0)), true); @@ -215,7 +216,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testCompactDump_3() throws Exception { + @Test public void testCompactDump_3() throws Exception { String grammarString = "grammar 1 2"; Grammar grammar = (Grammar) getModelAndExpect(getAsStream(grammarString), UNKNOWN_EXPECTATION); String actual = NodeModelUtils.compactDump(NodeModelUtils.getNode(grammar), true); @@ -232,7 +233,7 @@ public class NodeModelUtilsTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testFindLeafNodeAtOffset_1() throws Exception { + @Test public void testFindLeafNodeAtOffset_1() throws Exception { String grammarText = "grammar foo.Bar with org.eclipse.xtext.common.Terminals generate foo 'bar' Model : (name=ID value=ID);"; Grammar grammar = (Grammar) getModel(grammarText); int equalsSign = grammarText.indexOf('='); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java index 16b016b03..4d1bfc024 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parseerrorhandling/ParseErrorHandlingTest.java @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.XtextFactory; import org.eclipse.xtext.XtextGrammarTestLanguageStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; @@ -35,6 +35,7 @@ import org.eclipse.xtext.xtextTest.Assignment; import org.eclipse.xtext.xtextTest.Grammar; import org.eclipse.xtext.xtextTest.Keyword; import org.eclipse.xtext.xtextTest.RuleCall; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; @@ -44,12 +45,12 @@ import com.google.common.collect.Lists; public class ParseErrorHandlingTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextGrammarTestLanguageStandaloneSetup.class); } - public void testLexerError_01() throws Exception { + @Test public void testLexerError_01() throws Exception { String model = "grammar a import 'holla' % as foo"; EObject root = getModelAndExpect(model, 2); Iterable errors = ((XtextResource) root.eResource()).getParseResult().getSyntaxErrors(); @@ -60,7 +61,7 @@ public class ParseErrorHandlingTest extends AbstractXtextTests { assertEquals(1, errors.iterator().next().getTotalLength()); } - public void testParseError1() throws Exception { + @Test public void testParseError1() throws Exception { String model = "grammar a import 'holla' foo returns x::y::Z : name=ID;"; EObject root = getModelAndExpect(model, 5); Iterable errors = ((XtextResource) root.eResource()).getParseResult().getSyntaxErrors(); @@ -71,7 +72,7 @@ public class ParseErrorHandlingTest extends AbstractXtextTests { assertEquals(1, Iterables.size(errors)); } - public void testParseError2() throws Exception { + @Test public void testParseError2() throws Exception { Grammar grammar = (Grammar) getModelAndExpect("grammar a import 'holla' foo returns y::Z : name=foo #;", 4); AbstractRule rule = grammar.getRules().get(0); Assignment assignment = (Assignment) rule.getAlternatives(); @@ -80,7 +81,7 @@ public class ParseErrorHandlingTest extends AbstractXtextTests { // assertWithXtend("'foo'", "rules.first().eAllContents().typeSelect(RuleCall).first().rule.name", grammar); } - public void testParseError3() throws Exception { + @Test public void testParseError3() throws Exception { Grammar grammar = (Grammar) getModelAndExpect("grammar a import 'holla' foo returns y::Z : name=foo #############", 4); AbstractRule rule = grammar.getRules().get(0); Assignment assignment = (Assignment) rule.getAlternatives(); @@ -89,7 +90,7 @@ public class ParseErrorHandlingTest extends AbstractXtextTests { // assertWithXtend("'foo'", "rules.first().eAllContents().typeSelect(RuleCall).first().rule.name", grammar); } - public void testParseError4() throws Exception { + @Test public void testParseError4() throws Exception { Grammar grammar = (Grammar) getModelAndExpect("grammar a import 'holla' foo returns y::Z : name=foo # 'foo'; bar : 'stuff'", 5); AbstractRule rule = grammar.getRules().get(0); Assignment assignment = (Assignment) rule.getAlternatives(); @@ -103,7 +104,7 @@ public class ParseErrorHandlingTest extends AbstractXtextTests { // assertWithXtend("'stuff'", "rules.get(1).eAllContents().typeSelect(Keyword).first().value", grammar); } - public void testExpectNoSuchMethodException() throws Exception { + @Test public void testExpectNoSuchMethodException() throws Exception { IParser parser = get(IParser.class); ParserRule parserRule = XtextFactory.eINSTANCE.createParserRule(); parserRule.setName("ruleDoesNotExist"); @@ -118,7 +119,7 @@ public class ParseErrorHandlingTest extends AbstractXtextTests { } - public void testName() throws Exception { + @Test public void testName() throws Exception { String model = "grammar a import 'holla' foo returns y::Z : name=ID # 'foo'; bar : 'stuff'"; for (int i=model.length();0")); } - public void testPartialParseConcreteRuleFirstToken() throws Exception { + @Test public void testPartialParseConcreteRuleFirstToken() throws Exception { with(PartialParserTestLanguageStandaloneSetup.class); String model = "container c1 {\n" + " children {\n" + @@ -198,7 +199,7 @@ public class PartialParserTest extends AbstractPartialParserTest { } } - public void testNodeState() throws Exception { + @Test public void testNodeState() throws Exception { with(SimpleExpressionsTestLanguageStandaloneSetup.class); String model = "(a\r\n" + @@ -245,7 +246,7 @@ public class PartialParserTest extends AbstractPartialParserTest { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=273209 */ - public void testBug273209_01() throws Exception { + @Test public void testBug273209_01() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar org.eclipse.Bug273209_01 with org.eclipse.xtext.common.Terminals \n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/partialParsing/Bug273209/1'\n" + @@ -267,7 +268,7 @@ public class PartialParserTest extends AbstractPartialParserTest { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=273209 */ - public void testBug273209_02() throws Exception { + @Test public void testBug273209_02() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar org.eclipse.Bug273209_01 with org.eclipse.xtext.common.Terminals \n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/partialParsing/Bug273209/2'\n" + @@ -291,7 +292,7 @@ public class PartialParserTest extends AbstractPartialParserTest { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=273209 */ - public void testBug273209_03() throws Exception { + @Test public void testBug273209_03() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar org.eclipse.Bug273209_01 with org.eclipse.xtext.common.Terminals \n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/partialParsing/Bug273209/3'\n" + @@ -310,7 +311,7 @@ public class PartialParserTest extends AbstractPartialParserTest { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testReparseEmptyString() throws Exception { + @Test public void testReparseEmptyString() throws Exception { with(XtextStandaloneSetup.class); String model = "grammar org.eclipse.Bug273209_01 with org.eclipse.xtext.common.Terminals \n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/partialParsing/Bug273209/3'\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java index 2318063d9..1fe3b06ab 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingEmptyTokensTest.java @@ -1,9 +1,10 @@ package org.eclipse.xtext.parser; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.testlanguages.indent.IndentationAwareTestLanguageStandaloneSetup; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; public class PartialParsingEmptyTokensTest extends AbstractXtextTests { @@ -19,16 +20,16 @@ public class PartialParsingEmptyTokensTest extends AbstractXtextTests { "2"; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(IndentationAwareTestLanguageStandaloneSetup.class); } - public void testValidDocument() throws Exception { + @Test public void testValidDocument() throws Exception { getResource(new StringInputStream(DOC)); } - public void testMarkerEmptyTokens() throws Exception { + @Test public void testMarkerEmptyTokens() throws Exception { int pos = DOC.indexOf("1b"); String brokenDoc = DOC.replace("1b", ""); XtextResource resource = getResourceAndExpect(new StringInputStream(brokenDoc), 1); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java index 45cec4178..90971812f 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java @@ -12,6 +12,7 @@ import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSetup; import org.eclipse.xtext.testlanguages.TreeTestLanguageStandaloneSetup; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -22,11 +23,11 @@ public class PartialParsingPerformanceTest extends AbstractPartialParserTest { private static final int NUM_ELEMENTS = 100 /* 0 */; - public void testExpression_FirstTime() throws Exception { + @Test public void testExpression_FirstTime() throws Exception { doTestExpression(); } - public void testExpression_Again() throws Exception { + @Test public void testExpression_Again() throws Exception { doTestExpression(); } @@ -48,7 +49,7 @@ public class PartialParsingPerformanceTest extends AbstractPartialParserTest { assertFalse(reparse.hasSyntaxErrors()); } - public void testReference() throws Exception { + @Test public void testReference() throws Exception { with(ReferenceGrammarTestLanguageStandaloneSetup.class); StringBuffer modelBuffer = new StringBuffer(); modelBuffer.append("spielplatz 17 {\n"); @@ -75,7 +76,7 @@ public class PartialParsingPerformanceTest extends AbstractPartialParserTest { } } - public void testReferenceWithErrorAtEnd() throws Exception { + @Test public void testReferenceWithErrorAtEnd() throws Exception { with(ReferenceGrammarTestLanguageStandaloneSetup.class); StringBuffer modelBuffer = new StringBuffer(); modelBuffer.append("spielplatz 17 {\n"); @@ -103,7 +104,7 @@ public class PartialParsingPerformanceTest extends AbstractPartialParserTest { assertTrue(reparse.hasSyntaxErrors()); } - public void testBug_255015() throws Exception { + @Test public void testBug_255015() throws Exception { with(TreeTestLanguageStandaloneSetup.class); StringBuffer modelBuffer = new StringBuffer(NUM_ELEMENTS * 128); for(int i = 0; i < Math.sqrt(NUM_ELEMENTS) * 2; i++) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java index 0e3e12579..9cf200d47 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerExpressionTest.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.parser; import org.eclipse.xtext.parser.impl.PartialParsingPointers; import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Jan Köhnlein - Initial contribution and API @@ -18,42 +19,42 @@ import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSe public class PartialParsingPointerExpressionTest extends AbstractPartialParsingPointerTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleExpressionsTestLanguageStandaloneSetup.class); } - public void testExpression_1_1() throws Exception { + @Test public void testExpression_1_1() throws Exception { String model = "(a+b+c)*(c/d)"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 1, 1); checkParseRegionPointers(parsingPointers, "(a+b+c)", "RuleCall", "Parens"); } - public void testExpression_3_1() throws Exception { + @Test public void testExpression_3_1() throws Exception { String model = "(a+b+c)*(c/d)"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 3, 1); checkParseRegionPointers(parsingPointers, "(a+b+c)", "RuleCall", "Parens"); } - public void testExpression_5_2() throws Exception { + @Test public void testExpression_5_2() throws Exception { String model = "(a+b+c)*(c/d)"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 5, 2); checkParseRegionPointers(parsingPointers, "(a+b+c)", "RuleCall", "Parens"); } - public void testExpression_6_1() throws Exception { + @Test public void testExpression_6_1() throws Exception { String model = "(a+b+c)*(c/d)"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 6, 1); checkParseRegionPointers(parsingPointers, "(a+b+c)", "RuleCall", "Parens"); } - public void testExpression_8_2() throws Exception { + @Test public void testExpression_8_2() throws Exception { String model = "(a+b+c)*(c/d)"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 8, 2); checkParseRegionPointers(parsingPointers, "(a+b+c)*(c/d)", "ParserRule", "Sequence"); } - public void testExpression_9_2() throws Exception { + @Test public void testExpression_9_2() throws Exception { String model = "(a+b+c)*(c/d)"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 9, 2); // actual minimal replace region is c/d but this would lead to accidental complexity @@ -62,7 +63,7 @@ public class PartialParsingPointerExpressionTest extends AbstractPartialParsingP checkParseRegionPointers(parsingPointers, "(c/d)", "RuleCall", "Parens"); } - public void testExpression_a_b() throws Exception { + @Test public void testExpression_a_b() throws Exception { String model = "a b"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, 1, 1); checkParseRegionPointers(parsingPointers, "a b", "Action", "Sequence"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java index edb61ecb4..662dd02ba 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerLookaheadTest.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.parser; import org.eclipse.xtext.parser.impl.PartialParsingPointers; import org.eclipse.xtext.testlanguages.LookaheadTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Jan Köhnlein - Initial contribution and API @@ -18,12 +19,12 @@ import org.eclipse.xtext.testlanguages.LookaheadTestLanguageStandaloneSetup; public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPointerTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LookaheadTestLanguageStandaloneSetup.class); } - public void testLookahead_0_2() throws Exception { + @Test public void testLookahead_0_2() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 0; i < 3; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -31,7 +32,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_3_4() throws Exception { + @Test public void testLookahead_3_4() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 3; i < 5; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -39,7 +40,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_6_8() throws Exception { + @Test public void testLookahead_6_8() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 6; i < 9; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -47,7 +48,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_9_14() throws Exception { + @Test public void testLookahead_9_14() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 9; i < 15; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -57,7 +58,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_15_18() throws Exception { + @Test public void testLookahead_15_18() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 15; i < 19; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -65,7 +66,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_19_22() throws Exception { + @Test public void testLookahead_19_22() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 19; i < 22; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -73,7 +74,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_23_28() throws Exception { + @Test public void testLookahead_23_28() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 23; i < 29; ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); @@ -81,7 +82,7 @@ public class PartialParsingPointerLookaheadTest extends AbstractPartialParsingPo } } - public void testLookahead_29() throws Exception { + @Test public void testLookahead_29() throws Exception { String model = "bar a foo bar c b d foo bar b c"; for (int i = 29; i < model.length(); ++i) { PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, i, 1); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java index 11e3b6fc8..18290081d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/PartialParsingPointerReferenceTest.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.parser; import org.eclipse.xtext.parser.impl.PartialParsingPointers; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Jan Köhnlein - Initial contribution and API @@ -18,12 +19,12 @@ import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSet public class PartialParsingPointerReferenceTest extends AbstractPartialParsingPointerTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ReferenceGrammarTestLanguageStandaloneSetup.class); } - public void testReference() throws Exception { + @Test public void testReference() throws Exception { String model = "spielplatz 17 { kind ( Dennis 6 ) kind ( Sven 7 ) }"; PartialParsingPointers parsingPointers = calculatePartialParsingPointers(model, model.indexOf("Sven"), 4); checkParseRegionPointers(parsingPointers, " kind ( Sven 7 )", "RuleCall", "Kind"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java index 90c3429fc..8ba2be6d0 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserBugsTest.java @@ -7,16 +7,17 @@ *******************************************************************************/ package org.eclipse.xtext.parser; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.testlanguages.FowlerDslTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public class XtextParserBugsTest extends AbstractXtextTests { - public void testFirstTokenIsIllegal_254841() throws Exception { + @Test public void testFirstTokenIsIllegal_254841() throws Exception { with(FowlerDslTestLanguageStandaloneSetup.class); String model = "firstToken"; ICompositeNode rootNode = getRootNodeAndExpect(model, 1); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java index a9738ed75..2d497000d 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/XtextParserTest.java @@ -14,22 +14,23 @@ import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.Group; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; public class XtextParserTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void test_resolveReturnType() throws Exception { + @Test public void test_resolveReturnType() throws Exception { Grammar model = (Grammar) getModel("grammar foo with org.eclipse.xtext.common.Terminals " + "generate foo 'bar' as x Model returns x::Foo : 'holla' name=ID;"); - assertWithXtend("'x'", "metamodelDeclarations.first().alias", model); + assertEquals("x", model.getMetamodelDeclarations().get(0).getAlias()); } - public void testParseCrossRef() throws Exception { + @Test public void testParseCrossRef() throws Exception { Grammar model = (Grammar) getModel("grammar foo with org.eclipse.xtext.common.Terminals " + "generate foo 'bar' as boo " + "Model returns boo::Model : 'a' stuff+=Stuff*; " + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java index 523db9c3c..602ae3e14 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug289524Test.java @@ -7,39 +7,40 @@ *******************************************************************************/ package org.eclipse.xtext.parser.antlr; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public abstract class AbstractBug289524Test extends AbstractXtextTests { - public void testGetModel_01() throws Exception { + @Test public void testGetModel_01() throws Exception { String model = "Model containment C reference C"; getModel(model); } - public void testGetModel_02() throws Exception { + @Test public void testGetModel_02() throws Exception { String model = "Model containment C reference C$C"; getModel(model); } - public void testGetModel_03() throws Exception { + @Test public void testGetModel_03() throws Exception { String model = "Model reference C"; getModelAndExpect(model, 1); } - public void testGetModel_04() throws Exception { + @Test public void testGetModel_04() throws Exception { String model = "Model containment C reference C reference C"; getModel(model); } - public void testGetModel_05() throws Exception { + @Test public void testGetModel_05() throws Exception { String model = "Model containment C containment C reference C"; getModelAndExpect(model, 0); } - public void testGetModel_06() throws Exception { + @Test public void testGetModel_06() throws Exception { String model = "Model reference C$C"; getModelAndExpect(model, 2); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java index 809b0cf08..8e24c32af 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug296889Test.java @@ -7,69 +7,70 @@ *******************************************************************************/ package org.eclipse.xtext.parser.antlr; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public abstract class AbstractBug296889Test extends AbstractXtextTests { - public void testGetModel_01() throws Exception { + @Test public void testGetModel_01() throws Exception { String model = "Model ID"; getModel(model); } - public void testGetModel_02() throws Exception { + @Test public void testGetModel_02() throws Exception { String model = "Model ID ID"; getModel(model); } - public void testGetModel_03() throws Exception { + @Test public void testGetModel_03() throws Exception { String model = "Model ID-- ID"; getModel(model); } - public void testGetModel_04() throws Exception { + @Test public void testGetModel_04() throws Exception { String model = "Model ID-- --ID"; getModel(model); } - public void testGetModel_05() throws Exception { + @Test public void testGetModel_05() throws Exception { String model = "Model --ID ID ID--"; getModel(model); } - public void testGetModel_06() throws Exception { + @Test public void testGetModel_06() throws Exception { String model = "Model ID-- --"; getModelAndExpect(model, 1); } - public void testGetDataType_01() throws Exception { + @Test public void testGetDataType_01() throws Exception { String model = "DataType ID"; getModel(model); } - public void testGetDataType_02() throws Exception { + @Test public void testGetDataType_02() throws Exception { String model = "DataType ID ID"; getModel(model); } - public void testGetDataType_03() throws Exception { + @Test public void testGetDataType_03() throws Exception { String model = "DataType ID-- ID"; getModel(model); } - public void testGetDataType_04() throws Exception { + @Test public void testGetDataType_04() throws Exception { String model = "DataType ID-- --ID"; getModel(model); } - public void testGetDataType_05() throws Exception { + @Test public void testGetDataType_05() throws Exception { String model = "DataType --ID ID ID--"; getModel(model); } - public void testGetDataType_06() throws Exception { + @Test public void testGetDataType_06() throws Exception { String model = "DataType ID-- --"; getModelAndExpect(model, 1); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java index d7d439e33..616b381b6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/AbstractBug301935Test.java @@ -9,8 +9,9 @@ package org.eclipse.xtext.parser.antlr; import java.util.Map; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; import com.google.common.collect.ImmutableBiMap; @@ -25,19 +26,19 @@ public abstract class AbstractBug301935Test extends AbstractXtextTests { return false; } - public void testParseValidInput() throws Exception { + @Test public void testParseValidInput() throws Exception { String input = "a b\nc "; assertNotNull(getModel(input)); } - public void testGetTokenDefMap_01() { + @Test public void testGetTokenDefMap_01() { ITokenDefProvider tokenDefProvider = get(ITokenDefProvider.class); Map map = tokenDefProvider.getTokenDefMap(); assertNotNull(String.valueOf(map), map); assertEquals(String.valueOf(map), 5, map.size()); } - public void testGetTokenDefMap_02() { + @Test public void testGetTokenDefMap_02() { ITokenDefProvider tokenDefProvider = get(ITokenDefProvider.class); ImmutableBiMap tokens = ImmutableBiMap.copyOf(tokenDefProvider.getTokenDefMap()); ImmutableBiMap inverseTokens = tokens.inverse(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java index 1b5a25c84..16c8e86ac 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289515Test.java @@ -7,10 +7,11 @@ *******************************************************************************/ package org.eclipse.xtext.parser.antlr; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.antlr.bug289515Test.Model; import org.eclipse.xtext.parser.antlr.services.Bug289515TestLanguageGrammarAccess; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,61 +25,61 @@ public class Bug289515Test extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug289515TestLanguageStandaloneSetup.class); } - public void testParser_01() throws Exception { + @Test public void testParser_01() throws Exception { assertModelValue("1%", "%"); } - public void testParser_02() throws Exception { + @Test public void testParser_02() throws Exception { assertModelValue("2%", "%"); } - public void testParser_03() throws Exception { + @Test public void testParser_03() throws Exception { assertModelValue("3\\%", "\\%"); } - public void testParser_04() throws Exception { + @Test public void testParser_04() throws Exception { assertModelValue("4\\%", "\\%"); } - public void testParser_05() throws Exception { + @Test public void testParser_05() throws Exception { assertModelValue("5%%", "%%"); } - public void testParser_06() throws Exception { + @Test public void testParser_06() throws Exception { assertModelValue("6%%", "%%"); } - public void testGrammarAccess_01() { + @Test public void testGrammarAccess_01() { Bug289515TestLanguageGrammarAccess access = get(Bug289515TestLanguageGrammarAccess.class); assertEquals("%", access.getModelAccess().getValuePercentSignKeyword_0_1_0().getValue()); } - public void testGrammarAccess_02() { + @Test public void testGrammarAccess_02() { Bug289515TestLanguageGrammarAccess access = get(Bug289515TestLanguageGrammarAccess.class); assertEquals("%", access.getModelAccess().getValuePercentSignKeyword_1_1_0().getValue()); } - public void testGrammarAccess_03() { + @Test public void testGrammarAccess_03() { Bug289515TestLanguageGrammarAccess access = get(Bug289515TestLanguageGrammarAccess.class); assertEquals("\\%", access.getModelAccess().getValueReverseSolidusPercentSignKeyword_2_1_0().getValue()); } - public void testGrammarAccess_04() { + @Test public void testGrammarAccess_04() { Bug289515TestLanguageGrammarAccess access = get(Bug289515TestLanguageGrammarAccess.class); assertEquals("\\%", access.getModelAccess().getValueReverseSolidusPercentSignKeyword_3_1_0().getValue()); } - public void testGrammarAccess_05() { + @Test public void testGrammarAccess_05() { Bug289515TestLanguageGrammarAccess access = get(Bug289515TestLanguageGrammarAccess.class); assertEquals("%%", access.getModelAccess().getValuePercentSignPercentSignKeyword_4_1_0().getValue()); } - public void testGrammarAccess_06() { + @Test public void testGrammarAccess_06() { Bug289515TestLanguageGrammarAccess access = get(Bug289515TestLanguageGrammarAccess.class); assertEquals("%%", access.getModelAccess().getValuePercentSignPercentSignKeyword_4_1_0().getValue()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java index fb2556870..bf8f20755 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524ExTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.antlr; public class Bug289524ExTest extends AbstractBug289524Test { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug289524ExTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java index 016d46a2a..520bc3c08 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug289524Test.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.antlr; public class Bug289524Test extends AbstractBug289524Test { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug289524TestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java index ac3385782..7869ea17c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889ExTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.antlr; public class Bug296889ExTest extends AbstractBug296889Test { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug296889ExTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java index bbc6bdb70..cde04a9c6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug296889Test.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.antlr; public class Bug296889Test extends AbstractBug296889Test { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug296889TestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java index 08f389e21..6e88fa474 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug299237Test.java @@ -9,12 +9,13 @@ package org.eclipse.xtext.parser.antlr; import java.util.List; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.SyntaxErrorMessage; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.parser.antlr.bug299237Test.Model; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; @@ -32,7 +33,7 @@ public class Bug299237Test extends AbstractXtextTests implements ISyntaxErrorMes private String expectedMessage; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new Bug299237TestLanguageStandaloneSetup() { @Override @@ -48,27 +49,27 @@ public class Bug299237Test extends AbstractXtextTests implements ISyntaxErrorMes syntaxErrorProvider = new SyntaxErrorMessageProvider(); } - public void testValidModel_01() throws Exception { + @Test public void testValidModel_01() throws Exception { Model model = (Model) getModel("model a;"); assertEquals("a", model.getName()); } - public void testValidModel_02() throws Exception { + @Test public void testValidModel_02() throws Exception { Model model = (Model) getModel("MODEL a;"); assertEquals("a", model.getName()); } - public void testSyntaxError_01() throws Exception { + @Test public void testSyntaxError_01() throws Exception { Model model = (Model) getModelAndExpect("model a", 1); assertEquals("a", model.getName()); } - public void testSyntaxError_02() throws Exception { + @Test public void testSyntaxError_02() throws Exception { Model model = (Model) getModelAndExpect("MODEL a", 1); assertEquals("a", model.getName()); } - public void testSyntaxError_03() throws Exception { + @Test public void testSyntaxError_03() throws Exception { syntaxErrorProvider = new SyntaxErrorMessageProvider() { @Override public SyntaxErrorMessage getSyntaxErrorMessage(IParserErrorContext context) { @@ -80,7 +81,7 @@ public class Bug299237Test extends AbstractXtextTests implements ISyntaxErrorMes getModelAndExpect("", 1); } - public void testCustomizedSyntaxError() throws Exception { + @Test public void testCustomizedSyntaxError() throws Exception { expectedMessage = "expected message"; Model model = (Model) getModelAndExpect("model a", 1); ICompositeNode node = NodeModelUtils.getNode(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java index 508113946..896751ab8 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935ExTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.antlr; public class Bug301935ExTest extends AbstractBug301935Test { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug301935ExTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java index 0e607e2f2..3f0d29a9c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug301935Test.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.antlr; public class Bug301935Test extends AbstractBug301935Test { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug301935TestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java index 3dda13a37..f7231458c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/Bug326509Test.java @@ -9,13 +9,14 @@ package org.eclipse.xtext.parser.antlr; import org.antlr.runtime.BitSet; import org.eclipse.xtext.IGrammarAccess; - -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class Bug326509Test extends TestCase { +public class Bug326509Test extends Assert { public static class TestableParser extends AbstractInternalAntlrParser { @@ -46,12 +47,12 @@ public class Bug326509Test extends TestCase { private TestableParser testMe; - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { testMe = new TestableParser(); } - public void testBug326509() { + @Test public void testBug326509() { for(int i = 0; i <= 200; i++) { testMe.pushFollow(new BitSet()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java index f710146c0..c437ad8d8 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenericUnloaderTest.java @@ -7,8 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.parser.antlr; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; @@ -17,13 +15,15 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EContentAdapter; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class GenericUnloaderTest extends TestCase { +public class GenericUnloaderTest extends Assert { - public void testHandleContentAdapter() throws Exception { + @Test public void testHandleContentAdapter() throws Exception { EPackage root = createExample(); EContentAdapter eContentAdapter = new EContentAdapter(); root.eAdapters().add(eContentAdapter); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java index 5e2d7aeec..2151876e6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/LexerProviderTest.java @@ -7,15 +7,17 @@ *******************************************************************************/ package org.eclipse.xtext.parser.antlr; -import junit.framework.TestCase; - import org.antlr.runtime.CharStream; import org.antlr.runtime.RecognitionException; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class LexerProviderTest extends TestCase { +public class LexerProviderTest extends Assert { public static class MyLexer extends Lexer { @@ -40,34 +42,32 @@ public class LexerProviderTest extends TestCase { private LexerProvider provider; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { this.provider = new LexerProvider(MyLexer.class); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { this.provider = null; - super.tearDown(); } - public void testResultNotNull() { + @Test public void testResultNotNull() { Lexer lexer = provider.get(); assertNotNull("lexer", lexer); } - public void testResultIsMyLexer() { + @Test public void testResultIsMyLexer() { Lexer lexer = provider.get(); assertTrue("lexer instanceof MyLexer", lexer instanceof MyLexer); } - public void testResultIsInitialized() { + @Test public void testResultIsInitialized() { MyLexer lexer = provider.get(); assertTrue("lexer.initialized", lexer.initialized); } - public void testSetup() { + @Test public void testSetup() { assertTrue("MyLexer(null).initialized", new MyLexer(null).initialized); assertFalse("MyLexer().initialized", new MyLexer().initialized); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java index db7f50864..75902ce2e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/TokenAcceptorTest.java @@ -11,32 +11,32 @@ import java.util.NoSuchElementException; import org.antlr.runtime.CommonToken; import org.antlr.runtime.Token; - -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class TokenAcceptorTest extends TestCase { +public class TokenAcceptorTest extends Assert { private TokenAcceptor tokenAcceptor; private int tokenCount; private int expectedToken; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { tokenAcceptor = new TokenAcceptor(); tokenCount = 0; expectedToken = 1; } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { tokenAcceptor = null; tokenCount = -1; expectedToken = -1; - super.tearDown(); } protected Token createToken() { @@ -60,7 +60,7 @@ public class TokenAcceptorTest extends TestCase { expectedToken++; } - public void testNextOnEmpty() { + @Test public void testNextOnEmpty() { assertFalse(tokenAcceptor.hasNext()); try { next(); @@ -70,7 +70,7 @@ public class TokenAcceptorTest extends TestCase { } } - public void testNextCalledToOften() { + @Test public void testNextCalledToOften() { accept(); accept(); next(); @@ -84,7 +84,7 @@ public class TokenAcceptorTest extends TestCase { } } - public void testAlternateCalls() { + @Test public void testAlternateCalls() { for(int i = 0; i < 10; i++) { accept(); next(); @@ -92,7 +92,7 @@ public class TokenAcceptorTest extends TestCase { } } - public void testSubsequentCalls() { + @Test public void testSubsequentCalls() { for(int i = 0; i < 10; i++) { accept(); } @@ -102,7 +102,7 @@ public class TokenAcceptorTest extends TestCase { assertFalse(tokenAcceptor.hasNext()); } - public void testRepeatedSubsequentCalls() { + @Test public void testRepeatedSubsequentCalls() { for(int i = 0; i < 10; i++) { for(int j = 0; j < 10; j++) { accept(); @@ -117,7 +117,7 @@ public class TokenAcceptorTest extends TestCase { private static final int PERF_LOOPS = 100 * 100; // 10 * 1000 * 1000 private static final int PERF_INNER_LOOPS = 10; - public void testPerformance_01() { + @Test public void testPerformance_01() { for(int i = 0; i < PERF_LOOPS; i++) { for(int j = 0; j < PERF_INNER_LOOPS; j++) { accept(); @@ -128,14 +128,14 @@ public class TokenAcceptorTest extends TestCase { } } - public void testPerformance_02() { + @Test public void testPerformance_02() { for(int i = 0; i < PERF_LOOPS * PERF_INNER_LOOPS; i++) { accept(); next(); } } - public void testPerformanceNoop() { + @Test public void testPerformanceNoop() { for(int i = 0; i < PERF_LOOPS; i++) { for(int j = 0; j < PERF_INNER_LOOPS; j++) { Token token = createToken(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java index 22ae55d4a..5a0dbfcfd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java @@ -10,17 +10,17 @@ package org.eclipse.xtext.parser.antlr; import org.antlr.runtime.CommonToken; import org.antlr.runtime.Token; import org.antlr.runtime.TokenSource; - -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class XtextTokenStreamTest extends TestCase implements TokenSource { +public class XtextTokenStreamTest extends Assert implements TokenSource { private int tokenCount = 0; - public void testConsumeUntilEOF_large() { + @Test public void testConsumeUntilEOF_large() { tokenCount = 25000; XtextTokenStream stream = new XtextTokenStream(this, Token.DEFAULT_CHANNEL); while(stream.LA(1) != Token.EOF) { @@ -29,7 +29,7 @@ public class XtextTokenStreamTest extends TestCase implements TokenSource { } } - public void testConsumeUntilEOF_small() { + @Test public void testConsumeUntilEOF_small() { tokenCount = 25; XtextTokenStream stream = new XtextTokenStream(this, Token.DEFAULT_CHANNEL); while(stream.LA(1) != Token.EOF) { @@ -38,23 +38,23 @@ public class XtextTokenStreamTest extends TestCase implements TokenSource { } } -// public void test_smallFile_hugeLA() { +// @Test public void test_smallFile_hugeLA() { // doTestLookahead(500, 2500); // } // -// public void test_avgFile_largeLA() { +// @Test public void test_avgFile_largeLA() { // doTestLookahead(50, 25000); // } // -// public void test_largeFile_largeLA() { +// @Test public void test_largeFile_largeLA() { // doTestLookahead(50, 2500000); // } // -// public void test_largeFile_tinyLA() { +// @Test public void test_largeFile_tinyLA() { // doTestLookahead(2, 2500000); // } // -// public void test_largeFile_noLA() { +// @Test public void test_largeFile_noLA() { // doTestLookahead(1, 2500000); // } // diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java index dfc11f9db..840e7220d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug287184Test.java @@ -8,7 +8,8 @@ package org.eclipse.xtext.parser.assignments; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -16,42 +17,42 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class Bug287184Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug287184TestLanguageStandaloneSetup.class); } - public void testBug287184_01() throws Exception { + @Test public void testBug287184_01() throws Exception { String modelAsText = "model ID.ID detail ID.ID"; Resource res = getResourceFromString(modelAsText); assertTrue(res.getErrors().toString(), res.getErrors().isEmpty()); } - public void testBug287184_02() throws Exception { + @Test public void testBug287184_02() throws Exception { String modelAsText = "model ID.ID associated ID.ID;"; Resource res = getResourceFromString(modelAsText); assertTrue(res.getErrors().toString(), res.getErrors().isEmpty()); } - public void testBug287184_03() throws Exception { + @Test public void testBug287184_03() throws Exception { String modelAsText = "model ID.ID detail public ID.ID"; Resource res = getResourceFromString(modelAsText); assertTrue(res.getErrors().toString(), res.getErrors().isEmpty()); } - public void testBug287184_04() throws Exception { + @Test public void testBug287184_04() throws Exception { String modelAsText = "model ID.ID detail public ID.ID detail ID.ID"; Resource res = getResourceFromString(modelAsText); assertTrue(res.getErrors().toString(), res.getErrors().isEmpty()); } - public void testBug287184_05() throws Exception { + @Test public void testBug287184_05() throws Exception { String modelAsText = "model ID associated ID;"; Resource res = getResourceFromString(modelAsText); assertTrue(res.getErrors().toString(), res.getErrors().isEmpty()); } - public void testBug287184_06() throws Exception { + @Test public void testBug287184_06() throws Exception { String modelAsText = "model ID detail ID;"; Resource res = getResourceFromStringAndExpect(modelAsText, 1); assertEquals(res.getErrors().toString(), 1, res.getErrors().size()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java index 16a664d63..5e746dfc8 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/Bug288432Test.java @@ -7,11 +7,12 @@ *******************************************************************************/ package org.eclipse.xtext.parser.assignments; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.assignments.bug288432Test.Body; import org.eclipse.xtext.parser.assignments.bug288432Test.MyElement; import org.eclipse.xtext.parser.assignments.bug288432Test.MyInt; import org.eclipse.xtext.parser.assignments.bug288432Test.ParameterObject; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -19,12 +20,12 @@ import org.eclipse.xtext.parser.assignments.bug288432Test.ParameterObject; public class Bug288432Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug288432TestLanguageStandaloneSetup.class); } - public void testBug288432_01() throws Exception { + @Test public void testBug288432_01() throws Exception { String modelAsText = "body\n" + " content\n" + " element 1\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java index 3c897aaa1..482839a47 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/ParserBug281962Test.java @@ -7,11 +7,12 @@ *******************************************************************************/ package org.eclipse.xtext.parser.assignments; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.Model; import org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.MultiValue; import org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.SingleValue; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,54 +25,54 @@ public class ParserBug281962Test extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(AssignmentsTestLanguageStandaloneSetup.class); } - public void testSimpleSingle_01() throws Exception { + @Test public void testSimpleSingle_01() throws Exception { Model model = (Model) getModel("simple id something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testSimpleSingle_02() throws Exception { + @Test public void testSimpleSingle_02() throws Exception { Model model = (Model) getModel("simple string 'something'"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testSimpleSingle_03() throws Exception { + @Test public void testSimpleSingle_03() throws Exception { Model model = (Model) getModel("simple alternative something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testSimpleSingle_04() throws Exception { + @Test public void testSimpleSingle_04() throws Exception { Model model = (Model) getModel("simple alternative 'something'"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testSimpleSingle_05() throws Exception { + @Test public void testSimpleSingle_05() throws Exception { Model model = (Model) getModel("simple id ^something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testSimpleSingle_06() throws Exception { + @Test public void testSimpleSingle_06() throws Exception { Model model = (Model) getModel("simple alternative ^something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testSimpleMulti_01() throws Exception { + @Test public void testSimpleMulti_01() throws Exception { Model model = (Model) getModel("simple ids something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -79,7 +80,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testSimpleMulti_02() throws Exception { + @Test public void testSimpleMulti_02() throws Exception { Model model = (Model) getModel("simple strings 'something'"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -87,7 +88,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testSimpleMulti_03() throws Exception { + @Test public void testSimpleMulti_03() throws Exception { Model model = (Model) getModel("simple alternatives something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -95,7 +96,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testSimpleMulti_04() throws Exception { + @Test public void testSimpleMulti_04() throws Exception { Model model = (Model) getModel("simple alternatives 'something'"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -103,7 +104,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testSimpleMulti_05() throws Exception { + @Test public void testSimpleMulti_05() throws Exception { Model model = (Model) getModel("simple ids ^something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -111,7 +112,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testSimpleMulti_06() throws Exception { + @Test public void testSimpleMulti_06() throws Exception { Model model = (Model) getModel("simple alternatives ^something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -119,49 +120,49 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testSimpleSingleDatatype_01() throws Exception { + @Test public void testSimpleSingleDatatype_01() throws Exception { Model model = (Model) getModel("simple datatypeid something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("IdDatatype: something", singleValue.getValue()); } - public void testSimpleSingleDatatype_02() throws Exception { + @Test public void testSimpleSingleDatatype_02() throws Exception { Model model = (Model) getModel("simple datatypestring 'something'"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("StringDatatype: 'something'", singleValue.getValue()); } - public void testSimpleSingleDatatype_03() throws Exception { + @Test public void testSimpleSingleDatatype_03() throws Exception { Model model = (Model) getModel("simple datatypealternative something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("IdDatatype: something", singleValue.getValue()); } - public void testSimpleSingleDatatype_04() throws Exception { + @Test public void testSimpleSingleDatatype_04() throws Exception { Model model = (Model) getModel("simple datatypealternative 'something'"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("StringDatatype: 'something'", singleValue.getValue()); } - public void testSimpleSingleDatatype_05() throws Exception { + @Test public void testSimpleSingleDatatype_05() throws Exception { Model model = (Model) getModel("simple datatypeid ^something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("IdDatatype: ^something", singleValue.getValue()); } - public void testSimpleSingleDatatype_06() throws Exception { + @Test public void testSimpleSingleDatatype_06() throws Exception { Model model = (Model) getModel("simple datatypealternative ^something"); SingleValue singleValue = model.getSingle(); assertNotNull(model); assertEquals("IdDatatype: ^something", singleValue.getValue()); } - public void testSimpleMultiDatatype_01() throws Exception { + @Test public void testSimpleMultiDatatype_01() throws Exception { Model model = (Model) getModel("simple datatypeids something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -169,7 +170,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: something", multiValue.getValue().get(0)); } - public void testSimpleMultiDatatype_02() throws Exception { + @Test public void testSimpleMultiDatatype_02() throws Exception { Model model = (Model) getModel("simple datatypestrings 'something'"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -177,7 +178,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("StringDatatype: 'something'", multiValue.getValue().get(0)); } - public void testSimpleMultiDatatype_03() throws Exception { + @Test public void testSimpleMultiDatatype_03() throws Exception { Model model = (Model) getModel("simple datatypealternatives something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -185,7 +186,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: something", multiValue.getValue().get(0)); } - public void testSimpleMultiDatatype_04() throws Exception { + @Test public void testSimpleMultiDatatype_04() throws Exception { Model model = (Model) getModel("simple datatypealternatives 'something'"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -193,7 +194,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("StringDatatype: 'something'", multiValue.getValue().get(0)); } - public void testSimpleMultiDatatype_05() throws Exception { + @Test public void testSimpleMultiDatatype_05() throws Exception { Model model = (Model) getModel("simple datatypeids ^something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -201,7 +202,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: ^something", multiValue.getValue().get(0)); } - public void testSimpleMultiDatatype_06() throws Exception { + @Test public void testSimpleMultiDatatype_06() throws Exception { Model model = (Model) getModel("simple datatypealternatives ^something"); MultiValue multiValue = model.getMulti(); assertNotNull(model); @@ -209,49 +210,49 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: ^something", multiValue.getValue().get(0)); } - public void testComplexSingle_01() throws Exception { + @Test public void testComplexSingle_01() throws Exception { Model model = (Model) getModel("complex id something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testComplexSingle_02() throws Exception { + @Test public void testComplexSingle_02() throws Exception { Model model = (Model) getModel("complex string 'something'"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testComplexSingle_03() throws Exception { + @Test public void testComplexSingle_03() throws Exception { Model model = (Model) getModel("complex alternative something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testComplexSingle_04() throws Exception { + @Test public void testComplexSingle_04() throws Exception { Model model = (Model) getModel("complex alternative 'something'"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testComplexSingle_05() throws Exception { + @Test public void testComplexSingle_05() throws Exception { Model model = (Model) getModel("complex id ^something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testComplexSingle_06() throws Exception { + @Test public void testComplexSingle_06() throws Exception { Model model = (Model) getModel("complex alternative ^something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("something", singleValue.getValue()); } - public void testComplexMulti_01() throws Exception { + @Test public void testComplexMulti_01() throws Exception { Model model = (Model) getModel("complex ids something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -259,7 +260,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testComplexMulti_02() throws Exception { + @Test public void testComplexMulti_02() throws Exception { Model model = (Model) getModel("complex strings 'something'"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -267,7 +268,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testComplexMulti_03() throws Exception { + @Test public void testComplexMulti_03() throws Exception { Model model = (Model) getModel("complex alternatives something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -275,7 +276,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testComplexMulti_04() throws Exception { + @Test public void testComplexMulti_04() throws Exception { Model model = (Model) getModel("complex alternatives 'something'"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -283,7 +284,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testComplexMulti_05() throws Exception { + @Test public void testComplexMulti_05() throws Exception { Model model = (Model) getModel("complex ids ^something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -291,7 +292,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testComplexMulti_06() throws Exception { + @Test public void testComplexMulti_06() throws Exception { Model model = (Model) getModel("complex alternatives ^something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -299,49 +300,49 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("something", multiValue.getValue().get(0)); } - public void testComplexSingleDatatype_01() throws Exception { + @Test public void testComplexSingleDatatype_01() throws Exception { Model model = (Model) getModel("complex datatypeid something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("IdDatatype: something", singleValue.getValue()); } - public void testComplexSingleDatatype_02() throws Exception { + @Test public void testComplexSingleDatatype_02() throws Exception { Model model = (Model) getModel("complex datatypestring 'something'"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("StringDatatype: 'something'", singleValue.getValue()); } - public void testComplexSingleDatatype_03() throws Exception { + @Test public void testComplexSingleDatatype_03() throws Exception { Model model = (Model) getModel("complex datatypealternative something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("IdDatatype: something", singleValue.getValue()); } - public void testComplexSingleDatatype_04() throws Exception { + @Test public void testComplexSingleDatatype_04() throws Exception { Model model = (Model) getModel("complex datatypealternative 'something'"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("StringDatatype: 'something'", singleValue.getValue()); } - public void testComplexSingleDatatype_05() throws Exception { + @Test public void testComplexSingleDatatype_05() throws Exception { Model model = (Model) getModel("complex datatypeid ^something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("IdDatatype: ^something", singleValue.getValue()); } - public void testComplexSingleDatatype_06() throws Exception { + @Test public void testComplexSingleDatatype_06() throws Exception { Model model = (Model) getModel("complex datatypealternative ^something"); SingleValue singleValue = (SingleValue) model.getObject(); assertNotNull(model); assertEquals("IdDatatype: ^something", singleValue.getValue()); } - public void testComplexMultiDatatype_01() throws Exception { + @Test public void testComplexMultiDatatype_01() throws Exception { Model model = (Model) getModel("complex datatypeids something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -349,7 +350,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: something", multiValue.getValue().get(0)); } - public void testComplexMultiDatatype_02() throws Exception { + @Test public void testComplexMultiDatatype_02() throws Exception { Model model = (Model) getModel("complex datatypestrings 'something'"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -357,7 +358,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("StringDatatype: 'something'", multiValue.getValue().get(0)); } - public void testComplexMultiDatatype_03() throws Exception { + @Test public void testComplexMultiDatatype_03() throws Exception { Model model = (Model) getModel("complex datatypealternatives something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -365,7 +366,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: something", multiValue.getValue().get(0)); } - public void testComplexMultiDatatype_04() throws Exception { + @Test public void testComplexMultiDatatype_04() throws Exception { Model model = (Model) getModel("complex datatypealternatives 'something'"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -373,7 +374,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("StringDatatype: 'something'", multiValue.getValue().get(0)); } - public void testComplexMultiDatatype_05() throws Exception { + @Test public void testComplexMultiDatatype_05() throws Exception { Model model = (Model) getModel("complex datatypeids ^something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); @@ -381,7 +382,7 @@ public class ParserBug281962Test extends AbstractXtextTests { assertEquals("IdDatatype: ^something", multiValue.getValue().get(0)); } - public void testComplexMultiDatatype_06() throws Exception { + @Test public void testComplexMultiDatatype_06() throws Exception { Model model = (Model) getModel("complex datatypealternatives ^something"); MultiValue multiValue = (MultiValue) model.getObject(); assertNotNull(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java index b7e86713f..80721a443 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/EFactoryValueConverterTest.java @@ -13,9 +13,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.conversion.impl.EFactoryValueConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.CompositeModel; import org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.Model; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -24,33 +25,33 @@ public class EFactoryValueConverterTest extends AbstractXtextTests{ private static final double TEST_DOUBLE_VALUE = -1.3234434E27; - public void testEFactoryValueConverter() throws Exception { + @Test public void testEFactoryValueConverter() throws Exception { EFactoryValueConverter eDoubleConverter = new EFactoryValueConverter(EcorePackage.Literals.EDOUBLE); String doubleAsString = eDoubleConverter.toString(TEST_DOUBLE_VALUE); assertEquals(Double.toString(TEST_DOUBLE_VALUE), doubleAsString); Object value = eDoubleConverter.toValue(doubleAsString, null); assertTrue(value instanceof Double); - assertEquals(((Double)value).doubleValue(), TEST_DOUBLE_VALUE); + assertEquals(((Double)value).doubleValue(), TEST_DOUBLE_VALUE, 0.0001); } - public void testEBigDecimalConversion() throws Exception { + @Test public void testEBigDecimalConversion() throws Exception { EFactoryValueConverter converter = new EFactoryValueConverter(EcorePackage.Literals.EBIG_DECIMAL); BigDecimal value = (BigDecimal) converter.toValue(".5", null); assertNotNull(value); assertEquals(new BigDecimal("0.5"), value); } - public void testImplicitEFactoryValueConverter() throws Exception { + @Test public void testImplicitEFactoryValueConverter() throws Exception { with(DatatypeRulesTestLanguageStandaloneSetup.class); EObject model = getModel("a.b.c.d * -2.5E-23 ;"); assertTrue(model instanceof CompositeModel); assertFalse(((CompositeModel)model).getModel().isEmpty()); model = ((CompositeModel)model).getModel().get(0); double myDouble = ((Model) model).getDouble(); - assertEquals(-2.5E-23, myDouble); + assertEquals(-2.5E-23, myDouble, 0.0001); } - public void testEmptyString() { + @Test public void testEmptyString() { EFactoryValueConverter eIntConverter = new EFactoryValueConverter(EcorePackage.Literals.EINT); try { eIntConverter.toValue("", null); @@ -68,7 +69,7 @@ public class EFactoryValueConverterTest extends AbstractXtextTests{ } } - public void testNullString() { + @Test public void testNullString() { EFactoryValueConverter eIntConverter = new EFactoryValueConverter(EcorePackage.Literals.EINT); try { eIntConverter.toValue(null, null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java index 4c27c4ea3..9990faedc 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/GrammarTest.java @@ -13,8 +13,9 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -25,19 +26,19 @@ public class GrammarTest extends AbstractXtextTests { private Grammar grammar; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DatatypeRulesTestLanguageStandaloneSetup.class); grammarAccess = get(DatatypeRulesTestLanguageGrammarAccess.class); grammar = grammarAccess.getGrammar(); } - public void testGrammarAccess() { + @Test public void testGrammarAccess() { assertEquals(2, grammar.getMetamodelDeclarations().size()); assertEquals(8, grammar.getRules().size()); } - public void testRuleCompositeModel() { + @Test public void testRuleCompositeModel() { AbstractRule rule = grammar.getRules().get(0); assertEquals("CompositeModel", rule.getName()); ParserRule parserRule = (ParserRule) rule; @@ -47,7 +48,7 @@ public class GrammarTest extends AbstractXtextTests { assertEquals("CompositeModel", rule.getType().getClassifier().getName()); } - public void testRuleModel() { + @Test public void testRuleModel() { AbstractRule rule = grammar.getRules().get(1); assertEquals("Model", rule.getName()); ParserRule parserRule = (ParserRule) rule; @@ -57,7 +58,7 @@ public class GrammarTest extends AbstractXtextTests { assertEquals("Model", rule.getType().getClassifier().getName()); } - public void testRuleModelId() { + @Test public void testRuleModelId() { AbstractRule rule = grammar.getRules().get(2); assertEquals("ModelId", rule.getName()); ParserRule parserRule = (ParserRule) rule; @@ -67,7 +68,7 @@ public class GrammarTest extends AbstractXtextTests { assertEquals(EcorePackage.Literals.ESTRING, rule.getType().getClassifier()); } - public void testRuleNestedModelId() { + @Test public void testRuleNestedModelId() { AbstractRule rule = grammar.getRules().get(3); assertEquals("NestedModelId", rule.getName()); ParserRule parserRule = (ParserRule) rule; @@ -77,7 +78,7 @@ public class GrammarTest extends AbstractXtextTests { assertEquals(EcorePackage.Literals.ESTRING, rule.getType().getClassifier()); } - public void testRuleFraction() { + @Test public void testRuleFraction() { AbstractRule rule = grammar.getRules().get(4); assertEquals("Fraction", rule.getName()); ParserRule parserRule = (ParserRule) rule; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java index 16c3ac9fa..538dcdc78 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTest.java @@ -7,31 +7,32 @@ *******************************************************************************/ package org.eclipse.xtext.parser.datatyperules; -import junit.framework.TestCase; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.DatatypeRulesTestLanguagePackage; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class MetamodelTest extends TestCase { +public class MetamodelTest extends Assert { - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { DatatypeRulesTestLanguageStandaloneSetup.doSetup(); } - public void testDerivedPackage() { + @Test public void testDerivedPackage() { EPackage pack = DatatypeRulesTestLanguagePackage.eINSTANCE; assertNotNull(pack); assertEquals(2, pack.getEClassifiers().size()); } - public void testDerivedModel() { + @Test public void testDerivedModel() { EPackage pack = DatatypeRulesTestLanguagePackage.eINSTANCE; EClass model = (EClass) pack.getEClassifier("Model"); assertNotNull(model); @@ -49,7 +50,7 @@ public class MetamodelTest extends TestCase { assertEquals(EcorePackage.Literals.ESTRING, feature.getEType()); } - public void testDerivedCompositeModel() { + @Test public void testDerivedCompositeModel() { EPackage pack = DatatypeRulesTestLanguagePackage.eINSTANCE; EClass model = (EClass) pack.getEClassifier("CompositeModel"); assertNotNull(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java index 6996577ec..155b4e747 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationErrorTest.java @@ -15,11 +15,12 @@ import org.easymock.EasyMock; import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.xtext.ecoreInference.ErrorAcceptor; import org.eclipse.xtext.xtext.ecoreInference.TransformationErrorCode; import org.eclipse.xtext.xtext.ecoreInference.Xtext2EcoreTransformer; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -33,7 +34,7 @@ public class MetamodelTransformationErrorTest extends AbstractXtextTests { private Grammar grammar; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); model = "grammar datatypetests with org.eclipse.xtext.common.Terminals\n" + @@ -52,14 +53,14 @@ public class MetamodelTransformationErrorTest extends AbstractXtextTests { transformer.setErrorAcceptor(errorAcceptor); } - public void testSetUp() { + @Test public void testSetUp() { assertNotNull(resource); assertNotNull(transformer); assertNotNull(errorAcceptor); assertEquals(2, resource.getErrors().size()); } - public void testErrorMessages() throws Exception { + @Test public void testErrorMessages() throws Exception { errorAcceptor.acceptError(same(TransformationErrorCode.InvalidDatatypeRule), (String) anyObject(), same(grammar.getRules().get(3))); errorAcceptor.acceptError(same(TransformationErrorCode.InvalidDatatypeRule), (String) anyObject(), same(grammar.getRules().get(4))); transform(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java index 0f2145bf7..77623a345 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/MetamodelTransformationTest.java @@ -12,7 +12,8 @@ import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -24,7 +25,7 @@ public class MetamodelTransformationTest extends AbstractXtextTests { private EPackage pack; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); model = "grammar datatypetests with org.eclipse.xtext.common.Terminals\n" + @@ -46,69 +47,69 @@ public class MetamodelTransformationTest extends AbstractXtextTests { pack = grammar.getMetamodelDeclarations().get(1).getEPackage(); } - public void testSetUp() { + @Test public void testSetUp() { assertEquals(2, grammar.getMetamodelDeclarations().size()); assertEquals(10, grammar.getRules().size()); assertNotNull(pack); } - public void testRuleStartId() { + @Test public void testRuleStartId() { ParserRule rule = (ParserRule) grammar.getRules().get(1); assertNotNull(rule); assertEquals("StartId", rule.getName()); assertEquals(EcorePackage.Literals.EINT, rule.getType().getClassifier()); } - public void testRuleRecursiveId() { + @Test public void testRuleRecursiveId() { ParserRule rule = (ParserRule) grammar.getRules().get(2); assertNotNull(rule); assertEquals("RecursiveId", rule.getName()); assertEquals(EcorePackage.Literals.ESTRING, rule.getType().getClassifier()); } - public void testRuleCalledId() { + @Test public void testRuleCalledId() { ParserRule rule = (ParserRule) grammar.getRules().get(3); assertNotNull(rule); assertEquals("CalledId", rule.getName()); assertEquals(EcorePackage.Literals.ESTRING, rule.getType().getClassifier()); } - public void testRuleValue() { + @Test public void testRuleValue() { ParserRule rule = (ParserRule) grammar.getRules().get(4); assertNotNull(rule); assertEquals("Value", rule.getName()); assertEquals(pack.getEClassifier("Value"), rule.getType().getClassifier()); } - public void testOnlyKeywords() { + @Test public void testOnlyKeywords() { ParserRule rule = (ParserRule) grammar.getRules().get(5); assertNotNull(rule); assertEquals("OnlyKeywords", rule.getName()); assertEquals(EcorePackage.Literals.ESTRING, rule.getType().getClassifier()); } - public void testAssignmentWithAlternative() { + @Test public void testAssignmentWithAlternative() { ParserRule rule = (ParserRule) grammar.getRules().get(6); assertNotNull(rule); assertEquals("AssignmentWithAlternative", rule.getName()); assertEquals(pack.getEClassifier("AssignmentWithAlternative"), rule.getType().getClassifier()); } - public void testFarbe() { + @Test public void testFarbe() { ParserRule rule = (ParserRule) grammar.getRules().get(7); assertNotNull(rule); assertEquals("Farbe", rule.getName()); assertEquals(pack.getEClassifier("Farbe"), rule.getType().getClassifier()); } - public void testUnorderedGroupDataType() { + @Test public void testUnorderedGroupDataType() { ParserRule rule = (ParserRule) grammar.getRules().get(8); assertNotNull(rule); assertEquals("UnorderedGroupDataType", rule.getName()); assertEquals(EcorePackage.Literals.ESTRING, rule.getType().getClassifier()); } - public void testUnorderedGroupClass() { + @Test public void testUnorderedGroupClass() { ParserRule rule = (ParserRule) grammar.getRules().get(9); assertNotNull(rule); assertEquals("UnorderedGroupClass", rule.getName()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java index c98692abc..4d3ab1f40 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ParserTest.java @@ -15,9 +15,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.DatatypeRulesTestLanguagePackage; import org.eclipse.xtext.resource.XtextSyntaxDiagnostic; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -31,7 +32,7 @@ public class ParserTest extends AbstractXtextTests { private EStructuralFeature vectorFeature; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DatatypeRulesTestLanguageStandaloneSetup.class); EPackage pack = DatatypeRulesTestLanguagePackage.eINSTANCE; @@ -45,7 +46,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseSimple() throws Exception { + @Test public void testParseSimple() throws Exception { String model = "a.b.c.d;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -58,7 +59,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseSimpleWithSpaces() throws Exception { + @Test public void testParseSimpleWithSpaces() throws Exception { String model = " a . b . c . d ;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -70,7 +71,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseSimpleWithMultipleSpaces() throws Exception { + @Test public void testParseSimpleWithMultipleSpaces() throws Exception { String model = " a . b . c . d ;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -82,7 +83,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithFraction() throws Exception { + @Test public void testParseWithFraction() throws Exception { String model = "a.b.c.d: 1/2;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -94,7 +95,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithFractionError() throws Exception { + @Test public void testParseWithFractionError() throws Exception { String model = "a.b.c.d: 1/0;"; Resource r = getResourceFromStringAndExpect(model, 1); EObject parsedModel = r.getContents().get(0); @@ -108,7 +109,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithFractionErrorAndSpaces() throws Exception { + @Test public void testParseWithFractionErrorAndSpaces() throws Exception { String model = "a.b.c.d: 1 / 0 ; "; Resource r = getResourceFromStringAndExpect(model, 1); EObject parsedModel = r.getContents().get(0); @@ -122,7 +123,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithFractionErrorAndSyntaxError() throws Exception { + @Test public void testParseWithFractionErrorAndSyntaxError() throws Exception { String model = "a.b.c.d: 1/0 "; Resource r = getResourceFromStringAndExpect(model, 2); EObject parsedModel = r.getContents().get(0); @@ -139,7 +140,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithVector() throws Exception { + @Test public void testParseWithVector() throws Exception { String model = "a.b.c.d # (1 2);"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -151,7 +152,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithVectorAndComment() throws Exception { + @Test public void testParseWithVectorAndComment() throws Exception { String model = "a.b.c.d # (1/*comment*/2);"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -163,7 +164,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithDots() throws Exception { + @Test public void testParseWithDots() throws Exception { String model = "a.b.c.d + . .;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -175,7 +176,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithDotsAndLinebreak() throws Exception { + @Test public void testParseWithDotsAndLinebreak() throws Exception { String model = "a.b.c.d + .\n.;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -187,7 +188,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithDotsAndComments() throws Exception { + @Test public void testParseWithDotsAndComments() throws Exception { String model = "a.b.c.d + ./*comment*/.;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -199,7 +200,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseWithDoubleDots() throws Exception { + @Test public void testParseWithDoubleDots() throws Exception { String model = "a.b.c.d + ..;"; EObject parsedModel = getModel(model); assertNotNull(parsedModel); @@ -211,7 +212,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseErrors_01() throws Exception { + @Test public void testParseErrors_01() throws Exception { String model = "a.b.c.d"; Resource r = getResourceFromStringAndExpect(model, 1); assertEquals(1, r.getErrors().size()); @@ -225,7 +226,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseErrors_02() throws Exception { + @Test public void testParseErrors_02() throws Exception { String model = "a.b.c."; Resource r = getResourceFromStringAndExpect(model, 1); assertEquals(1, r.getErrors().size()); @@ -239,7 +240,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseErrors_03() throws Exception { + @Test public void testParseErrors_03() throws Exception { String model = "a.b.c. ;"; Resource r = getResourceFromStringAndExpect(model, 1); assertEquals(1, r.getErrors().size()); @@ -253,7 +254,7 @@ public class ParserTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testParseErrors_04() throws Exception { + @Test public void testParseErrors_04() throws Exception { String model = "a.b.c"; Resource r = getResourceFromStringAndExpect(model, 1); assertEquals(1, r.getErrors().size()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java index a2d7994ac..8ebd3e45e 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/PartialParserTest.java @@ -7,11 +7,12 @@ *******************************************************************************/ package org.eclipse.xtext.parser.datatyperules; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.tests.EmfAssert; import org.eclipse.xtext.util.ReplaceRegion; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -23,7 +24,7 @@ public class PartialParserTest extends AbstractXtextTests { private IParseResult parseResult; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DatatypeRulesTestLanguageStandaloneSetup.class); model = "a.b.c.d: 123;\n" + @@ -32,11 +33,11 @@ public class PartialParserTest extends AbstractXtextTests { parseResult = resource.getParseResult(); } - public void testSetUp() { + @Test public void testSetUp() { assertTrue(resource.getErrors().isEmpty()); } - public void testInsertSlashInFirstNode() throws Exception { + @Test public void testInsertSlashInFirstNode() throws Exception { IParseResult parseResult = resource.getParser().reparse(this.parseResult, new ReplaceRegion(model.indexOf('3'), 0, "/")); assertFalse(parseResult.hasSyntaxErrors()); assertEquals(0, parseResult.getRootNode().getTotalOffset()); @@ -47,7 +48,7 @@ public class PartialParserTest extends AbstractXtextTests { EmfAssert.assertEObjectsEqual(getModel(newModel), resource.getParseResult().getRootASTElement()); } - public void testInsertSlashInSecondNode() throws Exception { + @Test public void testInsertSlashInSecondNode() throws Exception { IParseResult parseResult = resource.getParser().reparse(this.parseResult, new ReplaceRegion(model.indexOf('6'), 0, "/")); assertFalse(parseResult.hasSyntaxErrors()); assertEquals(0, parseResult.getRootNode().getTotalOffset()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java index 742f5a76b..642606a3f 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/SerializationTest.java @@ -15,8 +15,9 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.DatatypeRulesTestLanguagePackage; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -32,7 +33,7 @@ public class SerializationTest extends AbstractXtextTests { private EStructuralFeature modelFeature; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DatatypeRulesTestLanguageStandaloneSetup.class); pack = DatatypeRulesTestLanguagePackage.eINSTANCE; @@ -45,7 +46,7 @@ public class SerializationTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testSerializeSimple() { + @Test public void testSerializeSimple() { EObject compositeModel = factory.create(compositeModelClass); EObject firstModel = factory.create(modelClass); ((List) compositeModel.eGet(modelFeature)).add(firstModel); @@ -55,7 +56,7 @@ public class SerializationTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testSerializeTwoModels() { + @Test public void testSerializeTwoModels() { EObject compositeModel = factory.create(compositeModelClass); EObject firstModel = factory.create(modelClass); ((List) compositeModel.eGet(modelFeature)).add(firstModel); @@ -68,7 +69,7 @@ public class SerializationTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testSerializeFracton() { + @Test public void testSerializeFracton() { EObject compositeModel = factory.create(compositeModelClass); EObject firstModel = factory.create(modelClass); ((List) compositeModel.eGet(modelFeature)).add(firstModel); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java index eb8c3094c..619537edd 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/datatyperules/ValueConverterTest.java @@ -9,38 +9,39 @@ package org.eclipse.xtext.parser.datatyperules; import java.math.BigDecimal; -import junit.framework.TestCase; - import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class ValueConverterTest extends TestCase { +public class ValueConverterTest extends Assert { private IValueConverter valueConverter; - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { valueConverter = new DatatypeRulesTestLanguageValueConverters().Fraction(); } - public void testSimpleToObject() throws ValueConverterException { + @Test public void testSimpleToObject() throws ValueConverterException { String s = "123"; BigDecimal bd = valueConverter.toValue(s, null); BigDecimal expected = new BigDecimal("123"); assertEquals(expected, bd); } - public void testFractionObject() throws ValueConverterException { + @Test public void testFractionObject() throws ValueConverterException { String s = "123/246"; BigDecimal bd = valueConverter.toValue(s, null); BigDecimal expected = new BigDecimal("0.5"); assertEquals(expected, bd); } - public void testZeroDenominator() throws ValueConverterException { + @Test public void testZeroDenominator() throws ValueConverterException { String s = "123/0"; try { valueConverter.toValue(s, null); @@ -50,19 +51,19 @@ public class ValueConverterTest extends TestCase { } } - public void testSimpleToString() { + @Test public void testSimpleToString() { String expected = "123"; BigDecimal bd = BigDecimal.valueOf(123); assertEquals(expected, valueConverter.toString(bd)); } - public void testFractionToString_01() { + @Test public void testFractionToString_01() { String expected = "5/10"; BigDecimal bd = new BigDecimal("0.5"); assertEquals(expected, valueConverter.toString(bd)); } - public void testFractionToString_02() { + @Test public void testFractionToString_02() { String expected = "1557/1000"; BigDecimal bd = new BigDecimal("1.557"); assertEquals(expected, valueConverter.toString(bd)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java index 47aae42ab..07c1e3ecd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/EncodingTest.java @@ -19,8 +19,9 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.WrappedException; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Factory; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -36,7 +37,7 @@ public class EncodingTest extends AbstractXtextTests { private Map utfOptions; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EncodingTestLanguageStandaloneSetup.class); model = "Öclüpß Mödelüng Främwörk"; @@ -47,7 +48,7 @@ public class EncodingTest extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { model = null; utfBytes = null; isoBytes = null; @@ -56,17 +57,17 @@ public class EncodingTest extends AbstractXtextTests { super.tearDown(); } - public void testDefaultEncoding() throws Exception { + @Test public void testDefaultEncoding() throws Exception { XtextResource resource = createXtextResource(); assertEquals(Charset.defaultCharset().name(), resource.getEncoding()); } - public void testSetup() { + @Test public void testSetup() { assertFalse(Arrays.equals(utfBytes, isoBytes)); assertTrue(Charset.defaultCharset().name().equals(UTF_8) || Charset.defaultCharset().name().equals(ISO_8859_1)); } - public void testUtfBytesWithIsoOptions() throws Exception { + @Test public void testUtfBytesWithIsoOptions() throws Exception { XtextResource resource = createXtextResource(); try { resource.load(new ByteArrayInputStream(utfBytes), isoOptions); @@ -82,7 +83,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testIsoBytesWithUtfOptions() throws Exception { + @Test public void testIsoBytesWithUtfOptions() throws Exception { XtextResource resource = createXtextResource(); try { resource.load(new ByteArrayInputStream(isoBytes), utfOptions); @@ -98,7 +99,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testIsoEncoding() throws Exception { + @Test public void testIsoEncoding() throws Exception { XtextResource resource = createXtextResource(); resource.load(new ByteArrayInputStream(isoBytes), isoOptions); assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); @@ -106,7 +107,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testUtfEncoding() throws Exception { + @Test public void testUtfEncoding() throws Exception { XtextResource resource = createXtextResource(); resource.load(new ByteArrayInputStream(utfBytes), utfOptions); assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); @@ -114,7 +115,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testSaveIsoToIso() throws Exception { + @Test public void testSaveIsoToIso() throws Exception { XtextResource resource = createXtextResource(); resource.load(new ByteArrayInputStream(isoBytes), isoOptions); ByteArrayOutputStream isoSaveStream = new ByteArrayOutputStream(); @@ -124,7 +125,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(Arrays.equals(isoBytes, savedIsoBytes)); } - public void testSaveUtfToUtf() throws Exception { + @Test public void testSaveUtfToUtf() throws Exception { XtextResource resource = createXtextResource(); resource.load(new ByteArrayInputStream(utfBytes), utfOptions); ByteArrayOutputStream utfSaveStream = new ByteArrayOutputStream(); @@ -134,7 +135,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(Arrays.equals(utfBytes, savedUtfBytes)); } - public void testSaveUtfToIso() throws Exception { + @Test public void testSaveUtfToIso() throws Exception { XtextResource resource = createXtextResource(); resource.load(new ByteArrayInputStream(utfBytes), utfOptions); ByteArrayOutputStream isoSaveStream = new ByteArrayOutputStream(); @@ -144,7 +145,7 @@ public class EncodingTest extends AbstractXtextTests { assertTrue(Arrays.equals(isoBytes, savedIsoBytes)); } - public void testSaveIsoToUtf() throws Exception { + @Test public void testSaveIsoToUtf() throws Exception { XtextResource resource = createXtextResource(); resource.load(new ByteArrayInputStream(isoBytes), isoOptions); ByteArrayOutputStream utfSaveStream = new ByteArrayOutputStream(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java index aabadd277..05e58bbd5 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java @@ -7,8 +7,9 @@ *******************************************************************************/ package org.eclipse.xtext.parser.keywords; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.keywords.services.KeywordsTestLanguageGrammarAccess; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -20,14 +21,14 @@ public class GrammarAccessTest extends AbstractXtextTests { private KeywordsTestLanguageGrammarAccess.ModelElements modelElements; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(KeywordsTestLanguageStandaloneSetup.class); this.grammarAccess = get(KeywordsTestLanguageGrammarAccess.class); this.modelElements = grammarAccess.getModelAccess(); } - public void testKeywordValues() { + @Test public void testKeywordValues() { assertEquals("foo\\bar", modelElements.getFirstFooBarKeyword_0_0().getValue()); assertEquals("foo\\", modelElements.getSecondFooKeyword_1_0().getValue()); assertEquals("\\bar", modelElements.getThirdBarKeyword_2_0().getValue()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java index d9aee18a1..8c6c10ae7 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/ParserTest.java @@ -11,10 +11,11 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.ParserTestHelper; import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguagePackage; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -32,7 +33,7 @@ public class ParserTest extends AbstractXtextTests { private EStructuralFeature eighth; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(KeywordsTestLanguageStandaloneSetup.class); helper = new ParserTestHelper(getResourceFactory(), getParser(), get(Keys.RESOURCE_SET_KEY),getCurrentFileExtension()); @@ -55,49 +56,49 @@ public class ParserTest extends AbstractXtextTests { assertTrue(value); } - public void testFooBar() throws Exception { + @Test public void testFooBar() throws Exception { XtextResource resource = helper.getResourceFromString("foo\\bar"); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, first); } - public void testFoo() throws Exception { + @Test public void testFoo() throws Exception { XtextResource resource = helper.getResourceFromString("foo\\"); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, second); } - public void testBar() throws Exception { + @Test public void testBar() throws Exception { XtextResource resource = helper.getResourceFromString("\\bar"); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, third); } - public void testBackslash() throws Exception { + @Test public void testBackslash() throws Exception { XtextResource resource = helper.getResourceFromString("\\"); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, forth); } - public void testFifth() throws Exception { + @Test public void testFifth() throws Exception { XtextResource resource = helper.getResourceFromString("\"a\""); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, fifth); } - public void testSixth() throws Exception { + @Test public void testSixth() throws Exception { XtextResource resource = helper.getResourceFromString("'b'"); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, sixth); } - public void testSeventh() throws Exception { + @Test public void testSeventh() throws Exception { XtextResource resource = helper.getResourceFromString("'c'"); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, seventh); } - public void testEighth() throws Exception { + @Test public void testEighth() throws Exception { XtextResource resource = helper.getResourceFromString("\"d\""); assertTrue(resource.getErrors().isEmpty()); checkModel(resource, eighth); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java index c0f60289a..561652346 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug292245Test.java @@ -7,8 +7,9 @@ *******************************************************************************/ package org.eclipse.xtext.parser.terminalrules; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -22,42 +23,42 @@ public class Bug292245Test extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug292245TestLanguageStandaloneSetup.class); } - public void testBug292245_01() throws Exception { + @Test public void testBug292245_01() throws Exception { getModel("TICK '"); } - public void testBug292245_02() throws Exception { + @Test public void testBug292245_02() throws Exception { getModel("FIX 'X'"); } - public void testBug292245_03() throws Exception { + @Test public void testBug292245_03() throws Exception { getModel("ERROR 'X'"); } - public void testBug292245_04() throws Exception { + @Test public void testBug292245_04() throws Exception { getModel("TICK ' "); } - public void testBug292245_05() throws Exception { + @Test public void testBug292245_05() throws Exception { getModel("FIX 'X' "); } - public void testBug292245_06() throws Exception { + @Test public void testBug292245_06() throws Exception { getModel("ERROR 'X' "); } - public void testBug292245_07() throws Exception { + @Test public void testBug292245_07() throws Exception { getModel("TICK '\n" + "FIX 'X'\n" + "ERROR 'X'"); } - public void testBug292245_08() throws Exception { + @Test public void testBug292245_08() throws Exception { getModel("TICK ' \n" + "FIX 'X' \n" + "ERROR 'X' "); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java index f971d87a9..550d32cd6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug297105Test.java @@ -7,7 +7,8 @@ *******************************************************************************/ package org.eclipse.xtext.parser.terminalrules; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -15,88 +16,88 @@ import org.eclipse.xtext.junit.AbstractXtextTests; public class Bug297105Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug297105TestLanguageStandaloneSetup.class); } - public void testBug297105_01() throws Exception { + @Test public void testBug297105_01() throws Exception { getModel("1.1 + 2.2"); } - public void testBug297105_02() throws Exception { + @Test public void testBug297105_02() throws Exception { getModel("1.1+2.2"); } - public void testBug297105_03() throws Exception { + @Test public void testBug297105_03() throws Exception { getModel("1.1 + 2.2 "); } - public void testBug297105_04() throws Exception { + @Test public void testBug297105_04() throws Exception { getModel("1.1+2.2 "); } - public void testBug297105_05() throws Exception { + @Test public void testBug297105_05() throws Exception { getModel(".1 + .2"); } - public void testBug297105_06() throws Exception { + @Test public void testBug297105_06() throws Exception { getModel(".1+.2"); } - public void testBug297105_07() throws Exception { + @Test public void testBug297105_07() throws Exception { getModel(".1 + .2 "); } - public void testBug297105_08() throws Exception { + @Test public void testBug297105_08() throws Exception { getModel(".1+.2 "); } - public void testBug297105_09() throws Exception { + @Test public void testBug297105_09() throws Exception { getModel("1.1e+1 + 2.2e-1"); } - public void testBug297105_10() throws Exception { + @Test public void testBug297105_10() throws Exception { getModel("1.1e-1+2.2e+1"); } - public void testBug297105_11() throws Exception { + @Test public void testBug297105_11() throws Exception { getModel("1.1e+1 + 2.2e-1 "); } - public void testBug297105_12() throws Exception { + @Test public void testBug297105_12() throws Exception { getModel("1.1e-1+2.2e+1 "); } - public void testBug297105_13() throws Exception { + @Test public void testBug297105_13() throws Exception { getModel(".1e+1 + .2e-1"); } - public void testBug297105_14() throws Exception { + @Test public void testBug297105_14() throws Exception { getModel(".1e-1+.2e+1"); } - public void testBug297105_15() throws Exception { + @Test public void testBug297105_15() throws Exception { getModel(".1e+1 + .2e-1 "); } - public void testBug297105_16() throws Exception { + @Test public void testBug297105_16() throws Exception { getModel(".1e-1+.2e-1 "); } - public void testBug297105_17() throws Exception { + @Test public void testBug297105_17() throws Exception { getModel("1 + 2"); } - public void testBug297105_18() throws Exception { + @Test public void testBug297105_18() throws Exception { getModel("1+2"); } - public void testBug297105_19() throws Exception { + @Test public void testBug297105_19() throws Exception { getModel("1 + 2 "); } - public void testBug297105_20() throws Exception { + @Test public void testBug297105_20() throws Exception { getModel("1+2 "); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java index dd225840d..e084c50f2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/Bug317840Test.java @@ -7,13 +7,14 @@ *******************************************************************************/ package org.eclipse.xtext.parser.terminalrules; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Element; import org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Model; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,12 +22,12 @@ import org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Model; public class Bug317840Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug317840TestLanguageStandaloneSetup.class); } - public void testCanParse_01() throws Exception { + @Test public void testCanParse_01() throws Exception { getModel("element a"); getModel("element a b"); getModel("element a b c"); @@ -44,7 +45,7 @@ public class Bug317840Test extends AbstractXtextTests { getModel2("element a b c d e f g"); } - public void testCanParse_02() throws Exception { + @Test public void testCanParse_02() throws Exception { getModel("element a.a"); getModel("element a.a b.b"); getModel("element a.a b.b c.c"); @@ -62,7 +63,7 @@ public class Bug317840Test extends AbstractXtextTests { getModel2("element a.a b.b c.c d.d e.e f.f g.g"); } - public void testCanParse_03() throws Exception { + @Test public void testCanParse_03() throws Exception { getModel("element a.a "); getModel("element a.a b.b /* */"); getModel("element a.a b.b c.c /* */ "); @@ -80,7 +81,7 @@ public class Bug317840Test extends AbstractXtextTests { getModel2(" element a.a b.b c.c d.d e.e f.f g.g "); } - public void testCannotParse_01() throws Exception { + @Test public void testCannotParse_01() throws Exception { // getModelAndExpect("element", 1); // getModelAndExpect("element a .a", 1); // getModelAndExpect("element element", 1); @@ -91,7 +92,7 @@ public class Bug317840Test extends AbstractXtextTests { getModelAndExpect("element .a", 1); } - public void testSemanticModel_01() throws Exception { + @Test public void testSemanticModel_01() throws Exception { Element element = getFirstElement("element a"); assertEquals("a", element.getFirst().getName()); assertNull(element.getSecond()); @@ -99,7 +100,7 @@ public class Bug317840Test extends AbstractXtextTests { assertTrue(element.getForth().isEmpty()); } - public void testSemanticModel_02() throws Exception { + @Test public void testSemanticModel_02() throws Exception { Element element = getFirstElement("element a b"); assertEquals("a", element.getFirst().getName()); assertEquals("b", element.getSecond().getName()); @@ -107,7 +108,7 @@ public class Bug317840Test extends AbstractXtextTests { assertTrue(element.getForth().isEmpty()); } - public void testSemanticModel_03() throws Exception { + @Test public void testSemanticModel_03() throws Exception { Element element = getFirstElement("element a b c"); assertEquals("a", element.getFirst().getName()); assertNull(element.getSecond()); @@ -117,7 +118,7 @@ public class Bug317840Test extends AbstractXtextTests { assertEquals("c", element.getForth().get(0).getName()); } - public void testSemanticModel_04() throws Exception { + @Test public void testSemanticModel_04() throws Exception { Element element = getFirstElement("element a b c d"); assertEquals("a", element.getFirst().getName()); assertEquals("b", element.getSecond().getName()); @@ -127,7 +128,7 @@ public class Bug317840Test extends AbstractXtextTests { assertEquals("d", element.getForth().get(0).getName()); } - public void testSemanticModel_05() throws Exception { + @Test public void testSemanticModel_05() throws Exception { Element element = getFirstElement("element a b c d e"); assertEquals("a", element.getFirst().getName()); assertNull(element.getSecond()); @@ -139,7 +140,7 @@ public class Bug317840Test extends AbstractXtextTests { assertEquals("e", element.getForth().get(1).getName()); } - public void testSemanticModel_06() throws Exception { + @Test public void testSemanticModel_06() throws Exception { Element element = getFirstElement("element a.a"); assertEquals("a.a", element.getFirst().getName()); assertNull(element.getSecond()); @@ -147,7 +148,7 @@ public class Bug317840Test extends AbstractXtextTests { assertTrue(element.getForth().isEmpty()); } - public void testSemanticModel_07() throws Exception { + @Test public void testSemanticModel_07() throws Exception { Element element = getFirstElement("element a.a b.b"); assertEquals("a.a", element.getFirst().getName()); assertEquals("b.b", element.getSecond().getName()); @@ -155,7 +156,7 @@ public class Bug317840Test extends AbstractXtextTests { assertTrue(element.getForth().isEmpty()); } - public void testSemanticModel_08() throws Exception { + @Test public void testSemanticModel_08() throws Exception { Element element = getFirstElement("element a.a b.b c.c"); assertEquals("a.a", element.getFirst().getName()); assertNull(element.getSecond()); @@ -165,7 +166,7 @@ public class Bug317840Test extends AbstractXtextTests { assertEquals("c.c", element.getForth().get(0).getName()); } - public void testSemanticModel_09() throws Exception { + @Test public void testSemanticModel_09() throws Exception { Element element = getFirstElement("element a.a b.b c.c d.d"); assertEquals("a.a", element.getFirst().getName()); assertEquals("b.b", element.getSecond().getName()); @@ -175,7 +176,7 @@ public class Bug317840Test extends AbstractXtextTests { assertEquals("d.d", element.getForth().get(0).getName()); } - public void testSemanticModel_10() throws Exception { + @Test public void testSemanticModel_10() throws Exception { Element element = getFirstElement("element a.a b.b c.c d.d e.e"); assertEquals("a.a", element.getFirst().getName()); assertNull(element.getSecond()); @@ -187,91 +188,91 @@ public class Bug317840Test extends AbstractXtextTests { assertEquals("e.e", element.getForth().get(1).getName()); } - public void testNodeModel_01() throws Exception { + @Test public void testNodeModel_01() throws Exception { Element element = getFirstElement("element a"); INode node = NodeModelUtils.getNode(element); assertEquals("element a", node.getText()); assertEquals("[(element)[[( )(a)]]]", toDebugString(node)); } - public void testNodeModel_02() throws Exception { + @Test public void testNodeModel_02() throws Exception { Element element = getFirstElement("element a b"); INode node = NodeModelUtils.getNode(element); assertEquals("element a b", node.getText()); assertEquals("[(element)[[( )(a)]][[( )(b)]]]", toDebugString(node)); } - public void testNodeModel_03() throws Exception { + @Test public void testNodeModel_03() throws Exception { Element element = getFirstElement("element a b c"); INode node = NodeModelUtils.getNode(element); assertEquals("element a b c", node.getText()); assertEquals("[(element)[[( )(a)]][[( )(b)]][[( )(c)]]]", toDebugString(node)); } - public void testNodeModel_04() throws Exception { + @Test public void testNodeModel_04() throws Exception { Element element = getFirstElement("element a b c d"); INode node = NodeModelUtils.getNode(element); assertEquals("element a b c d", node.getText()); assertEquals("[(element)[[( )(a)]][[( )(b)]][[( )(c)]][[( )(d)]]]", toDebugString(node)); } - public void testNodeModel_05() throws Exception { + @Test public void testNodeModel_05() throws Exception { Element element = getFirstElement("element a b c d e"); INode node = NodeModelUtils.getNode(element); assertEquals("element a b c d e", node.getText()); assertEquals("[(element)[[( )(a)]][[( )(b)]][[( )(c)]][[( )(d)]][[( )(e)]]]", toDebugString(node)); } - public void testNodeModel_06() throws Exception { + @Test public void testNodeModel_06() throws Exception { Element element = getFirstElement("element a.a"); INode node = NodeModelUtils.getNode(element); assertEquals("element a.a", node.getText()); assertEquals("[(element)[[( )(a)(.)(a)]]]", toDebugString(node)); } - public void testNodeModel_07() throws Exception { + @Test public void testNodeModel_07() throws Exception { Element element = getFirstElement("element a.a b.b"); INode node = NodeModelUtils.getNode(element); assertEquals("element a.a b.b", node.getText()); assertEquals("[(element)[[( )(a)(.)(a)]][[( )(b)(.)(b)]]]", toDebugString(node)); } - public void testNodeModel_08() throws Exception { + @Test public void testNodeModel_08() throws Exception { Element element = getFirstElement("element a.a b.b c.c"); INode node = NodeModelUtils.getNode(element); assertEquals("element a.a b.b c.c", node.getText()); assertEquals("[(element)[[( )(a)(.)(a)]][[( )(b)(.)(b)]][[( )(c)(.)(c)]]]", toDebugString(node)); } - public void testNodeModel_09() throws Exception { + @Test public void testNodeModel_09() throws Exception { Element element = getFirstElement("element a.a b.b c.c d.d"); INode node = NodeModelUtils.getNode(element); assertEquals("element a.a b.b c.c d.d", node.getText()); assertEquals("[(element)[[( )(a)(.)(a)]][[( )(b)(.)(b)]][[( )(c)(.)(c)]][[( )(d)(.)(d)]]]", toDebugString(node)); } - public void testNodeModel_10() throws Exception { + @Test public void testNodeModel_10() throws Exception { Element element = getFirstElement("element a.a b.b c.c d.d e.e"); INode node = NodeModelUtils.getNode(element); assertEquals("element a.a b.b c.c d.d e.e", node.getText()); assertEquals("[(element)[[( )(a)(.)(a)]][[( )(b)(.)(b)]][[( )(c)(.)(c)]][[( )(d)(.)(d)]][[( )(e)(.)(e)]]]", toDebugString(node)); } - public void testNodeModel_11() throws Exception { + @Test public void testNodeModel_11() throws Exception { Model model = getModel("element a.a "); INode node = NodeModelUtils.getNode(model); assertEquals("element a.a ", node.getText()); assertEquals("[[(element)[[( )(a)(.)(a)]]]( )]", toDebugString(node)); } - public void testNodeModel_12() throws Exception { + @Test public void testNodeModel_12() throws Exception { Model model = getModel(" element a.a /* */"); INode node = NodeModelUtils.getNode(model); assertEquals(" element a.a /* */", node.getText()); assertEquals("[[( )(element)[[( )(a)(.)(a)]]]( )(/* */)]", toDebugString(node)); } - public void testNodeModel_13() throws Exception { + @Test public void testNodeModel_13() throws Exception { Model model = getModel(" element a.a /* */"); INode node = NodeModelUtils.getNode(model); assertEquals(" element a.a /* */", node.getText()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java index f77b3547f..d2335f53f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DefaultTerminalConverterTest.java @@ -9,10 +9,11 @@ package org.eclipse.xtext.parser.terminalrules; import java.util.Date; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.EcoreTerminalsTestLanguageFactory; import org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.Model; import org.eclipse.xtext.serializer.ISerializer; +import org.junit.Test; import com.ibm.icu.text.SimpleDateFormat; @@ -22,12 +23,12 @@ import com.ibm.icu.text.SimpleDateFormat; public class DefaultTerminalConverterTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EcoreTerminalsTestLanguageStandaloneSetup.class); } - public void testSerializeAndReparse() throws Exception { + @Test public void testSerializeAndReparse() throws Exception { int intValue=34786482; double doubleValue=2.32E-17; Date dateValue = new SimpleDateFormat("YYYY-MM-DD").parse("2010-05-25"); @@ -40,7 +41,7 @@ public class DefaultTerminalConverterTest extends AbstractXtextTests { Model reparsedModel = (Model) getModel(modelAsString); assertEquals(intValue, (int) reparsedModel.getIntValues().get(0)); - assertEquals(doubleValue, reparsedModel.getDoubleValues().get(0)); + assertEquals(doubleValue, reparsedModel.getDoubleValues().get(0), 0.00001); assertEquals(dateValue, reparsedModel.getDateValues().get(0)); try { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java index 2d46f70a3..516315223 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/DynamicChannelTest.java @@ -10,9 +10,10 @@ package org.eclipse.xtext.parser.terminalrules; import java.io.StringReader; import java.util.List; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.parser.IParseResult; +import org.junit.Test; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -42,12 +43,12 @@ public class DynamicChannelTest extends AbstractXtextTests { private final String model = "grammar a with b. c\n/* comment \n*/rulename returns \nd: name=ID;"; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextTerminalsTestLanguageStandaloneSetup.class); } - public void testParseSimpleLanguage() throws Exception { + @Test public void testParseSimpleLanguage() throws Exception { IParseResult result = getParser().parse(new StringReader(model)); assertNotNull(result); assertNotNull(result.getRootASTElement()); @@ -57,7 +58,7 @@ public class DynamicChannelTest extends AbstractXtextTests { assertTrue(result.getSyntaxErrors().toString(), Iterables.isEmpty(result.getSyntaxErrors())); } - public void testNodeModelOfSimpleLanguage() throws Exception { + @Test public void testNodeModelOfSimpleLanguage() throws Exception { IParseResult result = getParser().parse(new StringReader(model)); List leafs = Lists.newArrayList(result.getRootNode().getLeafNodes()); assertEquals(23, leafs.size()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java index 5c88f2a77..c31a0549f 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/HiddensTest.java @@ -12,9 +12,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.HiddenTerminalsTestLanguagePackage; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -43,7 +44,7 @@ public class HiddensTest extends AbstractXtextTests { private EStructuralFeature inheritingValid; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(HiddenTerminalsTestLanguageStandaloneSetup.class); EPackage pack = HiddenTerminalsTestLanguagePackage.eINSTANCE; @@ -63,7 +64,7 @@ public class HiddensTest extends AbstractXtextTests { overridingCall = overridingHiddens.getEStructuralFeature("called"); } - public void testSetup() { + @Test public void testSetup() { assertNotNull(withoutHiddens); assertNotNull(withHiddens); assertNotNull(overridingHiddens); @@ -79,7 +80,7 @@ public class HiddensTest extends AbstractXtextTests { assertNotNull(inheritingCall); } - public void testWithoutHiddens_01() throws Exception { + @Test public void testWithoutHiddens_01() throws Exception { String model = "without hiddens ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -89,7 +90,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testWithoutHiddens_02() throws Exception { + @Test public void testWithoutHiddens_02() throws Exception { String model = "without hiddens;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -99,7 +100,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testWithHiddens_01() throws Exception { + @Test public void testWithHiddens_01() throws Exception { String model = "with hiddens ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -109,7 +110,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testWithHiddens_02() throws Exception { + @Test public void testWithHiddens_02() throws Exception { String model = "with/* comment */hiddens;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -119,7 +120,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testOverridingHiddens_01() throws Exception { + @Test public void testOverridingHiddens_01() throws Exception { String model = "overriding hiddens (call;);"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -129,7 +130,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testOverridingHiddens_02() throws Exception { + @Test public void testOverridingHiddens_02() throws Exception { String model = "overriding hiddens ( call ; ) ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -139,7 +140,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testInheritingHiddens_01() throws Exception { + @Test public void testInheritingHiddens_01() throws Exception { String model = "inheriting hiddens (call;);"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -149,7 +150,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testInheritingHiddens_02() throws Exception { + @Test public void testInheritingHiddens_02() throws Exception { String model = "inheriting hiddens ( call /*comment */ ; ) ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -159,7 +160,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testInheritingHiddens_03() throws Exception { + @Test public void testInheritingHiddens_03() throws Exception { String model = "inheriting hiddens ( hiding call; ) ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -169,7 +170,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testInheritingHiddens_04() throws Exception { + @Test public void testInheritingHiddens_04() throws Exception { String model = "inheriting hiddens (/*comment*/hiding call;/*comment*/) ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -179,7 +180,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testDatatypeHiddens_01() throws Exception { + @Test public void testDatatypeHiddens_01() throws Exception { String model = "datatype rule;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -189,7 +190,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testDatatypeHiddens_02() throws Exception { + @Test public void testDatatypeHiddens_02() throws Exception { String model = "datatype rule ;"; Resource res = getResourceFromString(model); assertTrue(res.getErrors().isEmpty()); @@ -199,7 +200,7 @@ public class HiddensTest extends AbstractXtextTests { assertTrue((Boolean) root.eGet(valid)); } - public void testDatatypeHiddens_03() throws Exception { + @Test public void testDatatypeHiddens_03() throws Exception { String model = "datatype rule /* foo */ ;"; Resource res = getResourceFromStringAndExpect(model, 1); assertFalse(res.getErrors().isEmpty()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java index 65f2276ec..9ca306165 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ParserTest.java @@ -11,8 +11,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.TerminalRulesTestLanguagePackage; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -29,7 +30,7 @@ public class ParserTest extends AbstractXtextTests { private EStructuralFeature anyOtherFeature; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(TerminalRulesTestLanguageStandaloneSetup.class); EPackage pack = TerminalRulesTestLanguagePackage.eINSTANCE; @@ -44,7 +45,7 @@ public class ParserTest extends AbstractXtextTests { anyOtherFeature = model.getEStructuralFeature("anyValue"); } - public void testSetup() { + @Test public void testSetup() { EPackage pack = TerminalRulesTestLanguagePackage.eINSTANCE; EClass model = (EClass) pack.getEClassifier("Model"); assertEquals(model.getEStructuralFeatures().size(), getClass().getDeclaredFields().length); @@ -59,127 +60,127 @@ public class ParserTest extends AbstractXtextTests { assertEquals(expected, value); } - public void testId_01() throws Exception { + @Test public void testId_01() throws Exception { doTest("abc", "abc", idFeature); } - public void testId_02() throws Exception { + @Test public void testId_02() throws Exception { doTest("abc", "^abc", idFeature); } - public void testId_03() throws Exception { + @Test public void testId_03() throws Exception { doTest("abc1", "abc1", idFeature); } - public void testId_04() throws Exception { + @Test public void testId_04() throws Exception { doTest("abc1", "^abc1", idFeature); } - public void testInt_01() throws Exception { + @Test public void testInt_01() throws Exception { doTest("0", "0", intFeature); } - public void testInt_02() throws Exception { + @Test public void testInt_02() throws Exception { doTest("111", "111", intFeature); } - public void testString_01() throws Exception { + @Test public void testString_01() throws Exception { doTest("abc", "'abc'", stringFeature); } - public void testString_02() throws Exception { + @Test public void testString_02() throws Exception { doTest("abc", "\"abc\"", stringFeature); } - public void testString_03() throws Exception { + @Test public void testString_03() throws Exception { doTest("ab cd", "'ab cd'", stringFeature); } - public void testString_04() throws Exception { + @Test public void testString_04() throws Exception { doTest("ab\\cd", "'ab\\\\cd'", stringFeature); } - public void testString_05() throws Exception { + @Test public void testString_05() throws Exception { doTest("ab\ncd", "'ab\\ncd'", stringFeature); } - public void testString_06() throws Exception { + @Test public void testString_06() throws Exception { doTest("", "''", stringFeature); } - public void testRichString_01() throws Exception { + @Test public void testRichString_01() throws Exception { doTest("'''abc'''", "'''abc'''", richStringFeature); } - public void testRichString_02() throws Exception { + @Test public void testRichString_02() throws Exception { doTest("'''\n\\'''", "'''\n\\'''", richStringFeature); } - public void testRichString_03() throws Exception { + @Test public void testRichString_03() throws Exception { doTest("'''ab cd'''", "'''ab cd'''", richStringFeature); } - public void testRichString_04() throws Exception { + @Test public void testRichString_04() throws Exception { doTest("'''test''", "'''test''", richStringFeature); } - public void testRichString_05() throws Exception { + @Test public void testRichString_05() throws Exception { doTest("'''test'", "'''test'", richStringFeature); } - public void testRichString_06() throws Exception { + @Test public void testRichString_06() throws Exception { doTest("'''test", "'''test", richStringFeature); } - public void testRichString_07() throws Exception { + @Test public void testRichString_07() throws Exception { doTest("'''", "'''", richStringFeature); } - public void testMlComment_01() throws Exception { + @Test public void testMlComment_01() throws Exception { doTest("/* abc */", "/* abc */", mlCommentFeature); } - public void testMlComment_02() throws Exception { + @Test public void testMlComment_02() throws Exception { doTest("/* ab\nc */", "/* ab\nc */", mlCommentFeature); } - public void testSlComment_01() throws Exception { + @Test public void testSlComment_01() throws Exception { doTest("// abc" , "// abc", slCommentFeature); } - public void testSlComment_02() throws Exception { + @Test public void testSlComment_02() throws Exception { doTest("// abc\n" , "// abc\n", slCommentFeature); } - public void testSlComment_03() throws Exception { + @Test public void testSlComment_03() throws Exception { doTest("// abc\r\n" , "// abc\r\n", slCommentFeature); } - public void testSlComment_04() throws Exception { + @Test public void testSlComment_04() throws Exception { doTest("// abc" , "// abc", slCommentFeature); } - public void testWs_01() throws Exception { + @Test public void testWs_01() throws Exception { doTest(" ", " ", wsFeature); } - public void testWs_02() throws Exception { + @Test public void testWs_02() throws Exception { doTest("\t", "\t", wsFeature); } - public void testWs_03() throws Exception { + @Test public void testWs_03() throws Exception { doTest(" \n ", " \n ", wsFeature); } - public void testAnyOther_01() throws Exception { + @Test public void testAnyOther_01() throws Exception { doTest("'", "'", anyOtherFeature); } - public void testAnyOther_02() throws Exception { + @Test public void testAnyOther_02() throws Exception { doTest(".", ".", anyOtherFeature); } - public void testAnyOther_03() throws Exception { + @Test public void testAnyOther_03() throws Exception { doTest("\b", "\b", anyOtherFeature); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java index 277f5dfbe..fa8ce0cb1 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/UnicodeTest.java @@ -9,13 +9,14 @@ package org.eclipse.xtext.parser.terminalrules; import java.io.ByteArrayOutputStream; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.terminalrules.unicode.AbstractString; import org.eclipse.xtext.parser.terminalrules.unicode.GString; import org.eclipse.xtext.parser.terminalrules.unicode.Model; import org.eclipse.xtext.parser.terminalrules.unicode.QuotedString; import org.eclipse.xtext.parser.terminalrules.unicode.UnicodeFactory; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -27,12 +28,12 @@ public class UnicodeTest extends AbstractXtextTests { private static final String MIXED_UMLAUTS = "\u00c4\\u00d6\u00dc"; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(UnicodeTestLanguageStandaloneSetup.class); } - public void testParse() throws Exception { + @Test public void testParse() throws Exception { XtextResource resource = getResource(UMLAUTS, "test.mydsl"); Model model = (Model) resource.getContents().get(0); for(AbstractString s: model.getStrings()) { @@ -40,7 +41,7 @@ public class UnicodeTest extends AbstractXtextTests { } } - public void testParseSTRING() throws Exception { + @Test public void testParseSTRING() throws Exception { XtextResource resource = getResource("'" + UMLAUTS + "' '" + QUOTED_UMLAUTS + "' '" + MIXED_UMLAUTS +"'", "test.mydsl"); Model model = (Model) resource.getContents().get(0); for(AbstractString s: model.getStrings()) { @@ -49,7 +50,7 @@ public class UnicodeTest extends AbstractXtextTests { } - public void testWrite() throws Exception { + @Test public void testWrite() throws Exception { XtextResource resource = getResource("", "test.mydsl"); Model model = UnicodeFactory.eINSTANCE.createModel(); resource.getContents().add(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java index 3075e56cf..7143d5ba2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/ValueConverterForTerminalFragmentsTest.java @@ -11,8 +11,9 @@ import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.conversion.ValueConverter; import org.eclipse.xtext.conversion.impl.AbstractNullSafeConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.INode; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -20,12 +21,12 @@ import org.eclipse.xtext.nodemodel.INode; public class ValueConverterForTerminalFragmentsTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(TerminalRulesTestLanguageStandaloneSetup.class); } - public void testExceptionWhenRegistered() { + @Test public void testExceptionWhenRegistered() { IValueConverterService converters = get(ConverterForFragment.class); try { converters.toValue("foo", "STRING", null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java index b552155ae..8627559d0 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745ParserTest.java @@ -7,8 +7,9 @@ *******************************************************************************/ package org.eclipse.xtext.parser.unorderedGroups; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,43 +22,43 @@ public abstract class AbstractBacktrackingBug325745ParserTest extends AbstractXt return false; } - public void testValid_01() throws Exception { + @Test public void testValid_01() throws Exception { getModel("foo '+' 1 c."); } - public void testValid_02() throws Exception { + @Test public void testValid_02() throws Exception { getModel("foo 1 1c."); } - public void testValid_03() throws Exception { + @Test public void testValid_03() throws Exception { getModel("foo [ 1c."); } - public void testValid_04() throws Exception { + @Test public void testValid_04() throws Exception { getModel("foo '-' 1c ]."); } - public void testValid_05() throws Exception { + @Test public void testValid_05() throws Exception { getModel("foo '-' [ 1c ]."); } - public void testValid_06() throws Exception { + @Test public void testValid_06() throws Exception { getModel("foo [ '-' 1c ]."); } - public void testValid_07() throws Exception { + @Test public void testValid_07() throws Exception { getModel("foo 1!c 'a' ]."); } - public void testValid_08() throws Exception { + @Test public void testValid_08() throws Exception { getModel("foo 1*c 'a'."); } - public void testValid_09() throws Exception { + @Test public void testValid_09() throws Exception { getModel("foo 1*!c ] 'a'."); } - public void testValid_10() throws Exception { + @Test public void testValid_10() throws Exception { getModel("foo 1!.bar 2*c ] 'a'."); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java index cd34f7a76..530ddc6bb 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingParserTest.java @@ -7,18 +7,19 @@ *******************************************************************************/ package org.eclipse.xtext.parser.unorderedGroups; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public abstract class AbstractBacktrackingParserTest extends AbstractXtextTests { - public void testNoException_01() throws Exception { + @Test public void testNoException_01() throws Exception { getModel("unit { provides : unit { name : FooBar; }; }"); } - public void testException_01() throws Exception { + @Test public void testException_01() throws Exception { getModelAndExpect("unit { provides : unit { name : FooBar }; }", /* usually expect 1 error (missing ;), but got a second due to backtracking */ 2); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java index 40060fbe3..e61025864 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/AbstractParserTest.java @@ -9,77 +9,65 @@ package org.eclipse.xtext.parser.unorderedGroups; import java.util.List; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.Model; import org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.NestedModel; -import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public abstract class AbstractParserTest extends AbstractXtextTests { - @Override - protected boolean shouldTestSerializer(XtextResource resource) { - // for these cases, the ConcreteSyntaxValidator returns false positives. - if ("testParse_3".equals(getName())) - return false; - if ("testParse_10".equals(getName())) - return false; - if ("testParse_11".equals(getName())) - return false; - return true; - } - - public void testParse_1_A_B() throws Exception { + @Test public void testParse_1_A_B() throws Exception { Model model = (Model) getModel("1 a b"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_1_B_A() throws Exception { + @Test public void testParse_1_B_A() throws Exception { Model model = (Model) getModel("1 b a"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_2_A_B_C_D() throws Exception { + @Test public void testParse_2_A_B_C_D() throws Exception { internalTest_2("a b c d"); } - public void testParse_2_A_B_D_C() throws Exception { + @Test public void testParse_2_A_B_D_C() throws Exception { internalTest_2("a b d c"); } - public void testParse_2_A_C_B_D() throws Exception { + @Test public void testParse_2_A_C_B_D() throws Exception { internalTest_2("a c b d"); } - public void testParse_2_A_C_D_B() throws Exception { + @Test public void testParse_2_A_C_D_B() throws Exception { internalTest_2("a c d b"); } - public void testParse_2_A_D_B_C() throws Exception { + @Test public void testParse_2_A_D_B_C() throws Exception { internalTest_2("a d b c"); } - public void testParse_2_A_D_C_B() throws Exception { + @Test public void testParse_2_A_D_C_B() throws Exception { internalTest_2("a d c b"); } - public void testParse_2_A_A_C_B_D() throws Exception { + @Test public void testParse_2_A_A_C_B_D() throws Exception { internalTest_2("a a c b d", 1); } - public void testParse_2_A_C_A_B_D() throws Exception { + @Test public void testParse_2_A_C_A_B_D() throws Exception { internalTest_2("a c a b d", 1); } - public void testParse_2_A_C_B_A_D() throws Exception { + @Test public void testParse_2_A_C_B_A_D() throws Exception { internalTest_2("a c b a d", 1); } - public void testParse_2_A_C_B_D_A() throws Exception { + @Test public void testParse_2_A_C_B_D_A() throws Exception { internalTest_2("a c b d a", 1); } @@ -97,503 +85,506 @@ public abstract class AbstractParserTest extends AbstractXtextTests { } } - public void testParse_3_A_B() throws Exception { + @Test public void testParse_3_A_B() throws Exception { Model model = (Model) getModel("3 a b"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_3_B_A() throws Exception { + @Test public void testParse_3_B_A() throws Exception { Model model = (Model) getModel("3 b a"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_3_A() throws Exception { + @Test public void testParse_3_A() throws Exception { Model model = (Model) getModel("3 a"); assertTrue(model.isFirst()); assertFalse(model.isSecond()); } - public void testParse_3_B() throws Exception { + @Test public void testParse_3_B() throws Exception { Model model = (Model) getModel("3 b"); assertFalse(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_3() throws Exception { + @Test public void testParse_3() throws Exception { + disableSerializerTest(); Model model = (Model) getModel("3"); assertFalse(model.isFirst()); assertFalse(model.isSecond()); } - public void testParse_4_A_B() throws Exception { + @Test public void testParse_4_A_B() throws Exception { Model model = (Model) getModel("4 a b"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_4_B_A() throws Exception { + @Test public void testParse_4_B_A() throws Exception { Model model = (Model) getModel("4 b a"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_4_A() throws Exception { + @Test public void testParse_4_A() throws Exception { Model model = (Model) getModel("4 a"); assertTrue(model.isFirst()); assertFalse(model.isSecond()); } - public void testParse_4_B() throws Exception { + @Test public void testParse_4_B() throws Exception { getModelAndExpect("4 b", 1); } - public void testParse_4() throws Exception { + @Test public void testParse_4() throws Exception { getModelAndExpect("4", 1); } - public void testParse_5_A_B() throws Exception { + @Test public void testParse_5_A_B() throws Exception { Model model = (Model) getModel("5 a b"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_5_B_A() throws Exception { + @Test public void testParse_5_B_A() throws Exception { Model model = (Model) getModel("5 b a"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_5_A() throws Exception { + @Test public void testParse_5_A() throws Exception { getModelAndExpect("5 a", 1); } - public void testParse_5_B() throws Exception { + @Test public void testParse_5_B() throws Exception { Model model = (Model) getModel("5 b"); assertFalse(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_5() throws Exception { + @Test public void testParse_5() throws Exception { getModelAndExpect("5", 1); } - public void testParse_6_A_B() throws Exception { + @Test public void testParse_6_A_B() throws Exception { Model model = (Model) getModel("6 a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_6_B_A() throws Exception { + @Test public void testParse_6_B_A() throws Exception { Model model = (Model) getModel("6 b a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_6_A_A_B_B() throws Exception { + @Test public void testParse_6_A_A_B_B() throws Exception { Model model = (Model) getModel("6 a a b b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_6_B_B_A_A() throws Exception { + @Test public void testParse_6_B_B_A_A() throws Exception { Model model = (Model) getModel("6 b b a a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_6_A() throws Exception { + @Test public void testParse_6_A() throws Exception { Model model = (Model) getModel("6 a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(0, model.getSecondAsList().size()); } - public void testParse_6_A_A() throws Exception { + @Test public void testParse_6_A_A() throws Exception { Model model = (Model) getModel("6 a a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(0, model.getSecondAsList().size()); } - public void testParse_6_B() throws Exception { + @Test public void testParse_6_B() throws Exception { getModelAndExpect("6 b", 1); } - public void testParse_6_B_B() throws Exception { + @Test public void testParse_6_B_B() throws Exception { getModelAndExpect("6 b b", 1); } - public void testParse_6() throws Exception { + @Test public void testParse_6() throws Exception { getModelAndExpect("6", 1); } - public void testParse_7_A_B() throws Exception { + @Test public void testParse_7_A_B() throws Exception { Model model = (Model) getModel("7 a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_7_B_A() throws Exception { + @Test public void testParse_7_B_A() throws Exception { Model model = (Model) getModel("7 b a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_7_A_A_B_B() throws Exception { + @Test public void testParse_7_A_A_B_B() throws Exception { Model model = (Model) getModel("7 a a b b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_7_B_B_A_A() throws Exception { + @Test public void testParse_7_B_B_A_A() throws Exception { Model model = (Model) getModel("7 b b a a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_7_A() throws Exception { + @Test public void testParse_7_A() throws Exception { getModelAndExpect("7 a", 1); } - public void testParse_7_A_A() throws Exception { + @Test public void testParse_7_A_A() throws Exception { getModelAndExpect("7 a a", 1); } - public void testParse_7_B() throws Exception { + @Test public void testParse_7_B() throws Exception { Model model = (Model) getModel("7 b"); assertEquals(0, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_7_B_B() throws Exception { + @Test public void testParse_7_B_B() throws Exception { Model model = (Model) getModel("7 b b"); assertEquals(0, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_7() throws Exception { + @Test public void testParse_7() throws Exception { getModelAndExpect("7", 1); } - public void testParse_8_A_B_C_A_B_D() throws Exception { + @Test public void testParse_8_A_B_C_A_B_D() throws Exception { Model model = (Model) getModel("8 a b c a b d"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_8_A_B_D_A_B_C() throws Exception { + @Test public void testParse_8_A_B_D_A_B_C() throws Exception { Model model = (Model) getModel("8 a b d a b c"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_9_A_B() throws Exception { + @Test public void testParse_9_A_B() throws Exception { Model model = (Model) getModel("9 a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_9_B_A() throws Exception { + @Test public void testParse_9_B_A() throws Exception { Model model = (Model) getModel("9 b a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_9_A_B_A_B() throws Exception { + @Test public void testParse_9_A_B_A_B() throws Exception { Model model = (Model) getModel("9 a b a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_9_A_B_B_A() throws Exception { + @Test public void testParse_9_A_B_B_A() throws Exception { Model model = (Model) getModel("9 a b b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_9_B_A_A_B() throws Exception { + @Test public void testParse_9_B_A_A_B() throws Exception { Model model = (Model) getModel("9 b a a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_9_B_A_B_A() throws Exception { + @Test public void testParse_9_B_A_B_A() throws Exception { Model model = (Model) getModel("9 b a b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_9() throws Exception { + @Test public void testParse_9() throws Exception { getModelAndExpect("9", 1); } - public void testParse_9_A() throws Exception { + @Test public void testParse_9_A() throws Exception { getModelAndExpect("9 a", 1); } - public void testParse_9_B() throws Exception { + @Test public void testParse_9_B() throws Exception { getModelAndExpect("9 b", 1); } - public void testParse_9_A_B_A() throws Exception { + @Test public void testParse_9_A_B_A() throws Exception { getModelAndExpect("9 a b a", 1); } - public void testParse_9_A_B_B() throws Exception { + @Test public void testParse_9_A_B_B() throws Exception { getModelAndExpect("9 a b b", 1); } - public void testParse_9_B_A_A() throws Exception { + @Test public void testParse_9_B_A_A() throws Exception { getModelAndExpect("9 b a a", 1); } - public void testParse_9_B_A_B() throws Exception { + @Test public void testParse_9_B_A_B() throws Exception { getModelAndExpect("9 b a b", 1); } - public void testParse_10_A_B() throws Exception { + @Test public void testParse_10_A_B() throws Exception { Model model = (Model) getModel("10 a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_10_B_A() throws Exception { + @Test public void testParse_10_B_A() throws Exception { Model model = (Model) getModel("10 b a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_10_A_B_A_B() throws Exception { + @Test public void testParse_10_A_B_A_B() throws Exception { Model model = (Model) getModel("10 a b a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_10_A_B_B_A() throws Exception { + @Test public void testParse_10_A_B_B_A() throws Exception { Model model = (Model) getModel("10 a b b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_10_B_A_A_B() throws Exception { + @Test public void testParse_10_B_A_A_B() throws Exception { Model model = (Model) getModel("10 b a a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_10_B_A_B_A() throws Exception { + @Test public void testParse_10_B_A_B_A() throws Exception { Model model = (Model) getModel("10 b a b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_10() throws Exception { + @Test public void testParse_10() throws Exception { + disableSerializerTest(); Model model = (Model) getModel("10"); assertEquals(0, model.getFirstAsList().size()); assertEquals(0, model.getSecondAsList().size()); } - public void testParse_10_A() throws Exception { + @Test public void testParse_10_A() throws Exception { getModelAndExpect("10 a", 1); } - public void testParse_10_B() throws Exception { + @Test public void testParse_10_B() throws Exception { getModelAndExpect("10 b", 1); } - public void testParse_10_A_B_A() throws Exception { + @Test public void testParse_10_A_B_A() throws Exception { getModelAndExpect("10 a b a", 1); } - public void testParse_10_A_B_B() throws Exception { + @Test public void testParse_10_A_B_B() throws Exception { getModelAndExpect("10 a b b", 1); } - public void testParse_10_B_A_A() throws Exception { + @Test public void testParse_10_B_A_A() throws Exception { getModelAndExpect("10 b a a", 1); } - public void testParse_10_B_A_B() throws Exception { + @Test public void testParse_10_B_A_B() throws Exception { getModelAndExpect("10 b a b", 1); } - public void testParse_11_A_B() throws Exception { + @Test public void testParse_11_A_B() throws Exception { Model model = (Model) getModel("11 a b"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_11_B_A() throws Exception { + @Test public void testParse_11_B_A() throws Exception { Model model = (Model) getModel("11 b a"); assertTrue(model.isFirst()); assertTrue(model.isSecond()); } - public void testParse_11() throws Exception { + @Test public void testParse_11() throws Exception { + disableSerializerTest(); Model model = (Model) getModel("11"); assertFalse(model.isFirst()); assertFalse(model.isSecond()); } - public void testParse_11_A() throws Exception { + @Test public void testParse_11_A() throws Exception { getModelAndExpect("11 a", 1); } - public void testParse_11_B() throws Exception { + @Test public void testParse_11_B() throws Exception { getModelAndExpect("11 b", 1); } - public void testParse_11_A_B_A() throws Exception { + @Test public void testParse_11_A_B_A() throws Exception { getModelAndExpect("11 a b a", 1); } - public void testParse_11_A_B_B() throws Exception { + @Test public void testParse_11_A_B_B() throws Exception { getModelAndExpect("11 a b b", 1); } - public void testParse_11_B_A_A() throws Exception { + @Test public void testParse_11_B_A_A() throws Exception { getModelAndExpect("11 b a a", 1); } - public void testParse_11_B_A_B() throws Exception { + @Test public void testParse_11_B_A_B() throws Exception { getModelAndExpect("11 b a b", 1); } - public void testParse_12_A_B_A_B() throws Exception { + @Test public void testParse_12_A_B_A_B() throws Exception { Model model = (Model) getModel("12 a b a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_12_A_B_B_A() throws Exception { + @Test public void testParse_12_A_B_B_A() throws Exception { Model model = (Model) getModel("12 a b b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_12_B_A_A_B() throws Exception { + @Test public void testParse_12_B_A_A_B() throws Exception { Model model = (Model) getModel("12 b a a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_12_B_A_B_A() throws Exception { + @Test public void testParse_12_B_A_B_A() throws Exception { Model model = (Model) getModel("12 b a b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_12() throws Exception { + @Test public void testParse_12() throws Exception { getModelAndExpect("12", 1); } - public void testParse_12_A() throws Exception { + @Test public void testParse_12_A() throws Exception { getModelAndExpect("12 a", 1); } - public void testParse_12_B() throws Exception { + @Test public void testParse_12_B() throws Exception { getModelAndExpect("12 b", 1); } - public void testParse_12_A_B() throws Exception { + @Test public void testParse_12_A_B() throws Exception { getModelAndExpect("12 a b", 1); } - public void testParse_12_B_A() throws Exception { + @Test public void testParse_12_B_A() throws Exception { getModelAndExpect("12 b a", 1); } - public void testParse_12_A_A() throws Exception { + @Test public void testParse_12_A_A() throws Exception { getModelAndExpect("12 a a", 1); } - public void testParse_12_B_B() throws Exception { + @Test public void testParse_12_B_B() throws Exception { getModelAndExpect("12 b b", 1); } - public void testParse_12_A_B_A() throws Exception { + @Test public void testParse_12_A_B_A() throws Exception { getModelAndExpect("12 a b a", 1); } - public void testParse_12_A_B_B() throws Exception { + @Test public void testParse_12_A_B_B() throws Exception { getModelAndExpect("12 a b b", 1); } - public void testParse_12_B_A_A() throws Exception { + @Test public void testParse_12_B_A_A() throws Exception { getModelAndExpect("12 b a a", 1); } - public void testParse_12_B_A_B() throws Exception { + @Test public void testParse_12_B_A_B() throws Exception { getModelAndExpect("12 b a b", 1); } - public void testParse_13_A_B_A_B() throws Exception { + @Test public void testParse_13_A_B_A_B() throws Exception { Model model = (Model) getModel("13 a b a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_13_B_A_A_B() throws Exception { + @Test public void testParse_13_B_A_A_B() throws Exception { Model model = (Model) getModel("13 b a a b"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); } - public void testParse_13_A_B() throws Exception { + @Test public void testParse_13_A_B() throws Exception { Model model = (Model) getModel("13 a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); } - public void testParse_13_B_A_B_A() throws Exception { + @Test public void testParse_13_B_A_B_A() throws Exception { getModelAndExpect("13 b a b a", 2); } - public void testParse_13_A_B_B_A() throws Exception { + @Test public void testParse_13_A_B_B_A() throws Exception { getModelAndExpect("13 a b b a", 2); } - public void testParse_13() throws Exception { + @Test public void testParse_13() throws Exception { getModelAndExpect("13", 1); } - public void testParse_13_A() throws Exception { + @Test public void testParse_13_A() throws Exception { getModelAndExpect("13 a", 1); } - public void testParse_13_B() throws Exception { + @Test public void testParse_13_B() throws Exception { getModelAndExpect("13 b", 1); } - public void testParse_13_B_A() throws Exception { + @Test public void testParse_13_B_A() throws Exception { getModelAndExpect("13 b a", 1); } - public void testParse_13_A_A() throws Exception { + @Test public void testParse_13_A_A() throws Exception { getModelAndExpect("13 a a", 1); } - public void testParse_13_B_B() throws Exception { + @Test public void testParse_13_B_B() throws Exception { getModelAndExpect("13 b b", 1); } - public void testParse_13_A_B_A() throws Exception { + @Test public void testParse_13_A_B_A() throws Exception { getModelAndExpect("13 a b a", 1); } - public void testParse_13_A_B_B() throws Exception { + @Test public void testParse_13_A_B_B() throws Exception { getModelAndExpect("13 a b b", 1); } - public void testParse_13_B_A_A() throws Exception { + @Test public void testParse_13_B_A_A() throws Exception { getModelAndExpect("13 b a a", 1); } - public void testParse_13_B_A_B() throws Exception { + @Test public void testParse_13_B_A_B() throws Exception { getModelAndExpect("13 b a b", 1); } - public void testParse_14_A_B_C_D() throws Exception { + @Test public void testParse_14_A_B_C_D() throws Exception { Model model = (Model) getModel("14 a b c d"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -601,7 +592,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_A_B_D_C() throws Exception { + @Test public void testParse_14_A_B_D_C() throws Exception { Model model = (Model) getModel("14 a b d c"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -609,7 +600,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_B_A_C_D() throws Exception { + @Test public void testParse_14_B_A_C_D() throws Exception { Model model = (Model) getModel("14 b a c d"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -617,7 +608,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_B_A_D_C() throws Exception { + @Test public void testParse_14_B_A_D_C() throws Exception { Model model = (Model) getModel("14 b a d c"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -625,7 +616,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_C_D_A_B() throws Exception { + @Test public void testParse_14_C_D_A_B() throws Exception { Model model = (Model) getModel("14 c d a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -633,7 +624,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_D_C_A_B() throws Exception { + @Test public void testParse_14_D_C_A_B() throws Exception { Model model = (Model) getModel("14 d c a b"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -641,7 +632,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_C_D_B_A() throws Exception { + @Test public void testParse_14_C_D_B_A() throws Exception { Model model = (Model) getModel("14 c d b a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -649,7 +640,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_D_C_B_A() throws Exception { + @Test public void testParse_14_D_C_B_A() throws Exception { Model model = (Model) getModel("14 d c b a"); assertEquals(1, model.getFirstAsList().size()); assertEquals(1, model.getSecondAsList().size()); @@ -657,7 +648,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(1, model.getForthAsList().size()); } - public void testParse_14_A_B_C_D_D_C_B_A() throws Exception { + @Test public void testParse_14_A_B_C_D_D_C_B_A() throws Exception { Model model = (Model) getModel("14 a b c d d c b a"); assertEquals(2, model.getFirstAsList().size()); assertEquals(2, model.getSecondAsList().size()); @@ -665,7 +656,7 @@ public abstract class AbstractParserTest extends AbstractXtextTests { assertEquals(2, model.getForthAsList().size()); } - public void testParse_14_A_B_C_D_D_C_B_A_B_A_C_D() throws Exception { + @Test public void testParse_14_A_B_C_D_D_C_B_A_B_A_C_D() throws Exception { Model model = (Model) getModel("14 a b c d d c b a b a c d"); assertEquals(3, model.getFirstAsList().size()); assertEquals(3, model.getSecondAsList().size()); @@ -687,515 +678,515 @@ public abstract class AbstractParserTest extends AbstractXtextTests { getModelAndExpect("datatypes 2 " + input, expectedErrors); } - public void testDatatype_1_A_B() throws Exception { + @Test public void testDatatype_1_A_B() throws Exception { internalTestDatatypes("1 a b"); } - public void testDatatype_1_B_A() throws Exception { + @Test public void testDatatype_1_B_A() throws Exception { internalTestDatatypes("1 b a"); } - public void testDatatype_2_A_B_C_D() throws Exception { + @Test public void testDatatype_2_A_B_C_D() throws Exception { internalTestDatatypes_2("a b c d"); } - public void testDatatype_2_A_B_D_C() throws Exception { + @Test public void testDatatype_2_A_B_D_C() throws Exception { internalTestDatatypes_2("a b d c"); } - public void testDatatype_2_A_C_B_D() throws Exception { + @Test public void testDatatype_2_A_C_B_D() throws Exception { internalTestDatatypes_2("a c b d"); } - public void testDatatype_2_A_C_D_B() throws Exception { + @Test public void testDatatype_2_A_C_D_B() throws Exception { internalTestDatatypes_2("a c d b"); } - public void testDatatype_2_A_D_B_C() throws Exception { + @Test public void testDatatype_2_A_D_B_C() throws Exception { internalTestDatatypes_2("a d b c"); } - public void testDatatype_2_A_D_C_B() throws Exception { + @Test public void testDatatype_2_A_D_C_B() throws Exception { internalTestDatatypes_2("a d c b"); } - public void testDatatype_2_A_A_C_B_D() throws Exception { + @Test public void testDatatype_2_A_A_C_B_D() throws Exception { internalTestDatatypes_2("a a c b d", 1); } - public void testDatatype_2_A_C_A_B_D() throws Exception { + @Test public void testDatatype_2_A_C_A_B_D() throws Exception { internalTestDatatypes_2("a c a b d", 1); } - public void testDatatype_2_A_C_B_A_D() throws Exception { + @Test public void testDatatype_2_A_C_B_A_D() throws Exception { internalTestDatatypes_2("a c b a d", 1); } - public void testDatatype_2_A_C_B_D_A() throws Exception { + @Test public void testDatatype_2_A_C_B_D_A() throws Exception { internalTestDatatypes_2("a c b d a", 1); } - public void testDatatype_3_A_B() throws Exception { + @Test public void testDatatype_3_A_B() throws Exception { internalTestDatatypes("3 a b"); } - public void testDatatype_3_B_A() throws Exception { + @Test public void testDatatype_3_B_A() throws Exception { internalTestDatatypes("3 b a"); } - public void testDatatype_3_A() throws Exception { + @Test public void testDatatype_3_A() throws Exception { internalTestDatatypes("3 a"); } - public void testDatatype_3_B() throws Exception { + @Test public void testDatatype_3_B() throws Exception { internalTestDatatypes("3 b"); } - public void testDatatype_3() throws Exception { + @Test public void testDatatype_3() throws Exception { internalTestDatatypes("3"); } - public void testDatatype_4_A_B() throws Exception { + @Test public void testDatatype_4_A_B() throws Exception { internalTestDatatypes("4 a b"); } - public void testDatatype_4_B_A() throws Exception { + @Test public void testDatatype_4_B_A() throws Exception { internalTestDatatypes("4 b a"); } - public void testDatatype_4_A() throws Exception { + @Test public void testDatatype_4_A() throws Exception { internalTestDatatypes("4 a"); } - public void testDatatype_4_B() throws Exception { + @Test public void testDatatype_4_B() throws Exception { getModelAndExpect("datatypes 4 b", 1); } - public void testDatatype_4() throws Exception { + @Test public void testDatatype_4() throws Exception { getModelAndExpect("datatypes 4", 1); } - public void testDatatype_5_A_B() throws Exception { + @Test public void testDatatype_5_A_B() throws Exception { internalTestDatatypes("5 a b"); } - public void testDatatype_5_B_A() throws Exception { + @Test public void testDatatype_5_B_A() throws Exception { internalTestDatatypes("5 b a"); } - public void testDatatype_5_A() throws Exception { + @Test public void testDatatype_5_A() throws Exception { getModelAndExpect("datatypes 5 a", 1); } - public void testDatatype_5_B() throws Exception { + @Test public void testDatatype_5_B() throws Exception { internalTestDatatypes("5 b"); } - public void testDatatype_5() throws Exception { + @Test public void testDatatype_5() throws Exception { getModelAndExpect("datatypes 5", 1); } - public void testDatatype_6_A_B() throws Exception { + @Test public void testDatatype_6_A_B() throws Exception { internalTestDatatypes("6 a b"); } - public void testDatatype_6_B_A() throws Exception { + @Test public void testDatatype_6_B_A() throws Exception { internalTestDatatypes("6 b a"); } - public void testDatatype_6_A_A_B_B() throws Exception { + @Test public void testDatatype_6_A_A_B_B() throws Exception { internalTestDatatypes("6 a a b b"); } - public void testDatatype_6_B_B_A_A() throws Exception { + @Test public void testDatatype_6_B_B_A_A() throws Exception { internalTestDatatypes("6 b b a a"); } - public void testDatatype_6_A() throws Exception { + @Test public void testDatatype_6_A() throws Exception { internalTestDatatypes("6 a"); } - public void testDatatype_6_A_A() throws Exception { + @Test public void testDatatype_6_A_A() throws Exception { internalTestDatatypes("6 a a"); } - public void testDatatype_6_B() throws Exception { + @Test public void testDatatype_6_B() throws Exception { getModelAndExpect("datatypes 6 b", 1); } - public void testDatatype_6_B_B() throws Exception { + @Test public void testDatatype_6_B_B() throws Exception { getModelAndExpect("datatypes 6 b b", 1); } - public void testDatatype_6() throws Exception { + @Test public void testDatatype_6() throws Exception { getModelAndExpect("datatypes 6", 1); } - public void testDatatype_7_A_B() throws Exception { + @Test public void testDatatype_7_A_B() throws Exception { internalTestDatatypes("7 a b"); } - public void testDatatype_7_B_A() throws Exception { + @Test public void testDatatype_7_B_A() throws Exception { internalTestDatatypes("7 b a"); } - public void testDatatype_7_A_A_B_B() throws Exception { + @Test public void testDatatype_7_A_A_B_B() throws Exception { internalTestDatatypes("7 a a b b"); } - public void testDatatype_7_B_B_A_A() throws Exception { + @Test public void testDatatype_7_B_B_A_A() throws Exception { internalTestDatatypes("7 b b a a"); } - public void testDatatype_7_A() throws Exception { + @Test public void testDatatype_7_A() throws Exception { getModelAndExpect("datatypes 7 a", 1); } - public void testDatatype_7_A_A() throws Exception { + @Test public void testDatatype_7_A_A() throws Exception { getModelAndExpect("datatypes 7 a a", 1); } - public void testDatatype_7_B() throws Exception { + @Test public void testDatatype_7_B() throws Exception { internalTestDatatypes("7 b"); } - public void testDatatype_7_B_B() throws Exception { + @Test public void testDatatype_7_B_B() throws Exception { internalTestDatatypes("7 b b"); } - public void testDatatype_7() throws Exception { + @Test public void testDatatype_7() throws Exception { getModelAndExpect("datatypes 7", 1); } - public void testDatatype_8_A_B_C_A_B_D() throws Exception { + @Test public void testDatatype_8_A_B_C_A_B_D() throws Exception { internalTestDatatypes("8 a b c a b d"); } - public void testDatatype_8_A_B_D_A_B_C() throws Exception { + @Test public void testDatatype_8_A_B_D_A_B_C() throws Exception { internalTestDatatypes("8 a b d a b c"); } - public void testDatatype_9_A_B() throws Exception { + @Test public void testDatatype_9_A_B() throws Exception { internalTestDatatypes("9 a b"); } - public void testDatatype_9_B_A() throws Exception { + @Test public void testDatatype_9_B_A() throws Exception { internalTestDatatypes("9 b a"); } - public void testDatatype_9_A_B_A_B() throws Exception { + @Test public void testDatatype_9_A_B_A_B() throws Exception { internalTestDatatypes("9 a b a b"); } - public void testDatatype_9_A_B_B_A() throws Exception { + @Test public void testDatatype_9_A_B_B_A() throws Exception { internalTestDatatypes("9 a b b a"); } - public void testDatatype_9_B_A_A_B() throws Exception { + @Test public void testDatatype_9_B_A_A_B() throws Exception { internalTestDatatypes("9 b a a b"); } - public void testDatatype_9_B_A_B_A() throws Exception { + @Test public void testDatatype_9_B_A_B_A() throws Exception { internalTestDatatypes("9 b a b a"); } - public void testDatatype_9() throws Exception { + @Test public void testDatatype_9() throws Exception { getModelAndExpect("datatypes 9", 1); } - public void testDatatype_9_A() throws Exception { + @Test public void testDatatype_9_A() throws Exception { getModelAndExpect("datatypes 9 a", 1); } - public void testDatatype_9_B() throws Exception { + @Test public void testDatatype_9_B() throws Exception { getModelAndExpect("datatypes 9 b", 1); } - public void testDatatype_9_A_B_A() throws Exception { + @Test public void testDatatype_9_A_B_A() throws Exception { getModelAndExpect("datatypes 9 a b a", 1); } - public void testDatatype_9_A_B_B() throws Exception { + @Test public void testDatatype_9_A_B_B() throws Exception { getModelAndExpect("datatypes 9 a b b", 1); } - public void testDatatype_9_B_A_A() throws Exception { + @Test public void testDatatype_9_B_A_A() throws Exception { getModelAndExpect("datatypes 9 b a a", 1); } - public void testDatatype_9_B_A_B() throws Exception { + @Test public void testDatatype_9_B_A_B() throws Exception { getModelAndExpect("datatypes 9 b a b", 1); } - public void testDatatype_10_A_B() throws Exception { + @Test public void testDatatype_10_A_B() throws Exception { internalTestDatatypes("10 a b"); } - public void testDatatype_10_B_A() throws Exception { + @Test public void testDatatype_10_B_A() throws Exception { internalTestDatatypes("10 b a"); } - public void testDatatype_10_A_B_A_B() throws Exception { + @Test public void testDatatype_10_A_B_A_B() throws Exception { internalTestDatatypes("10 a b a b"); } - public void testDatatype_10_A_B_B_A() throws Exception { + @Test public void testDatatype_10_A_B_B_A() throws Exception { internalTestDatatypes("10 a b b a"); } - public void testDatatype_10_B_A_A_B() throws Exception { + @Test public void testDatatype_10_B_A_A_B() throws Exception { internalTestDatatypes("10 b a a b"); } - public void testDatatype_10_B_A_B_A() throws Exception { + @Test public void testDatatype_10_B_A_B_A() throws Exception { internalTestDatatypes("10 b a b a"); } - public void testDatatype_10() throws Exception { + @Test public void testDatatype_10() throws Exception { internalTestDatatypes("10"); } - public void testDatatype_10_A() throws Exception { + @Test public void testDatatype_10_A() throws Exception { getModelAndExpect("datatypes 10 a", 1); } - public void testDatatype_10_B() throws Exception { + @Test public void testDatatype_10_B() throws Exception { getModelAndExpect("datatypes 10 b", 1); } - public void testDatatype_10_A_B_A() throws Exception { + @Test public void testDatatype_10_A_B_A() throws Exception { getModelAndExpect("datatypes 10 a b a", 1); } - public void testDatatype_10_A_B_B() throws Exception { + @Test public void testDatatype_10_A_B_B() throws Exception { getModelAndExpect("datatypes 10 a b b", 1); } - public void testDatatype_10_B_A_A() throws Exception { + @Test public void testDatatype_10_B_A_A() throws Exception { getModelAndExpect("datatypes 10 b a a", 1); } - public void testDatatype_10_B_A_B() throws Exception { + @Test public void testDatatype_10_B_A_B() throws Exception { getModelAndExpect("datatypes 10 b a b", 1); } - public void testDatatype_11_A_B() throws Exception { + @Test public void testDatatype_11_A_B() throws Exception { internalTestDatatypes("11 a b"); } - public void testDatatype_11_B_A() throws Exception { + @Test public void testDatatype_11_B_A() throws Exception { internalTestDatatypes("11 b a"); } - public void testDatatype_11() throws Exception { + @Test public void testDatatype_11() throws Exception { internalTestDatatypes("11"); } - public void testDatatype_11_A() throws Exception { + @Test public void testDatatype_11_A() throws Exception { getModelAndExpect("datatypes 11 a", 1); } - public void testDatatype_11_B() throws Exception { + @Test public void testDatatype_11_B() throws Exception { getModelAndExpect("datatypes 11 b", 1); } - public void testDatatype_11_A_B_A() throws Exception { + @Test public void testDatatype_11_A_B_A() throws Exception { getModelAndExpect("datatypes 11 a b a", 1); } - public void testDatatype_11_A_B_B() throws Exception { + @Test public void testDatatype_11_A_B_B() throws Exception { getModelAndExpect("datatypes 11 a b b", 1); } - public void testDatatype_11_B_A_A() throws Exception { + @Test public void testDatatype_11_B_A_A() throws Exception { getModelAndExpect("datatypes 11 b a a", 1); } - public void testDatatype_11_B_A_B() throws Exception { + @Test public void testDatatype_11_B_A_B() throws Exception { getModelAndExpect("datatypes 11 b a b", 1); } - public void testDatatype_12_A_B_A_B() throws Exception { + @Test public void testDatatype_12_A_B_A_B() throws Exception { internalTestDatatypes("12 a b a b"); } - public void testDatatype_12_A_B_B_A() throws Exception { + @Test public void testDatatype_12_A_B_B_A() throws Exception { internalTestDatatypes("12 a b b a"); } - public void testDatatype_12_B_A_A_B() throws Exception { + @Test public void testDatatype_12_B_A_A_B() throws Exception { internalTestDatatypes("12 b a a b"); } - public void testDatatype_12_B_A_B_A() throws Exception { + @Test public void testDatatype_12_B_A_B_A() throws Exception { internalTestDatatypes("12 b a b a"); } - public void testDatatype_12() throws Exception { + @Test public void testDatatype_12() throws Exception { getModelAndExpect("datatypes 12", 1); } - public void testDatatype_12_A() throws Exception { + @Test public void testDatatype_12_A() throws Exception { getModelAndExpect("datatypes 12 a", 1); } - public void testDatatype_12_B() throws Exception { + @Test public void testDatatype_12_B() throws Exception { getModelAndExpect("datatypes 12 b", 1); } - public void testDatatype_12_A_B() throws Exception { + @Test public void testDatatype_12_A_B() throws Exception { getModelAndExpect("datatypes 12 a b", 1); } - public void testDatatype_12_B_A() throws Exception { + @Test public void testDatatype_12_B_A() throws Exception { getModelAndExpect("datatypes 12 b a", 1); } - public void testDatatype_12_A_A() throws Exception { + @Test public void testDatatype_12_A_A() throws Exception { getModelAndExpect("datatypes 12 a a", 1); } - public void testDatatype_12_B_B() throws Exception { + @Test public void testDatatype_12_B_B() throws Exception { getModelAndExpect("datatypes 12 b b", 1); } - public void testDatatype_12_A_B_A() throws Exception { + @Test public void testDatatype_12_A_B_A() throws Exception { getModelAndExpect("datatypes 12 a b a", 1); } - public void testDatatype_12_A_B_B() throws Exception { + @Test public void testDatatype_12_A_B_B() throws Exception { getModelAndExpect("datatypes 12 a b b", 1); } - public void testDatatype_12_B_A_A() throws Exception { + @Test public void testDatatype_12_B_A_A() throws Exception { getModelAndExpect("datatypes 12 b a a", 1); } - public void testDatatype_12_B_A_B() throws Exception { + @Test public void testDatatype_12_B_A_B() throws Exception { getModelAndExpect("datatypes 12 b a b", 1); } - public void testDatatype_13_A_B_A_B() throws Exception { + @Test public void testDatatype_13_A_B_A_B() throws Exception { internalTestDatatypes("13 a b a b"); } - public void testDatatype_13_B_A_A_B() throws Exception { + @Test public void testDatatype_13_B_A_A_B() throws Exception { internalTestDatatypes("13 b a a b"); } - public void testDatatype_13_A_B() throws Exception { + @Test public void testDatatype_13_A_B() throws Exception { internalTestDatatypes("13 a b"); } - public void testDatatype_13_B_A_B_A() throws Exception { + @Test public void testDatatype_13_B_A_B_A() throws Exception { getModelAndExpect("datatypes 13 b a b a", 2); } - public void testDatatype_13_A_B_B_A() throws Exception { + @Test public void testDatatype_13_A_B_B_A() throws Exception { getModelAndExpect("datatypes 13 a b b a", 2); } - public void testDatatype_13() throws Exception { + @Test public void testDatatype_13() throws Exception { getModelAndExpect("datatypes 13", 1); } - public void testDatatype_13_A() throws Exception { + @Test public void testDatatype_13_A() throws Exception { getModelAndExpect("datatypes 13 a", 1); } - public void testDatatype_13_B() throws Exception { + @Test public void testDatatype_13_B() throws Exception { getModelAndExpect("datatypes 13 b", 1); } - public void testDatatype_13_B_A() throws Exception { + @Test public void testDatatype_13_B_A() throws Exception { getModelAndExpect("datatypes 13 b a", 1); } - public void testDatatype_13_A_A() throws Exception { + @Test public void testDatatype_13_A_A() throws Exception { getModelAndExpect("datatypes 13 a a", 1); } - public void testDatatype_13_B_B() throws Exception { + @Test public void testDatatype_13_B_B() throws Exception { getModelAndExpect("datatypes 13 b b", 1); } - public void testDatatype_13_A_B_A() throws Exception { + @Test public void testDatatype_13_A_B_A() throws Exception { getModelAndExpect("datatypes 13 a b a", 1); } - public void testDatatype_13_A_B_B() throws Exception { + @Test public void testDatatype_13_A_B_B() throws Exception { getModelAndExpect("datatypes 13 a b b", 1); } - public void testDatatype_13_B_A_A() throws Exception { + @Test public void testDatatype_13_B_A_A() throws Exception { getModelAndExpect("datatypes 13 b a a", 1); } - public void testDatatype_13_B_A_B() throws Exception { + @Test public void testDatatype_13_B_A_B() throws Exception { getModelAndExpect("datatypes 13 b a b", 1); } - public void testDatatype_14_A_B_C_D() throws Exception { + @Test public void testDatatype_14_A_B_C_D() throws Exception { internalTestDatatypes("14 a b c d"); } - public void testDatatype_14_A_B_D_C() throws Exception { + @Test public void testDatatype_14_A_B_D_C() throws Exception { internalTestDatatypes("14 a b d c"); } - public void testDatatype_14_B_A_C_D() throws Exception { + @Test public void testDatatype_14_B_A_C_D() throws Exception { internalTestDatatypes("14 b a c d"); } - public void testDatatype_14_B_A_D_C() throws Exception { + @Test public void testDatatype_14_B_A_D_C() throws Exception { internalTestDatatypes("14 b a d c"); } - public void testDatatype_14_C_D_A_B() throws Exception { + @Test public void testDatatype_14_C_D_A_B() throws Exception { internalTestDatatypes("14 c d a b"); } - public void testDatatype_14_D_C_A_B() throws Exception { + @Test public void testDatatype_14_D_C_A_B() throws Exception { internalTestDatatypes("14 d c a b"); } - public void testDatatype_14_C_D_B_A() throws Exception { + @Test public void testDatatype_14_C_D_B_A() throws Exception { internalTestDatatypes("14 c d b a"); } - public void testDatatype_14_D_C_B_A() throws Exception { + @Test public void testDatatype_14_D_C_B_A() throws Exception { internalTestDatatypes("14 d c b a"); } - public void testDatatype_14_A_B_C_D_D_C_B_A() throws Exception { + @Test public void testDatatype_14_A_B_C_D_D_C_B_A() throws Exception { internalTestDatatypes("14 a b c d d c b a"); } - public void testDatatype_14_A_B_C_D_D_C_B_A_B_A_C_D() throws Exception { + @Test public void testDatatype_14_A_B_C_D_D_C_B_A_B_A_C_D() throws Exception { internalTestDatatypes("14 a b c d d c b a b a c d"); } - public void testNested_A_B() throws Exception { + @Test public void testNested_A_B() throws Exception { internalTestNested("a b nested", 1); } - public void testNested_B_A() throws Exception { + @Test public void testNested_B_A() throws Exception { internalTestNested("b a nested", 1); } - public void testNested_A_B_A_B() throws Exception { + @Test public void testNested_A_B_A_B() throws Exception { internalTestNested("a b nested a b nested", 2); } - public void testNested_B_A_A_B() throws Exception { + @Test public void testNested_B_A_A_B() throws Exception { internalTestNested("b a nested a b nested", 2); } - public void testNested_A_B_B_A() throws Exception { + @Test public void testNested_A_B_B_A() throws Exception { internalTestNested("a b nested b a nested", 2); } - public void testNested_B_A_B_A() throws Exception { + @Test public void testNested_B_A_B_A() throws Exception { internalTestNested("b a nested b a nested", 2); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java index 38d0e05e4..716c965b4 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserExTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.unorderedGroups; public class BacktrackingBug325745ParserExTest extends AbstractBacktrackingBug325745ParserTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ExBacktrackingBug325745TestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java index e03774ac1..3d7e40257 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745ParserTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.unorderedGroups; public class BacktrackingBug325745ParserTest extends AbstractBacktrackingBug325745ParserTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleBacktrackingBug325745TestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java index a28307650..3ff40e2ff 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserExTest.java @@ -15,7 +15,7 @@ import org.eclipse.xtext.testlanguages.backtracking.ExBeeLangTestLanguageStandal public class BacktrackingParserExTest extends AbstractBacktrackingParserTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ExBeeLangTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java index f68f8f187..13e9ac064 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/BacktrackingParserTest.java @@ -15,7 +15,7 @@ import org.eclipse.xtext.testlanguages.backtracking.SimpleBeeLangTestLanguageSta public class BacktrackingParserTest extends AbstractBacktrackingParserTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleBeeLangTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java index 366d890e5..3cd4c4e5c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ConcreteSyntaxValidatorTest.java @@ -13,6 +13,7 @@ import org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.Unor import org.eclipse.xtext.validation.AbstractConcreteSyntaxValidationTest; import org.eclipse.xtext.validation.IConcreteSyntaxValidator; import org.eclipse.xtext.validation.impl.ConcreteSyntaxValidator; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -23,7 +24,7 @@ public class ConcreteSyntaxValidatorTest extends AbstractConcreteSyntaxValidatio private UnorderedSerialization toBeValidated; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(UnorderedGroupsTestLanguageStandaloneSetup.class); validator = get(ConcreteSyntaxValidator.class); @@ -39,63 +40,63 @@ public class ConcreteSyntaxValidatorTest extends AbstractConcreteSyntaxValidatio return validator; } - public void testNoValueAssigned() { + @Test public void testNoValueAssigned() { validate(toBeValidated).assertOK(); } - public void testValidate_1_A() { + @Test public void testValidate_1_A() { toBeValidated.setFirst(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_B() { + @Test public void testValidate_1_B() { toBeValidated.setSecond(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_C() { + @Test public void testValidate_1_C() { toBeValidated.setThird(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_D() { + @Test public void testValidate_1_D() { toBeValidated.setForth(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_A_B() { + @Test public void testValidate_1_A_B() { toBeValidated.setFirst(true); toBeValidated.setSecond(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_A_C() { + @Test public void testValidate_1_A_C() { toBeValidated.setFirst(true); toBeValidated.setThird(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_A_D() { + @Test public void testValidate_1_A_D() { toBeValidated.setFirst(true); toBeValidated.setForth(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_A_B_C() { + @Test public void testValidate_1_A_B_C() { toBeValidated.setFirst(true); toBeValidated.setSecond(true); toBeValidated.setThird(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_A_B_D() { + @Test public void testValidate_1_A_B_D() { toBeValidated.setFirst(true); toBeValidated.setSecond(true); toBeValidated.setForth(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_A_B_C_D() { + @Test public void testValidate_1_A_B_C_D() { toBeValidated.setFirst(true); toBeValidated.setSecond(true); toBeValidated.setThird(true); @@ -103,39 +104,39 @@ public class ConcreteSyntaxValidatorTest extends AbstractConcreteSyntaxValidatio validate(toBeValidated).assertOK(); } - public void testValidate_1_B_C_D() { + @Test public void testValidate_1_B_C_D() { toBeValidated.setSecond(true); toBeValidated.setThird(true); toBeValidated.setForth(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_B_C() { + @Test public void testValidate_1_B_C() { toBeValidated.setSecond(true); toBeValidated.setThird(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_B_D() { + @Test public void testValidate_1_B_D() { toBeValidated.setSecond(true); toBeValidated.setForth(true); validate(toBeValidated).assertOK(); } - public void testValidate_1_C_D() { + @Test public void testValidate_1_C_D() { toBeValidated.setThird(true); toBeValidated.setForth(true); validate(toBeValidated).assertOK(); } - public void testValidate_2_A_B() { + @Test public void testValidate_2_A_B() { toBeValidated.getFirstAsList().add("a"); toBeValidated.getSecondAsList().add("b"); validate(toBeValidated).assertOK(); } // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=310454 -// public void testValidate_2_A_A_B() { +// @Test public void testValidate_2_A_A_B() { // toBeValidated.getFirstAsList().add("a"); // toBeValidated.getFirstAsList().add("a"); // toBeValidated.getSecondAsList().add("b"); @@ -144,7 +145,7 @@ public class ConcreteSyntaxValidatorTest extends AbstractConcreteSyntaxValidatio // err(pack.getUnorderedSerialization_SecondAsList(), ERROR_LIST_TOO_FEW, 2, null, "((first? second? third? forth?)|(firstAsList secondAsList)*|(firstAsList+ second)*)")); // } - public void testValidate_2_A_B_A_B() { + @Test public void testValidate_2_A_B_A_B() { toBeValidated.getFirstAsList().add("a"); toBeValidated.getFirstAsList().add("a"); toBeValidated.getSecondAsList().add("b"); @@ -152,7 +153,7 @@ public class ConcreteSyntaxValidatorTest extends AbstractConcreteSyntaxValidatio validate(toBeValidated).assertOK(); } - public void testValidate_2_A_B_A_B_A_B() { + @Test public void testValidate_2_A_B_A_B_A_B() { toBeValidated.getFirstAsList().add("a"); toBeValidated.getFirstAsList().add("a"); toBeValidated.getFirstAsList().add("a"); @@ -162,20 +163,20 @@ public class ConcreteSyntaxValidatorTest extends AbstractConcreteSyntaxValidatio validate(toBeValidated).assertOK(); } - public void testValidate_3_A_B() { + @Test public void testValidate_3_A_B() { toBeValidated.getFirstAsList().add("a"); toBeValidated.setSecond(true); validate(toBeValidated).assertOK(); } - public void testValidate_3_A_A_B() { + @Test public void testValidate_3_A_A_B() { toBeValidated.getFirstAsList().add("a"); toBeValidated.getFirstAsList().add("a"); toBeValidated.setSecond(true); validate(toBeValidated).assertOK(); } - public void testValidate_3_A_A_A_B() { + @Test public void testValidate_3_A_A_A_B() { toBeValidated.getFirstAsList().add("a"); toBeValidated.getFirstAsList().add("a"); toBeValidated.getFirstAsList().add("a"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java index 854360131..f96e36e4d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ErrorMessagesTest.java @@ -11,11 +11,12 @@ import java.util.Collections; import java.util.List; import org.eclipse.xtext.AbstractElement; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.SyntaxErrorMessage; import org.eclipse.xtext.parser.antlr.ISyntaxErrorMessageProvider; import org.eclipse.xtext.parser.antlr.SyntaxErrorMessageProvider; import org.eclipse.xtext.parser.unorderedGroups.services.SimpleUnorderedGroupsTestLanguageGrammarAccess; +import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; @@ -32,7 +33,7 @@ public class ErrorMessagesTest extends AbstractXtextTests implements ISyntaxErro private List expectation; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new SimpleUnorderedGroupsTestLanguageStandaloneSetup() { @Override @@ -63,12 +64,12 @@ public class ErrorMessagesTest extends AbstractXtextTests implements ISyntaxErro return delegate.getSyntaxErrorMessage(context); } - public void testParse_1_A() throws Exception { + @Test public void testParse_1_A() throws Exception { expectation = Collections.singletonList(grammarAccess.getModelAccess().getSecondAssignment_1_0_1_1()); getModelAndExpect("1 a", 1); } - public void testParse_1_B() throws Exception { + @Test public void testParse_1_B() throws Exception { expectation = Collections.singletonList(grammarAccess.getModelAccess().getFirstAssignment_1_0_1_0()); getModelAndExpect("1 b", 1); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java index 633453dde..e58d21d41 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarParserTest.java @@ -19,8 +19,9 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.UnorderedGroup; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -28,66 +29,66 @@ import org.eclipse.xtext.resource.XtextResource; public class GrammarParserTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testKeyword() throws Exception { + @Test public void testKeyword() throws Exception { Keyword keyword = (Keyword) getModel("'keyword'"); assertNotNull(keyword); assertEquals("keyword", keyword.getValue()); } - public void testAlternatives() throws Exception { + @Test public void testAlternatives() throws Exception { Alternatives alternatives = (Alternatives) getModel("'keyword'|'keyword'"); assertNotNull(alternatives); assertEquals(2, alternatives.getElements().size()); } - public void testGroup() throws Exception { + @Test public void testGroup() throws Exception { Group group = (Group) getModel("'keyword' 'keyword'"); assertNotNull(group); assertEquals(2, group.getElements().size()); } - public void testRuleCall() throws Exception { + @Test public void testRuleCall() throws Exception { RuleCall ruleCall = (RuleCall) getModel("STRING"); assertNotNull(ruleCall); assertEquals("STRING", ruleCall.getRule().getName()); } - public void testAction() throws Exception { + @Test public void testAction() throws Exception { Action action = (Action) getModel("{ExplicitType}"); assertNotNull(action); assertEquals("ExplicitType", action.getType().getClassifier().getName()); } - public void testAssignment() throws Exception { + @Test public void testAssignment() throws Exception { Assignment assignment = (Assignment) getModel("name=ID"); assertNotNull(assignment); assertEquals("ID", ((RuleCall) assignment.getTerminal()).getRule().getName()); } - public void testUnorderedGroup_01() throws Exception { + @Test public void testUnorderedGroup_01() throws Exception { UnorderedGroup group = (UnorderedGroup) getModel("'keyword' & 'keyword'"); assertNotNull(group); assertEquals(2, group.getElements().size()); } - public void testUnorderedGroup_02() throws Exception { + @Test public void testUnorderedGroup_02() throws Exception { UnorderedGroup group = (UnorderedGroup) getModel("'keyword' & 'keyword' & 'keyword'"); assertNotNull(group); assertEquals(3, group.getElements().size()); } - public void testPrecedencies_01() throws Exception { + @Test public void testPrecedencies_01() throws Exception { Alternatives alternatives = (Alternatives) getModel("'keyword' | 'keyword' & 'keyword' | 'keyword'"); assertNotNull(alternatives); assertEquals(3, alternatives.getElements().size()); } - public void testPrecedencies_02() throws Exception { + @Test public void testPrecedencies_02() throws Exception { UnorderedGroup group = (UnorderedGroup) getModel("('keyword' | 'keyword') & ('keyword' | 'keyword')"); assertNotNull(group); assertEquals(2, group.getElements().size()); @@ -95,7 +96,7 @@ public class GrammarParserTest extends AbstractXtextTests { assertTrue(group.getElements().get(1) instanceof Alternatives); } - public void testPrecedencies_03() throws Exception { + @Test public void testPrecedencies_03() throws Exception { UnorderedGroup group = (UnorderedGroup) getModel("'keyword' 'keyword' & 'keyword' 'keyword'"); assertNotNull(group); assertEquals(2, group.getElements().size()); @@ -103,7 +104,7 @@ public class GrammarParserTest extends AbstractXtextTests { assertTrue(group.getElements().get(1) instanceof Group); } - public void testPrecedencies_04() throws Exception { + @Test public void testPrecedencies_04() throws Exception { Group group = (Group) getModel("'keyword' ('keyword' & 'keyword') 'keyword'"); assertNotNull(group); assertEquals(3, group.getElements().size()); @@ -112,7 +113,7 @@ public class GrammarParserTest extends AbstractXtextTests { assertTrue(group.getElements().get(2) instanceof Keyword); } - public void testPrecedencies_05() throws Exception { + @Test public void testPrecedencies_05() throws Exception { UnorderedGroup group = (UnorderedGroup) getModel("name=ID & 'keyword'"); assertNotNull(group); assertEquals(2, group.getElements().size()); @@ -120,7 +121,7 @@ public class GrammarParserTest extends AbstractXtextTests { assertTrue(group.getElements().get(1) instanceof Keyword); } - public void testNotAllowedInAssignment() throws Exception { + @Test public void testNotAllowedInAssignment() throws Exception { getModelAndExpect("name=(ID & STRING)", 2); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java index c9ed2754d..90a63bb02 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GrammarSerializerTest.java @@ -10,8 +10,9 @@ package org.eclipse.xtext.parser.unorderedGroups; import java.io.ByteArrayOutputStream; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -19,12 +20,12 @@ import org.eclipse.xtext.resource.XtextResource; public class GrammarSerializerTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testSerializeGrammar() throws Exception { + @Test public void testSerializeGrammar() throws Exception { String string = readFileIntoString("org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.xtext"); XtextResource resource = getResourceFromString(string); resource.save(new ByteArrayOutputStream(), null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java index 13a79ddf1..f86c741c5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/MetamodelTransformationTest.java @@ -14,8 +14,9 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -23,12 +24,12 @@ import org.eclipse.xtext.resource.XtextResource; public class MetamodelTransformationTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testBooleanAssignments() throws Exception { + @Test public void testBooleanAssignments() throws Exception { EClass clazz = getModel("a?='keyword' & b?='keyword'"); assertNotNull(clazz.getEStructuralFeature("a")); EStructuralFeature feature = clazz.getEStructuralFeature("b"); @@ -36,7 +37,7 @@ public class MetamodelTransformationTest extends AbstractXtextTests { assertFalse(feature.isMany()); } - public void testSimpleAssignments() throws Exception { + @Test public void testSimpleAssignments() throws Exception { EClass clazz = getModel("a='keyword' & b='keyword'"); assertNotNull(clazz.getEStructuralFeature("a")); EStructuralFeature feature = clazz.getEStructuralFeature("b"); @@ -44,7 +45,7 @@ public class MetamodelTransformationTest extends AbstractXtextTests { assertFalse(feature.isMany()); } - public void testMultiValueAssignments() throws Exception { + @Test public void testMultiValueAssignments() throws Exception { EClass clazz = getModel("a+='keyword' & a+='keyword'"); EStructuralFeature feature = clazz.getEStructuralFeature("a"); assertSame(EcorePackage.Literals.ESTRING, feature.getEType()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java index 15c7e7d61..18c58196b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserExTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.unorderedGroups; public class ParserExTest extends AbstractParserTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ExUnorderedGroupsTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java index 84ffda2ef..9a78706b6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/ParserTest.java @@ -13,7 +13,7 @@ package org.eclipse.xtext.parser.unorderedGroups; public class ParserTest extends AbstractParserTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleUnorderedGroupsTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java index 039230c9c..2ab365647 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/SerializerTest.java @@ -7,10 +7,11 @@ *******************************************************************************/ package org.eclipse.xtext.parser.unorderedGroups; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.Model; import org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguageFactory; import org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedSerialization; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,7 +22,7 @@ public class SerializerTest extends AbstractXtextTests { private UnorderedSerialization serializableInstance; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleUnorderedGroupsTestLanguageStandaloneSetup.class); model = UnorderedGroupsTestLanguageFactory.eINSTANCE.createModel(); @@ -29,57 +30,57 @@ public class SerializerTest extends AbstractXtextTests { model.setSerialized(serializableInstance); } - public void testNoValueAssigned() { + @Test public void testNoValueAssigned() { String serialized = serialize(model); assertEquals("serialization 1", serialized); } - public void testSerialize_1_A() { + @Test public void testSerialize_1_A() { serializableInstance.setFirst(true); String serialized = serialize(model); assertEquals("serialization 1 a", serialized); } - public void testSerialize_1_B() { + @Test public void testSerialize_1_B() { serializableInstance.setSecond(true); String serialized = serialize(model); assertEquals("serialization 1 b", serialized); } - public void testSerialize_1_C() { + @Test public void testSerialize_1_C() { serializableInstance.setThird(true); String serialized = serialize(model); assertEquals("serialization 1 c", serialized); } - public void testSerialize_1_D() { + @Test public void testSerialize_1_D() { serializableInstance.setForth(true); String serialized = serialize(model); assertEquals("serialization 1 d", serialized); } - public void testSerialize_1_A_B() { + @Test public void testSerialize_1_A_B() { serializableInstance.setFirst(true); serializableInstance.setSecond(true); String serialized = serialize(model); assertEquals("serialization 1 a b", serialized); } - public void testSerialize_1_A_C() { + @Test public void testSerialize_1_A_C() { serializableInstance.setFirst(true); serializableInstance.setThird(true); String serialized = serialize(model); assertEquals("serialization 1 a c", serialized); } - public void testSerialize_1_A_D() { + @Test public void testSerialize_1_A_D() { serializableInstance.setFirst(true); serializableInstance.setForth(true); String serialized = serialize(model); assertEquals("serialization 1 a d", serialized); } - public void testSerialize_1_A_B_C() { + @Test public void testSerialize_1_A_B_C() { serializableInstance.setFirst(true); serializableInstance.setSecond(true); serializableInstance.setThird(true); @@ -87,7 +88,7 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 1 a b c", serialized); } - public void testSerialize_1_A_B_D() { + @Test public void testSerialize_1_A_B_D() { serializableInstance.setFirst(true); serializableInstance.setSecond(true); serializableInstance.setForth(true); @@ -95,7 +96,7 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 1 a b d", serialized); } - public void testSerialize_1_A_B_C_D() { + @Test public void testSerialize_1_A_B_C_D() { serializableInstance.setFirst(true); serializableInstance.setSecond(true); serializableInstance.setThird(true); @@ -104,7 +105,7 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 1 a b c d", serialized); } - public void testSerialize_1_B_C_D() { + @Test public void testSerialize_1_B_C_D() { serializableInstance.setSecond(true); serializableInstance.setThird(true); serializableInstance.setForth(true); @@ -112,35 +113,35 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 1 b c d", serialized); } - public void testSerialize_1_B_C() { + @Test public void testSerialize_1_B_C() { serializableInstance.setSecond(true); serializableInstance.setThird(true); String serialized = serialize(model); assertEquals("serialization 1 b c", serialized); } - public void testSerialize_1_B_D() { + @Test public void testSerialize_1_B_D() { serializableInstance.setSecond(true); serializableInstance.setForth(true); String serialized = serialize(model); assertEquals("serialization 1 b d", serialized); } - public void testSerialize_1_C_D() { + @Test public void testSerialize_1_C_D() { serializableInstance.setThird(true); serializableInstance.setForth(true); String serialized = serialize(model); assertEquals("serialization 1 c d", serialized); } - public void testSerialize_2_A_B() { + @Test public void testSerialize_2_A_B() { serializableInstance.getFirstAsList().add("a"); serializableInstance.getSecondAsList().add("b"); String serialized = serialize(model); assertEquals("serialization 2 a b", serialized); } - public void testSerialize_2_A_B_A_B() { + @Test public void testSerialize_2_A_B_A_B() { serializableInstance.getFirstAsList().add("a"); serializableInstance.getFirstAsList().add("a"); serializableInstance.getSecondAsList().add("b"); @@ -149,7 +150,7 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 2 a b a b", serialized); } - public void testSerialize_2_A_B_A_B_A_B() { + @Test public void testSerialize_2_A_B_A_B_A_B() { serializableInstance.getFirstAsList().add("a"); serializableInstance.getFirstAsList().add("a"); serializableInstance.getFirstAsList().add("a"); @@ -160,14 +161,14 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 2 a b a b a b", serialized); } - public void testSerialize_3_A_B() { + @Test public void testSerialize_3_A_B() { serializableInstance.getFirstAsList().add("a"); serializableInstance.setSecond(true); String serialized = serialize(model); assertEquals("serialization 3 a b", serialized); } - public void testSerialize_3_A_A_B() { + @Test public void testSerialize_3_A_A_B() { serializableInstance.getFirstAsList().add("a"); serializableInstance.getFirstAsList().add("a"); serializableInstance.setSecond(true); @@ -175,7 +176,7 @@ public class SerializerTest extends AbstractXtextTests { assertEquals("serialization 3 a a b", serialized); } - public void testSerialize_3_A_A_A_B() { + @Test public void testSerialize_3_A_A_A_B() { serializableInstance.getFirstAsList().add("a"); serializableInstance.getFirstAsList().add("a"); serializableInstance.getFirstAsList().add("a"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/ASTChangeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/ASTChangeTest.java deleted file mode 100755 index b39ba5e4a..000000000 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/ASTChangeTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 itemis AG (http://www.itemis.eu) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - *******************************************************************************/ -package org.eclipse.xtext.parsetree; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.dummy.DummyTestLanguageStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.nodemodel.ICompositeNode; - -public class ASTChangeTest extends AbstractXtextTests { - - @Override - protected void setUp() throws Exception { - super.setUp(); - with(DummyTestLanguageStandaloneSetup.class); - } - - public void testWhitespaceIsIncluded() throws Exception { - String model = "element foo;\nelement bar;"; - ICompositeNode node = getRootNode(model); - EObject me = node.getSemanticElement(); - assertWithXtend("'foo'", "elements.first().name", me); - invokeWithXtend("elements.first().setName('stuff')", me); - assertWithXtend("'stuff'", "elements.first().name", me); - -// assertEquals("element stuff;\nelement bar;", node.serialize()); - } - -} diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java index 8c9d19c96..7e8781115 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/CommentTest.java @@ -11,9 +11,10 @@ import java.util.List; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.dummy.DummyTestLanguageStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; +import org.junit.Test; import com.google.common.collect.Lists; @@ -23,12 +24,12 @@ import com.google.common.collect.Lists; public class CommentTest extends AbstractXtextTests{ @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DummyTestLanguageStandaloneSetup.class); } - public void testSingleLineComment() throws Exception { + @Test public void testSingleLineComment() throws Exception { String model = "// comment\n/*element foo;\nelement bar;*/"; INode node = getRootNode(model); List leafNodes = Lists.newArrayList(node.getLeafNodes()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java index 97f9c2822..325903980 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/EmptyModelTest.java @@ -8,28 +8,30 @@ package org.eclipse.xtext.parsetree; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.testlanguages.OptionalEmptyTestLanguageStandaloneSetup; +import org.eclipse.xtext.testlanguages.optionalEmpty.Model; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; public class EmptyModelTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(OptionalEmptyTestLanguageStandaloneSetup.class); } - public void testParseEmpty() throws Exception { - EObject model = getModel(""); + @Test public void testParseEmpty() throws Exception { + Model model = (Model) getModel(""); assertNull(model); - model = getModel("hallo welt"); - assertWithXtend("'welt'", "child.name", model); + model = (Model) getModel("hallo welt"); + assertEquals("welt", model.getChild().getName()); } - public void testParseCommentOnly() throws Exception { + @Test public void testParseCommentOnly() throws Exception { String model = "// some single line comment \n /* and \n a \n \n multiline \n comment */"; assertEmptyModel(model); } @@ -42,7 +44,7 @@ public class EmptyModelTest extends AbstractXtextTests { assertEquals(model, rootNode.getText()); } - public void testParseWhitespaceOnly() throws Exception { + @Test public void testParseWhitespaceOnly() throws Exception { String model = " \t\n\r \t\n\n "; assertEmptyModel(model); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java index 5f65f0c00..25dde057a 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/HiddenTokensTest.java @@ -9,36 +9,37 @@ package org.eclipse.xtext.parsetree; import org.eclipse.xtext.dummy.DummyTestLanguageStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.INode; +import org.junit.Test; public class HiddenTokensTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(DummyTestLanguageStandaloneSetup.class); } - public void testWhitespaceIsIncluded() throws Exception { + @Test public void testWhitespaceIsIncluded() throws Exception { String model = "element foo;\nelement bar;"; INode node = getRootNode(model); assertEquals(model,node.getText()); } - public void testWhitespaceIsIncluded2() throws Exception { + @Test public void testWhitespaceIsIncluded2() throws Exception { String model = "element foo;\nelement bar;/* foo bar */ element foo;\nelement bar;"; INode node = getRootNode(model); assertEquals(node.getText(), model); } - public void testTrailingWhitespaceIsIncluded() throws Exception { + @Test public void testTrailingWhitespaceIsIncluded() throws Exception { String model = "element foo;\nelement bar; /* holla */ \n// stuff\n"; INode node = getRootNode(model); assertEquals(model, node.getText()); } - public void testPrecedingWhitespaceIsIncluded() throws Exception { + @Test public void testPrecedingWhitespaceIsIncluded() throws Exception { String model = "//honolulu\n\t element foo;\nelement bar;"; INode node = getRootNode(model); assertEquals(model, node.getText()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java index a3de3fda6..fed09302d 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/InvalidTokenTest.java @@ -10,10 +10,11 @@ package org.eclipse.xtext.parsetree; import java.util.List; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.testlanguages.OptionalEmptyTestLanguageStandaloneSetup; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; @@ -24,7 +25,7 @@ import com.google.common.collect.Lists; */ public class InvalidTokenTest extends AbstractXtextTests { - public void testInvalidTokenError() throws Exception { + @Test public void testInvalidTokenError() throws Exception { with(OptionalEmptyTestLanguageStandaloneSetup.class); ICompositeNode rootNode = getRootNodeAndExpect("/*", 1); List allErrorNodes = Lists.newArrayList(Iterators.filter(rootNode.getAsTreeIterable().iterator(), new Predicate() { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java index 7464ad5f6..ce775c670 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/SerializeTest.java @@ -1,23 +1,24 @@ package org.eclipse.xtext.parsetree; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSetup; +import org.junit.Test; public class SerializeTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleExpressionsTestLanguageStandaloneSetup.class); } - public void testUncompleteComment() throws Exception { + @Test public void testUncompleteComment() throws Exception { String model ="a /* comment *"; checkSerialize(model, 1); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String model = "/* foo */ x + y * ( /* stuff */ a /* end */\n * b)"; int x = model.length(); while (x>0) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java index e7708ed47..fa7b16842 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/ElementMatcherTest.java @@ -20,15 +20,15 @@ import org.eclipse.xtext.formatting.IElementMatcherProvider.IBetweenElements; import org.eclipse.xtext.formatting.IElementMatcherProvider.IElementMatcherExtension; import org.eclipse.xtext.formatting.IElementMatcherProvider.IElementPattern; import org.eclipse.xtext.formatting.impl.AbstractTokenStream; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.formatter.services.ElementMatcherTestLanguageGrammarAccess; import org.eclipse.xtext.parsetree.formatter.services.ElementMatcherTestLanguageGrammarAccess.LoopElements; import org.eclipse.xtext.parsetree.formatter.services.ElementMatcherTestLanguageGrammarAccess.OptionalCallsElements; import org.eclipse.xtext.parsetree.formatter.services.ElementMatcherTestLanguageGrammarAccess.RuleCallsElements; import org.eclipse.xtext.parsetree.formatter.services.ElementMatcherTestLanguageGrammarAccess.SimpleElements; -import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; +import org.junit.Test; import com.google.common.collect.Lists; @@ -37,19 +37,6 @@ import com.google.common.collect.Lists; */ public class ElementMatcherTest extends AbstractXtextTests { - @Override - protected boolean shouldTestSerializer(XtextResource resource) { - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=361355 - if ("testRecursion".equals(getName())) - return false; - - // missing values for unassigned rule call. - if ("testRuleCalls2a".equals(getName()) || "testRuleCalls2b".equals(getName()) - || "testRuleCalls2c".equals(getName())) - return false; - return true; - } - private ElementMatcherTestLanguageGrammarAccess g; private static class Patterns { @@ -140,20 +127,20 @@ public class ElementMatcherTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ElementMatcherTestLanguageStandaloneSetup.class); g = (ElementMatcherTestLanguageGrammarAccess) getGrammarAccess(); } - public void testSimple1() throws Exception { + @Test public void testSimple1() throws Exception { Patterns pattern = new Patterns(); pattern.after(g.getSimpleAccess().getNumberSignDigitOneKeyword_0()); pattern.before(g.getSimpleAccess().getKw1Keyword_2_0()); assertEquals("#1 ! abc ! kw1 efg long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleAssignments() throws Exception { + @Test public void testSimpleAssignments() throws Exception { Patterns pattern = new Patterns(); pattern.after(g.getSimpleAccess().getNameAssignment_1()); pattern.before(g.getSimpleAccess().getOptionalAssignment_2_1()); @@ -161,40 +148,40 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#1 abc ! kw1 ! efg ! long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleGroup1() throws Exception { + @Test public void testSimpleGroup1() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getSimpleAccess().getGroup_2()); assertEquals("#1 abc ! kw1 efg long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleGroup2() throws Exception { + @Test public void testSimpleGroup2() throws Exception { Patterns pattern = new Patterns(); pattern.after(g.getSimpleAccess().getGroup_2()); assertEquals("#1 abc kw1 efg ! long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleGroup3() throws Exception { + @Test public void testSimpleGroup3() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getSimpleAccess().getGroup()); pattern.after(g.getSimpleAccess().getGroup()); assertEquals("! #1 abc kw1 efg long.name !", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleBetween1() throws Exception { + @Test public void testSimpleBetween1() throws Exception { SimpleElements se = g.getSimpleAccess(); Patterns pattern = new Patterns(); pattern.between(se.getNumberSignDigitOneKeyword_0(), se.getNameIDTerminalRuleCall_1_0()); assertEquals("#1 ! abc kw1 efg long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleBetween2() throws Exception { + @Test public void testSimpleBetween2() throws Exception { SimpleElements se = g.getSimpleAccess(); Patterns pattern = new Patterns(); pattern.between(se.getNumberSignDigitOneKeyword_0(), se.getNameAssignment_1()); assertEquals("#1 ! abc kw1 efg long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleBetween3() throws Exception { + @Test public void testSimpleBetween3() throws Exception { SimpleElements se = g.getSimpleAccess(); Patterns pattern = new Patterns(); pattern.between(se.getNameIDTerminalRuleCall_1_0(), se.getDatatypeAssignment_3()); @@ -202,7 +189,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#1 abc kw1 efg long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testSimpleBetween4() throws Exception { + @Test public void testSimpleBetween4() throws Exception { SimpleElements se = g.getSimpleAccess(); Patterns pattern = new Patterns(); pattern.between(se.getGroup_2(), se.getDatatypeFQNParserRuleCall_3_0()); @@ -210,14 +197,14 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#1 abc kw1 efg ! long.name", match("#1 abc kw1 efg long.name", pattern)); } - public void testRuleCalls1() throws Exception { + @Test public void testRuleCalls1() throws Exception { RuleCallsElements rce = g.getRuleCallsAccess(); Patterns pattern = new Patterns(); pattern.before(rce.getRuleCallsSubParserRuleCall_1()); assertEquals("#2 ! sub foo", match("#2 sub foo", pattern)); } - public void testRuleCalls2() throws Exception { + @Test public void testRuleCalls2() throws Exception { RuleCallsElements rce = g.getRuleCallsAccess(); Patterns pattern = new Patterns(); pattern = new Patterns(); @@ -225,7 +212,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#2 sub ! foo", match("#2 sub foo", pattern)); } - public void testRuleCalls3() throws Exception { + @Test public void testRuleCalls3() throws Exception { RuleCallsElements rce = g.getRuleCallsAccess(); Patterns pattern = new Patterns(); pattern.between(rce.getNameAssignment_2(), rce.getCall1Assignment_3()); @@ -234,63 +221,63 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#2 sub foo ! ass2 zonk", match("#2 sub foo ass2 zonk", pattern)); } - public void testRuleCalls4() throws Exception { + @Test public void testRuleCalls4() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsSubAccess().getSubAssignment()); pattern.after(g.getRuleCallsSubAccess().getSubAssignment()); assertEquals("#2 ! sub ! foo", match("#2 sub foo", pattern)); } - public void testRuleCalls5() throws Exception { + @Test public void testRuleCalls5() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsAss1Access().getGroup()); pattern.after(g.getRuleCallsAss1Access().getGroup()); assertEquals("#2 sub foo ! ass1 foo !", match("#2 sub foo ass1 foo", pattern)); } - public void testRuleCalls6() throws Exception { + @Test public void testRuleCalls6() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsAss2Access().getGroup()); pattern.after(g.getRuleCallsAss2Access().getGroup()); assertEquals("#2 sub foo ass1 bar ! ass2 zonk !", match("#2 sub foo ass1 bar ass2 zonk", pattern)); } - public void testRuleCalls7() throws Exception { + @Test public void testRuleCalls7() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsAccess().getCall1Assignment_3()); pattern.after(g.getRuleCallsAccess().getCall1Assignment_3()); assertEquals("#2 sub foo ! ass1 bar ! ass2 zonk", match("#2 sub foo ass1 bar ass2 zonk", pattern)); } - public void testRuleCalls8() throws Exception { + @Test public void testRuleCalls8() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsAccess().getCall2Assignment_4()); pattern.after(g.getRuleCallsAccess().getCall2Assignment_4()); assertEquals("#2 sub foo ass1 bar ! ass2 zonk !", match("#2 sub foo ass1 bar ass2 zonk", pattern)); } - public void testRuleCalls9() throws Exception { + @Test public void testRuleCalls9() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsSubAccess().getSubAssignment()); pattern.after(g.getRuleCallsSubAccess().getSubAssignment()); assertEquals("#2 ! sub ! foo", match("#2 sub foo", pattern)); } - public void testRuleCalls10() throws Exception { + @Test public void testRuleCalls10() throws Exception { Patterns pattern = new Patterns(); pattern.before(g.getRuleCallsAccess().getCall1Assignment_3()); pattern.after(g.getRuleCallsAccess().getCall1Assignment_3()); assertEquals("#2 sub foo ass2 bar", match("#2 sub foo ass2 bar", pattern)); } - public void testOptionalCalls1() throws Exception { + @Test public void testOptionalCalls1() throws Exception { OptionalCallsElements oce = g.getOptionalCallsAccess(); Patterns pattern = new Patterns(); pattern.between(oce.getNumberSignDigitThreeKeyword_0(), oce.getNameAssignment_3()); assertEquals("#3 ! foo", match("#3 foo", pattern)); } - public void testOptionalCalls2() throws Exception { + @Test public void testOptionalCalls2() throws Exception { OptionalCallsElements oce = g.getOptionalCallsAccess(); Patterns pattern = new Patterns(); pattern.between(oce.getNumberSignDigitThreeKeyword_0(), g.getOptionalCallsSub1Access().getSubKeyword_2()); @@ -298,7 +285,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#3 ! sub ! foo", match("#3 sub foo", pattern)); } - public void testOptionalCalls3() throws Exception { + @Test public void testOptionalCalls3() throws Exception { OptionalCallsElements oce = g.getOptionalCallsAccess(); Patterns pattern = new Patterns(); pattern.between(oce.getNumberSignDigitThreeKeyword_0(), g.getOptionalCallsSub2Access().getSub2Keyword_0()); @@ -306,91 +293,92 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#3 ! sub2 foo sub sub3 bar ! baz", match("#3 sub2 foo sub sub3 bar baz", pattern)); } - public void testRecursion() throws Exception { + @Test public void testRecursion() throws Exception { + disableSerializerTest(); Patterns p = new Patterns(); p.after(g.getRecursionSubAccess().getLeftCurlyBracketKeyword_1()); p.before(g.getRecursionSubAccess().getRightCurlyBracketKeyword_3()); assertEquals("#4 { ! bar { ! foo ! } { ! { ! zonk ! } ! } ! }", match("#4 { { foo } bar { { zonk } } }", p)); } - public void testLoop1() throws Exception { + @Test public void testLoop1() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.before(le.getNamesAssignment_1()); assertEquals("#5 ! foo ! bar ! baz", match("#5 foo bar baz", p)); } - public void testLoop2() throws Exception { + @Test public void testLoop2() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.after(le.getNamesAssignment_1()); assertEquals("#5 foo ! bar ! baz !", match("#5 foo bar baz", p)); } - public void testLoop3() throws Exception { + @Test public void testLoop3() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.between(le.getNamesAssignment_1(), le.getNamesAssignment_1()); assertEquals("#5 foo ! bar ! baz", match("#5 foo bar baz", p)); } - public void testLoop4() throws Exception { + @Test public void testLoop4() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.before(le.getGroup_2()); assertEquals("#5 foo bar ! gr grfoo ! gr grbar", match("#5 foo bar gr grfoo gr grbar", p)); } - public void testLoop5() throws Exception { + @Test public void testLoop5() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.after(le.getGroup_2()); assertEquals("#5 foo bar gr grfoo ! gr grbar !", match("#5 foo bar gr grfoo gr grbar", p)); } - public void testLoop6() throws Exception { + @Test public void testLoop6() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.between(le.getGroup_2(), le.getGroup_2()); assertEquals("#5 foo bar gr grfoo ! gr grbar", match("#5 foo bar gr grfoo gr grbar", p)); } - public void testLoop7() throws Exception { + @Test public void testLoop7() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.between(le.getNamesAssignment_1(), le.getGroup_2()); assertEquals("#5 foo bar ! gr grfoo gr grbar", match("#5 foo bar gr grfoo gr grbar", p)); } - public void testLoop8() throws Exception { + @Test public void testLoop8() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.before(le.getAlternatives_3()); assertEquals("#5 x gr gf gr gb ! '1' ! '2' ! 1 ! 2", match("#5 x gr gf gr gb '1' '2' 1 2", p)); } - public void testLoop9() throws Exception { + @Test public void testLoop9() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.after(le.getAlternatives_3()); assertEquals("#5 x gr gf gr gb '1' ! '2' ! 1 ! 2 !", match("#5 x gr gf gr gb '1' '2' 1 2", p)); } - public void testLoop10() throws Exception { + @Test public void testLoop10() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.between(le.getAlternatives_3(), le.getAlternatives_3()); assertEquals("#5 x gr gf gr gb '1' ! '2' ! 1 ! 2", match("#5 x gr gf gr gb '1' '2' 1 2", p)); } - public void testLoop11() throws Exception { + @Test public void testLoop11() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.between(le.getGroup_2(), le.getAlternatives_3()); assertEquals("#5 x gr gf gr gb ! '1' '2' 1 2", match("#5 x gr gf gr gb '1' '2' 1 2", p)); } - public void testLoop12() throws Exception { + @Test public void testLoop12() throws Exception { LoopElements le = g.getLoopAccess(); Patterns p = new Patterns(); p.between(le.getNamesAssignment_1(), le.getAlternatives_3()); @@ -398,7 +386,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#5 x ! '1' '2' 1 2", match("#5 x '1' '2' 1 2", p)); } - public void testExpression1() throws Exception { + @Test public void testExpression1() throws Exception { Patterns p = new Patterns(); p.before("", g.getAddAccess().getPlusSignKeyword_1_1()); @@ -408,7 +396,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals(expected1, match("#6 1 + 2 * 4 * ((3 + 4) + foo(4, 6 +7))", p)); } - public void testExpression2() throws Exception { + @Test public void testExpression2() throws Exception { Patterns p = new Patterns(); p.before("<", g.getPrimAccess().getValAssignment_0_1()); p.after(">", g.getPrimAccess().getValAssignment_0_1()); @@ -416,7 +404,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals(expected2, match("#6 1 + 2 * 4 * ((3 + 4) + foo(4, 6 +7))", p)); } - public void testExpression3() throws Exception { + @Test public void testExpression3() throws Exception { Patterns p = new Patterns(); p.before("<", g.getPrimAccess().getAddParserRuleCall_3_1()); p.after(">", g.getPrimAccess().getAddParserRuleCall_3_1()); @@ -424,7 +412,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals(expected3, match("#6 (1 + 2) * 4 * ((3 + 4 * (5 + 5)) + foo(4, 6 * (7 + 9)))", p)); } - public void testExpression4() throws Exception { + @Test public void testExpression4() throws Exception { Patterns p = new Patterns(); p.before("(", g.getPrimAccess().getTargetAssignment_2_2()); p.after(")", g.getPrimAccess().getTargetAssignment_2_2()); @@ -432,7 +420,7 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals(expected4, match("#6 => => => => 5", p)); } - public void testExpression5() throws Exception { + @Test public void testExpression5() throws Exception { Patterns p = new Patterns(); p.before("<", g.getAddAccess().getRightAssignment_1_2()); p.after(">", g.getAddAccess().getRightAssignment_1_2()); @@ -444,13 +432,14 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals(expected, match("#6 (1 + 2) * 4 * ((3 + 4 * (5 + 5)) + foo(4, 6 * (7 + 9)))", p)); } - public void testExpression6() throws Exception { + @Test public void testExpression6() throws Exception { Patterns p = new Patterns(); p.between(g.getPrimAccess().getRightParenthesisKeyword_3_2(), g.getMultAccess().getAsteriskKeyword_1_1()); assertEquals("#6 ( 5 + 4 ) ! * 7", match("#6 (5 + 4) * 7", p)); } - public void testRuleCalls2a() throws Exception { + @Test public void testRuleCalls2a() throws Exception { + disableSerializerTest(); Patterns p = new Patterns(); p.before(g.getConstructorRule().getAlternatives()); p.after(g.getConstructorRule().getAlternatives()); @@ -460,7 +449,8 @@ public class ElementMatcherTest extends AbstractXtextTests { // assertEquals("#7 ! ! foo kw3", match("#7 foo kw3", p)); } - public void testRuleCalls2b() throws Exception { + @Test public void testRuleCalls2b() throws Exception { + disableSerializerTest(); Patterns p = new Patterns(); p.before(g.getFieldRule().getAlternatives()); p.after(g.getFieldRule().getAlternatives()); @@ -470,7 +460,8 @@ public class ElementMatcherTest extends AbstractXtextTests { assertEquals("#7 ! foo ! kw3", match("#7 foo kw3", p)); } - public void testRuleCalls2c() throws Exception { + @Test public void testRuleCalls2c() throws Exception { + disableSerializerTest(); Patterns p = new Patterns(); p.before(g.getParameterRule().getAlternatives()); p.after(g.getParameterRule().getAlternatives()); @@ -480,13 +471,13 @@ public class ElementMatcherTest extends AbstractXtextTests { // assertEquals("#7 foo ! ! kw3", match("#7 foo kw3", p)); } - public void testNestedStart() throws Exception { + @Test public void testNestedStart() throws Exception { Patterns p = new Patterns(); p.after(g.getNestedStartSubAccess().getGroup()); assertEquals("#8 ! foo", match("#8 foo", p)); } - public void testNestedStart2() throws Exception { + @Test public void testNestedStart2() throws Exception { Patterns p = new Patterns(); p.after(g.getNestedStartAccess().getGroup()); p.before(g.getNestedStartAccess().getGroup()); 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 acb59e484..508ae0ca2 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 @@ -7,8 +7,8 @@ import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.formatting.INodeModelFormatter.IFormattedRegion; import org.eclipse.xtext.formatting.impl.AbstractTokenStream; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.util.ParseHelper; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.util.ParseHelper; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Decl; @@ -23,6 +23,7 @@ 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.Test; public class FormatterTest extends AbstractXtextTests { @@ -53,7 +54,7 @@ public class FormatterTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(FormatterTestLanguageStandaloneSetup.class); } @@ -110,7 +111,7 @@ public class FormatterTest extends AbstractXtextTests { // assertEquals(ptcTb.toString(), nmsTb.toString()); } - public void testLinewrap() throws Exception { + @Test public void testLinewrap() throws Exception { final String model = "test linewrap float val; int x; double y;"; final String expected = "test linewrap\nfloat val;\nint x;\ndouble y;"; assertFormattedPTC(expected, model); @@ -119,7 +120,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testKeepComments() throws Exception { + @Test public void testKeepComments() throws Exception { // final String model = "test linewrap float val; int x; double y;"; final String model = "// begincomment \ntest linewrap// comment1\n" + "float val;//comment2\n" + "int x;" + "double y; //yoyoyo!\n// endcomment."; @@ -131,7 +132,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testIndentation() throws Exception { + @Test public void testIndentation() throws Exception { final String model = "test indentation { float val; double y; indentation { int x; } }"; final String expected = "test indentation {\n float val;\n double y;\n indentation {\n int x;\n }\n}"; assertFormattedPTC(expected, model); @@ -140,7 +141,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testAssociation() throws Exception { + @Test public void testAssociation() throws Exception { final String model = "test indentation { var = [0,1,2,3,4]; }"; final String expected = "test indentation {\n var=[ 0, 1, 2, 3, 4 ];\n}"; assertFormattedPTC(expected, model); @@ -149,7 +150,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testIndentationAndComments() throws Exception { + @Test public void testIndentationAndComments() throws Exception { final String model = "test /* xxx */ indentation { float val; // some float\n double /* oo */ y; indentation { // some block\n int x; // xxx\n } } // final comment"; final String expected = "test /* xxx */ indentation {\n float val; // some float\n double /* oo */ y;\n indentation { // some block\n int x; // xxx\n }\n} // final comment"; assertFormattedPTC(expected, model); @@ -158,7 +159,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testIndentationAndLineWrap() throws Exception { + @Test public void testIndentationAndLineWrap() throws Exception { final String model = "test indentation { void func(x:int,y:int,s:javalangString, foo:javasqlDate, blupp:mylongtype, msads:adshdjkhsakdasdkslajdlsask, x:x, a:b, c:d ); }"; final String expected = "test indentation {\n void func(x:int, y:int,\n\t s:javalangString,\n\t foo:javasqlDate,\n\t blupp:mylongtype,\n\t msads:adshdjkhsakdasdkslajdlsask,\n\t x:x, a:b, c:d);\n}"; assertFormattedPTC(expected, model); @@ -167,7 +168,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testBetween1() throws Exception { + @Test public void testBetween1() throws Exception { final String model = "test indentation { indentation { x x; }; }"; final String expected = "test indentation {\n indentation {\n x x;\n };\n}"; assertFormattedPTC(expected, model); @@ -176,7 +177,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testBetween2() throws Exception { + @Test public void testBetween2() throws Exception { final String model = "test indentation { indentation { x x; } }"; final String expected = "test indentation {\n indentation {\n x x;\n }\n}"; assertFormattedPTC(expected, model); @@ -185,7 +186,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapDatatypeRule() throws Exception { + @Test public void testLinewrapDatatypeRule() throws Exception { final String model = "test linewrap fqn ab; fqn xx.yy.zz;"; final String expected = "test linewrap\nfqn\nab;\nfqn\nxx.yy.zz;"; assertFormattedPTC(expected, model); @@ -194,43 +195,43 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapDatatypeRulePartial1() throws Exception { + @Test public void testLinewrapDatatypeRulePartial1() throws Exception { final String model = "test linewrap fqn ab . xx .yy .zz;"; final String expected = "test linewrap fqn ab.xx.yy.zz;"; assertFormattedNM(expected, model, 22, 2); } - public void testLinewrapDatatypeRulePartial2() throws Exception { + @Test public void testLinewrapDatatypeRulePartial2() throws Exception { final String model = "test linewrap fqn ab . xx .yy .zz;fqn xxx;"; final String expected = "test linewrap fqn\nab.xx.yy.zz;fqn xxx;"; assertFormattedNM(expected, model, 15, 10); } - public void testLinewrapDatatypeRulePartial3() throws Exception { + @Test public void testLinewrapDatatypeRulePartial3() throws Exception { final String model = "test linewrap fqn ab . xx .yy .zz;fqn xxx;"; final String expected = "test linewrap fqn ab.xx.yy.zz;\nfqn xxx;"; assertFormattedNM(expected, model, 25, 12); } - public void testFormatSegment1() throws Exception { + @Test public void testFormatSegment1() throws Exception { final String model = "test\nindentation {\n indentation { x x ; } }"; final String expected = "test\nindentation {\n indentation {\n x x;\n } }"; assertFormattedNM(expected, model, 30, 18); } - public void testFormatSegment2() throws Exception { + @Test public void testFormatSegment2() throws Exception { final String model = "test indentation {\n indentation { x x ; } }"; // final String expected = "test\nindentation {\n indentation {\n x x;\n } }"; assertFormattedNM(model, model, 7, 10); } - public void testFormatSegment3() throws Exception { + @Test public void testFormatSegment3() throws Exception { final String model = " test indentation {\n indentation { x x ; } }"; final String expected = "test indentation {\n indentation {\n x x;\n }\n}"; assertFormattedNM(expected, model, 0, model.length()); } - public void testLinewrapDatatypeRuleRef1() throws Exception { + @Test public void testLinewrapDatatypeRuleRef1() throws Exception { final String model = "test linewrap fqn ab .cd .ef; fqnref ab. cd. ef;"; final String expected = "test linewrap\nfqn\nab.cd.ef;\nfqnref\nab.cd.ef;"; // assertFormattedPTC(expected, model); @@ -238,7 +239,7 @@ public class FormatterTest extends AbstractXtextTests { // assertEqualTokenStreams(model); } - public void testLinewrapDatatypeRuleRef2() throws Exception { + @Test public void testLinewrapDatatypeRuleRef2() throws Exception { final String model = "test linewrap fqn ab.cd.ef; fqnref ab.cd.ef;"; final String expected = "test linewrap\nfqn\nab.cd.ef;\nfqnref\nab.cd.ef;"; assertFormattedPTC(expected, model); @@ -247,7 +248,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapDatatypeRuleComments() throws Exception { + @Test public void testLinewrapDatatypeRuleComments() throws Exception { final String model = "test linewrap/* 1 */fqn/* 2 */ab.cd.ef/* 3 */;/* 4 */fqnref/* 5 */ab.cd.ef/* 6 */;/* 7 */"; final String expected = "test linewrap /* 1 */ fqn\n\t/* 2 */\nab.cd.ef /* 3 */; /* 4 */\n\tfqnref /* 5 */ ab.cd.ef\n\t/* 6 */; /* 7 */"; assertFormattedPTC(expected, model); @@ -256,7 +257,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testEnumeration() throws Exception { + @Test public void testEnumeration() throws Exception { final String model = "test linewrap enum lit1,lit2,lit3,lit1;"; final String expected = "test linewrap\nenum lit1 ,\nlit2,\nlit3,\nlit1;"; assertFormattedPTC(expected, model); @@ -266,7 +267,7 @@ public class FormatterTest extends AbstractXtextTests { } // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=312559 - public void testSuppressedWhitespace() throws Exception { + @Test public void testSuppressedWhitespace() throws Exception { final String model = "test linewrap `f%%a` post;"; final String expected = "test linewrap\n`f%< b >%a` post;"; assertFormattedPTC(expected, model); @@ -275,7 +276,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testSuppressedLinewrap() throws Exception { + @Test public void testSuppressedLinewrap() throws Exception { final String model = "test linewrap\n`foo%abcd%foo%< b\n\t>%abcd%foo%abcd%foo%abcd%" + "foo%abcd%foo%abcd%foo%abcd%foo%abcd%foo%abcd%foo%xx%foo%abcd%foo%abcd%" + "foo%abcd%foo%<\n\tb >%foo%abcd` post;"; @@ -285,7 +286,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapMin() throws Exception { + @Test public void testLinewrapMin() throws Exception { final String model = "test wrapminmax foo bar;"; final String expected = "test wrapminmax\n\nfoo bar;"; assertFormattedPTC(expected, model); @@ -294,7 +295,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapMax() throws Exception { + @Test public void testLinewrapMax() throws Exception { final String model = "test wrapminmax\n\n\n\n\n\n\n\n\n\n\n\n\nfoo bar;"; final String expected = "test wrapminmax\n\n\n\n\nfoo bar;"; assertFormattedPTC(expected, model); @@ -303,7 +304,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapKeep() throws Exception { + @Test public void testLinewrapKeep() throws Exception { final String model = "test wrapminmax\n\n\n\nfoo bar;"; assertFormattedPTC(model, model); assertFormattedNM(model, model, 0, model.length()); @@ -311,7 +312,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testLinewrapDefault() throws Exception { + @Test public void testLinewrapDefault() throws Exception { FormattertestlanguageFactory f = FormattertestlanguageFactory.eINSTANCE; TestLinewrapMinMax m = f.createTestLinewrapMinMax(); Decl d = f.createDecl(); @@ -323,7 +324,7 @@ public class FormatterTest extends AbstractXtextTests { assertEquals(expected, actual); } - public void testSpace() throws Exception { + @Test public void testSpace() throws Exception { final String model = "test linewrap space foo;"; final String expected = "test linewrap\nspace foo;"; assertFormattedPTC(expected, model); @@ -332,7 +333,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testDatatypeRules() throws Exception { + @Test public void testDatatypeRules() throws Exception { final String model = "test linewrap datatypes abc kw1 bcd def kw3;"; final String expected = "test linewrap\ndatatypes abc\nkw1\nbcd\ndef\nkw3;"; assertFormattedPTC(expected, model); @@ -341,7 +342,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testWrappingdatatype1() throws Exception { + @Test public void testWrappingdatatype1() throws Exception { final String model = "test wrappingdt foo kw1"; final String expected = "test wrappingdt foo kw1"; assertFormattedPTC(expected, model); @@ -350,7 +351,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testWrappingdatatype2() throws Exception { + @Test public void testWrappingdatatype2() throws Exception { final String model = "test wrappingdt foo bar kw1"; final String expected = "test wrappingdt foo bar kw1"; assertFormattedPTC(expected, model); @@ -359,7 +360,7 @@ public class FormatterTest extends AbstractXtextTests { assertPreserved(model); } - public void testWrappingdatatype3() throws Exception { + @Test public void testWrappingdatatype3() throws Exception { final String model = "test wrappingdt f\nb kw1"; final String expected = "test wrappingdt f\nb kw1"; assertFormattedPTC(expected, model); 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 5af08419a..ce8875414 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,21 +7,22 @@ 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.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.Serializer; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; public class XtextFormatterTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testXtextFormatting() throws IOException { + @Test public void testXtextFormatting() throws IOException { String path = getClass().getPackage().getName().replace('.', '/'); URI u = URI.createURI("classpath:/" + path + "/XtextFormatterMessy.xtext"); XtextResourceSet resourceSet = new XtextResourceSet(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java index 51d8cb0f6..e93ab9796 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/Bug305397Test.java @@ -7,18 +7,19 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.impl; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.parsetree.impl.bug305397.Element; import org.eclipse.xtext.parsetree.impl.bug305397.Model; +import org.junit.Test; /** * @author Sven Effting - Initial contribution and API */ public class Bug305397Test extends AbstractXtextTests { - public void testBug() throws Exception { + @Test public void testBug() throws Exception { with(new Bug305397StandaloneSetup()); Model model = (Model) getModel(" a element \n element X end\n element Y end \nend"); Element outer = model.getElements().get(0); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java index ed82a7207..07f39d6be 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTest.java @@ -13,7 +13,7 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; @@ -24,6 +24,7 @@ import org.eclipse.xtext.parsetree.reconstr.ICommentAssociater; import org.eclipse.xtext.parsetree.reconstr.Serializer; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.util.ReplaceRegion; +import org.junit.Test; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -34,12 +35,12 @@ import com.google.common.collect.Multimap; public class CommentAssociationTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(CommentAssociationTestLanguageStandaloneSetup.class); } - public void testCommentAssociation() throws Exception { + @Test public void testCommentAssociation() throws Exception { String textModel = "element x // comment post x\n" + "// comment pre y\n" + "element /* comment inside y */ y // comment post y\n" @@ -57,7 +58,7 @@ public class CommentAssociationTest extends AbstractXtextTests { checkComments(multimap, z, "// comment pre z\n"); } - public void testCommentAssociationAtEndOfFile() throws Exception { + @Test public void testCommentAssociationAtEndOfFile() throws Exception { String textModel = "element x // comment post x"; Model model = (Model) getModel(textModel); Multimap multimap = createModel2CommentMap(model); @@ -79,7 +80,7 @@ public class CommentAssociationTest extends AbstractXtextTests { return multimap; } - public void testCommentAssociationWithAction() throws Exception { + @Test public void testCommentAssociationWithAction() throws Exception { String textModel = "// comment pre x\n" + "element /* comment inside x */ x // comment post x\n" + "// comment pre y\n" @@ -99,7 +100,7 @@ public class CommentAssociationTest extends AbstractXtextTests { checkComments(multimap, z, "// comment pre z\n"); } - public void testSerializeReplacement() throws Exception { + @Test public void testSerializeReplacement() throws Exception { String xBlock = "// comment pre x\n" + "element /* comment inside x */ x // comment post x\n"; String yBlock = "// comment pre y\n" + "element /* comment inside y */ y // comment post y\n"; @@ -133,7 +134,7 @@ public class CommentAssociationTest extends AbstractXtextTests { } } - public void testCommentsAtEndOfFile() throws Exception { + @Test public void testCommentsAtEndOfFile() throws Exception { // the text-model without a trailing LB does not work // since the serializer does not know something about the terminal rules // String textModel = "element x // comment post x"; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java index 9c2a2c496..b07595119 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtilTest.java @@ -9,9 +9,10 @@ package org.eclipse.xtext.parsetree.impl; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -25,7 +26,7 @@ public class ParsetreeUtilTest extends AbstractXtextTests { private ICompositeNode parentMetamodelNode; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); modelAsString = "\n" + @@ -45,7 +46,7 @@ public class ParsetreeUtilTest extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { grammar = null; modelAsString = null; grammarNode = null; @@ -54,7 +55,7 @@ public class ParsetreeUtilTest extends AbstractXtextTests { super.tearDown(); } - public void testSetup() { + @Test public void testSetup() { assertNotNull(grammar); assertNotNull(grammarNode); assertNotNull(metamodelNode); @@ -63,110 +64,110 @@ public class ParsetreeUtilTest extends AbstractXtextTests { assertTrue(grammar.eResource().getErrors().isEmpty()); } - public void testLine_01() { + @Test public void testLine_01() { assertEquals(2, grammarNode.getStartLine()); } - public void testLine_02() { + @Test public void testLine_02() { assertEquals(4, metamodelNode.getStartLine()); } - public void testLine_03() { + @Test public void testLine_03() { assertEquals(4, parentMetamodelNode.getStartLine()); } - public void testTotalLine_01() { + @Test public void testTotalLine_01() { assertEquals(1, grammarNode.getTotalStartLine()); } - public void testTotalLine_02() { + @Test public void testTotalLine_02() { assertEquals(2, metamodelNode.getTotalStartLine()); } - public void testTotalLine_03() { + @Test public void testTotalLine_03() { assertEquals(2, parentMetamodelNode.getTotalStartLine()); } - public void testEndLine_01() { + @Test public void testEndLine_01() { assertEquals(8, grammarNode.getEndLine()); } - public void testEndLine_02() { + @Test public void testEndLine_02() { assertEquals(4, metamodelNode.getEndLine()); } - public void testEndLine_03() { + @Test public void testEndLine_03() { assertEquals(4, parentMetamodelNode.getEndLine()); } - public void testTotalEndLine_01() { + @Test public void testTotalEndLine_01() { assertEquals(11, grammarNode.getTotalEndLine()); } - public void testTotalEndLine_02() { + @Test public void testTotalEndLine_02() { assertEquals(4, metamodelNode.getEndLine()); } - public void testTotalEndLine_03() { + @Test public void testTotalEndLine_03() { assertEquals(4, parentMetamodelNode.getEndLine()); } - public void testOffset_01() { + @Test public void testOffset_01() { assertEquals(modelAsString.indexOf("grammar"), grammarNode.getOffset()); } - public void testOffset_02() { + @Test public void testOffset_02() { assertEquals(modelAsString.indexOf("generate"), metamodelNode.getOffset()); } - public void testOffset_03() { + @Test public void testOffset_03() { assertEquals(modelAsString.indexOf("generate"), parentMetamodelNode.getOffset()); } - public void testOffset_WithActionCreated() throws Exception { + @Test public void testOffset_WithActionCreated() throws Exception { with(new Bug305397StandaloneSetup()); assertEquals(modelAsString.indexOf("generate"), parentMetamodelNode.getOffset()); } - public void testTotalOffset_01() { + @Test public void testTotalOffset_01() { assertEquals(0, grammarNode.getTotalOffset()); } - public void testTotalOffset_02() { + @Test public void testTotalOffset_02() { assertEquals(modelAsString.indexOf("\n\ngenerate"), metamodelNode.getTotalOffset()); } - public void testTotalOffset_03() { + @Test public void testTotalOffset_03() { assertEquals(modelAsString.indexOf("\n\ngenerate"), parentMetamodelNode.getTotalOffset()); } - public void testLength_01() { + @Test public void testLength_01() { assertEquals(modelAsString.indexOf(';') - modelAsString.indexOf("grammar") + ";".length(), grammarNode.getLength()); } - public void testLength_02() { + @Test public void testLength_02() { assertEquals( modelAsString.indexOf("ParsetreeUtilTest\"") - modelAsString.indexOf("generate") + "ParsetreeUtilTest\"".length(), metamodelNode.getLength()); } - public void testLength_03() { + @Test public void testLength_03() { assertEquals( modelAsString.indexOf("ParsetreeUtilTest\"") - modelAsString.indexOf("generate") + "ParsetreeUtilTest\"".length(), parentMetamodelNode.getLength()); } - public void testTotalLength_01() { + @Test public void testTotalLength_01() { assertEquals(modelAsString.length(), grammarNode.getTotalLength()); } - public void testTotalLength_02() { + @Test public void testTotalLength_02() { assertEquals( modelAsString.indexOf("ParsetreeUtilTest\"") - modelAsString.indexOf("\n\ngenerate") + "ParsetreeUtilTest\"".length(), metamodelNode.getTotalLength()); } - public void testTotalLength_03() { + @Test public void testTotalLength_03() { assertEquals( modelAsString.indexOf("ParsetreeUtilTest\"") - modelAsString.indexOf("\n\ngenerate") + "ParsetreeUtilTest\"".length(), parentMetamodelNode.getTotalLength()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java index a26fbbaf1..18e2b7022 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/TransientContainerReferencesTest.java @@ -7,8 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.impl; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; @@ -16,13 +14,15 @@ import org.eclipse.xtext.parsetree.impl.crossContainment.CrossContainmentFactory import org.eclipse.xtext.parsetree.impl.crossContainment.CrossContainmentPackage; import org.eclipse.xtext.parsetree.impl.crossContainment.Element; import org.eclipse.xtext.parsetree.reconstr.impl.DefaultTransientValueService; +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class TransientContainerReferencesTest extends TestCase { +public class TransientContainerReferencesTest extends Assert { - public void testCrossResourceContainment() throws Exception { + @Test public void testCrossResourceContainment() throws Exception { Element parent = CrossContainmentFactory.eINSTANCE.createElement(); Element child = CrossContainmentFactory.eINSTANCE.createElement(); parent.getContainment().add(child); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java index 2e3ca46e8..5cc6be1c5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug285381Test.java @@ -7,11 +7,12 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.reconstr; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguageFactory; import org.eclipse.xtext.linking.langATestLanguage.Main; import org.eclipse.xtext.linking.langATestLanguage.Type; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -19,12 +20,12 @@ import org.eclipse.xtext.linking.langATestLanguage.Type; public class Bug285381Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LangATestLanguageStandaloneSetup.class); } - public void testDummy() { + @Test public void testDummy() { } public void _testSerializeReference_01() throws Exception { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java index a6d821aeb..45a6814b7 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug299395Test.java @@ -7,10 +7,11 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.reconstr; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.bug299395.Bug299395Factory; import org.eclipse.xtext.parsetree.reconstr.bug299395.Model; import org.eclipse.xtext.parsetree.reconstr.bug299395.SubModel; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -18,25 +19,25 @@ import org.eclipse.xtext.parsetree.reconstr.bug299395.SubModel; public class Bug299395Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(Bug299395TestLanguageStandaloneSetup.class); } - public void testSerialization() { + @Test public void testSerialization() { Model model = Bug299395Factory.eINSTANCE.createModel(); String serialized = getSerializer().serialize(model); assertEquals("", serialized); } - public void testSerialization_02() { + @Test public void testSerialization_02() { Model model = Bug299395Factory.eINSTANCE.createModel(); model.getStrings().add("Foo"); String serialized = getSerializer().serialize(model); assertEquals("{ \"Foo\" }", serialized); } - public void testSerialization_03() { + @Test public void testSerialization_03() { Model model = Bug299395Factory.eINSTANCE.createModel(); model.getStrings().add("Foo"); model.getStrings().add("Bar"); @@ -45,7 +46,7 @@ public class Bug299395Test extends AbstractXtextTests { assertEquals("{ \"Foo\" } { \"Bar\" } { \"Zonk\" }", serialized); } - public void testSerialization_04() { + @Test public void testSerialization_04() { Model model = Bug299395Factory.eINSTANCE.createModel(); model.getKeys().add("Key1"); model.getValues().add("Value1"); @@ -55,7 +56,7 @@ public class Bug299395Test extends AbstractXtextTests { assertEquals("[ \"Key1\" \"Value1\" \"Key2\" \"Value2\" ]", serialized); } - public void testSerialization_05() { + @Test public void testSerialization_05() { Model model = Bug299395Factory.eINSTANCE.createModel(); model.getStrings().add("Unused"); model.getKeys().add("Key1"); @@ -66,7 +67,7 @@ public class Bug299395Test extends AbstractXtextTests { assertEquals("{ \"Unused\" } [ \"Key1\" \"Value1\" \"Key2\" \"Value2\" ]", serialized); } - public void testSerialization_06() { + @Test public void testSerialization_06() { Model model = Bug299395Factory.eINSTANCE.createModel(); SubModel subModel = Bug299395Factory.eINSTANCE.createSubModel(); model.setSubModel(subModel); @@ -74,7 +75,7 @@ public class Bug299395Test extends AbstractXtextTests { assertEquals("subModel", serialized); } - public void testSerialization_07() { + @Test public void testSerialization_07() { Model model = Bug299395Factory.eINSTANCE.createModel(); SubModel subModel = Bug299395Factory.eINSTANCE.createSubModel(); model.setSubModel(subModel); @@ -83,7 +84,7 @@ public class Bug299395Test extends AbstractXtextTests { assertEquals("subModel 1 2 \"s1\"", serialized); } - public void testSerialization_08() { + @Test public void testSerialization_08() { Model model = Bug299395Factory.eINSTANCE.createModel(); SubModel subModel = Bug299395Factory.eINSTANCE.createSubModel(); model.setSubModel(subModel); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java index 7d032ffc6..a32c9117a 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128Test.java @@ -9,10 +9,11 @@ package org.eclipse.xtext.parsetree.reconstr; import java.io.ByteArrayOutputStream; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.bug302128.Model; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; /** * @author svenefftinge - Initial contribution and API @@ -21,7 +22,7 @@ import org.eclipse.xtext.util.StringInputStream; */ public class Bug302128Test extends AbstractXtextTests { - public void testTheBug2() throws Exception { + @Test public void testTheBug2() throws Exception { with(new Bug302128TestLanguageStandaloneSetup()); String text = "VARIABLE += value.val value2.val\n" + "VARIABLE2 += value3.val value4.val\n\n" diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java index 959ab98e3..86866e01e 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java @@ -12,12 +12,13 @@ import org.apache.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.tests.EmfAssert; import org.eclipse.xtext.util.EmfFormatter; +import org.junit.Test; public class ComplexReconstrTest extends AbstractXtextTests { @@ -25,7 +26,7 @@ public class ComplexReconstrTest extends AbstractXtextTests { .getLogger(ComplexReconstrTest.class); @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ComplexReconstrTestLanguageStandaloneSetup.class); } @@ -35,7 +36,7 @@ public class ComplexReconstrTest extends AbstractXtextTests { return false; } - public void testPrintGrammar() { + @Test public void testPrintGrammar() { XtextResourceSet rs = get(XtextResourceSet.class); rs.setClasspathURIContext(getClass()); URI u = URI @@ -51,12 +52,12 @@ public class ComplexReconstrTest extends AbstractXtextTests { } } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String model = "( a + b - c ) !"; assertEquals(model, parseAndSerialize(model)); } - public void testComplex() throws Exception { + @Test public void testComplex() throws Exception { String model = "( ( a + b ) ! - c + d + e + f - ( ^x + s ) - ( ( a + b ) ! - c ) ! ) !"; assertEquals(model, parseAndSerialize(model)); } @@ -68,22 +69,22 @@ public class ComplexReconstrTest extends AbstractXtextTests { return getSerializer().serialize(result, SaveOptions.defaultOptions()); } - public void testNormalizableCompositeNodesIncluded() throws Exception { + @Test public void testNormalizableCompositeNodesIncluded() throws Exception { reconstructAndCompare("a"); reconstructAndCompare("a + b"); } - public void testTrickyGSimple() throws Exception { + @Test public void testTrickyGSimple() throws Exception { String model = "TG [[2]]"; assertEquals(model, parseAndSerialize(model)); } - public void testTrickyGWithNull() throws Exception { + @Test public void testTrickyGWithNull() throws Exception { String model = "TG [0,[2,0],3,4,0]"; assertEquals(model, parseAndSerialize(model)); } - public void testTrickyGComplex() throws Exception { + @Test public void testTrickyGComplex() throws Exception { String model = "TG [2, [2,3,45,6],242,[23423,[34,34,[242343],234]]]"; assertEquals(model, parseAndSerialize(model)); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java index 801f8d64a..5762d83b8 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenAndTokenNodeIteratorTest.java @@ -7,8 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.reconstr; -import junit.framework.TestCase; - import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.impl.AbstractNode; @@ -19,18 +17,20 @@ import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder; import org.eclipse.xtext.parsetree.reconstr.impl.DefaultHiddenTokenHelper; import org.eclipse.xtext.parsetree.reconstr.impl.HiddenAndTokenNodeIterator; import org.eclipse.xtext.parsetree.reconstr.impl.TokenUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class HiddenAndTokenNodeIteratorTest extends TestCase { +public class HiddenAndTokenNodeIteratorTest extends Assert { private static final int NUM_NODES = 10; private INode[] nodes; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { nodes = new INode[NUM_NODES]; NodeModelBuilder builder = new NodeModelBuilder(); nodes[0] = new CompositeNode(); @@ -79,7 +79,7 @@ public class HiddenAndTokenNodeIteratorTest extends TestCase { } - public void testIterator() throws Exception { + @Test public void testIterator() throws Exception { HiddenAndTokenNodeIterator iterator = new HiddenAndTokenNodeIterator(nodes[0], getTokenUtil()); assertTrue(iterator.hasNext()); assertEquals(nodes[2], iterator.next()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java index 6beef030f..3f50857bb 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/HiddenTokensMergerTest.java @@ -1,7 +1,7 @@ package org.eclipse.xtext.parsetree.reconstr; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.Action1; import org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.AppendToFileEnd; import org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.Commentable; @@ -10,11 +10,12 @@ import org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.Hiddentokenmer import org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.RefList; import org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.ValueList; import org.eclipse.xtext.resource.SaveOptions; +import org.junit.Test; public class HiddenTokensMergerTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(HiddenTokensMergerTestLanguageStandaloneSetup.class); } @@ -27,45 +28,45 @@ public class HiddenTokensMergerTest extends AbstractXtextTests { assertEquals(model, r); } - public void testDatatypeBug286557a() throws Exception { + @Test public void testDatatypeBug286557a() throws Exception { assertRoundtrip("#1 a;"); } - public void testDatatypeBug286557b() throws Exception { + @Test public void testDatatypeBug286557b() throws Exception { assertRoundtrip("#1 a ref a;"); } - public void testDatatypeBug286557c() throws Exception { + @Test public void testDatatypeBug286557c() throws Exception { assertRoundtrip("#1 a.b.c;"); } - public void testDatatypeBug286557d() throws Exception { + @Test public void testDatatypeBug286557d() throws Exception { assertRoundtrip("#1 a.b.c ref a.b.c;"); } - public void testEnumBug() throws Exception { + @Test public void testEnumBug() throws Exception { assertRoundtrip("#2 kw1 array test"); } - public void testCommentable1() throws Exception { + @Test public void testCommentable1() throws Exception { Commentable model = (Commentable) getModel("#3\n /*a*/ item a\n /*b*/ item b\n /*c*/item c"); model.getItem().move(1, 2); assertEquals("#3\n /*a*/ item a /*c*/item c /*b*/ item b", serialize(model)); } - public void testCommentable2() throws Exception { + @Test public void testCommentable2() throws Exception { Commentable model = (Commentable) getModel("#3 /*a*/ item a /*b*/ item b /*c*/item c"); model.getItem().move(1, 2); assertEquals("#3 /*a*/ item a /*c*/item c /*b*/ item b", serialize(model)); } - public void testCommentable3() throws Exception { + @Test public void testCommentable3() throws Exception { Commentable model = (Commentable) getModel("#3 item a//a\n item b//b\n item c//c\n"); model.getItem().move(1, 2); assertEquals("#3 item a//a\n item c//c\n item b//b\n", serialize(model)); } - public void testCommentable4() throws Exception { + @Test public void testCommentable4() throws Exception { Commentable model = (Commentable) getModel("#3 /*a*/ item a /*b*/ item b /*c*/item c"); model.getItem().remove(1); CommentableItem i = HiddentokenmergertestFactory.eINSTANCE.createCommentableItem(); @@ -74,32 +75,32 @@ public class HiddenTokensMergerTest extends AbstractXtextTests { assertEquals("#3 /*a*/ item a /*c*/item c item foo", serialize(model)); } - public void testValueList1() throws Exception { + @Test public void testValueList1() throws Exception { ValueList model = (ValueList) getModel("#4 a. /* ab */ b c./*cd*/d e. /*ef*/f.g /*hi*/ .i"); model.getIds().move(1, 2); assertEquals("#4 a. /* ab */ b e. /*ef*/f.g /*hi*/ .i c./*cd*/d", serialize(model)); } - public void testRefList2() throws Exception { + @Test public void testRefList2() throws Exception { RefList model = (RefList) getModel("#5 a. b c.d e.f.g.i refs a./* ab */ b c./*cd*/ d e. /*ef*/f.g/*hi*/.i"); model.getRefs().move(1, 2); assertEquals("#5 a. b c.d e.f.g.i refs a./* ab */ b e. /*ef*/f.g/*hi*/.i c./*cd*/ d", serialize(model)); } - // public void testRefList3() throws Exception { + // @Test public void testRefList3() throws Exception { // RefList model = (RefList) getResourceFromStringAndExpect("#5 a.b refs x.y", 1).getContents().get(0); // assertEquals("#5 a. b c.d e.f.g.i refs a./* ab */ b e. /*ef*/f.g/*hi*/.i c./*cd*/ d", serialize(model)); // } // https://bugs.eclipse.org/bugs/show_bug.cgi?id=297938 - public void testAppendToEnd() throws Exception { + @Test public void testAppendToEnd() throws Exception { AppendToFileEnd model = (AppendToFileEnd) getModel("#7 class foo endclass"); model.getItems().add(HiddentokenmergertestFactory.eINSTANCE.createAppendToFileEndItem()); model.getItems().get(1).setName("bar"); assertEquals("#7 class foo endclass class bar endclass", serialize(model)); } - public void testAction1() throws Exception { + @Test public void testAction1() throws Exception { Action1 model = (Action1) getModel("#8 foo sub1 sub2"); assertEquals("#8 foo sub1 sub2", serialize(model)); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java index 0b813cac5..48c727136 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/NodeIteratorTest.java @@ -7,8 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.reconstr; -import junit.framework.TestCase; - import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.impl.AbstractNode; @@ -16,18 +14,20 @@ import org.eclipse.xtext.nodemodel.impl.CompositeNode; import org.eclipse.xtext.nodemodel.impl.LeafNode; import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder; import org.eclipse.xtext.parsetree.reconstr.impl.NodeIterator; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class NodeIteratorTest extends TestCase { +public class NodeIteratorTest extends Assert { private static final int NUM_NODES = 11; private INode[] nodes; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { NodeModelBuilder builder = new NodeModelBuilder(); nodes = new INode[NUM_NODES]; nodes[0] = new CompositeNode(); @@ -54,19 +54,19 @@ public class NodeIteratorTest extends TestCase { builder.addChild((ICompositeNode)nodes[0], (AbstractNode)nodes[10]); } - public void testForward() throws Exception { + @Test public void testForward() throws Exception { for (int i = 0; i < NUM_NODES; ++i) { checkAscending(i); } } - public void testBackward() throws Exception { + @Test public void testBackward() throws Exception { for (int i = 0; i < NUM_NODES; ++i) { checkDescending(i); } } - public void testPruneComposite() throws Exception { + @Test public void testPruneComposite() throws Exception { NodeIterator nodeIterator = new NodeIterator(nodes[3]); nodeIterator.prune(); assertEquals(nodes[6], nodeIterator.next()); @@ -75,7 +75,7 @@ public class NodeIteratorTest extends TestCase { assertEquals(nodes[2], nodeIterator.previous()); } - public void testPruneLeaf() throws Exception { + @Test public void testPruneLeaf() throws Exception { // pruning a leaf should not have any effect NodeIterator nodeIterator = new NodeIterator(nodes[8]); nodeIterator.prune(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java index 17590c6d8..6f2a44987 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/PartialSerializationTest.java @@ -8,9 +8,10 @@ package org.eclipse.xtext.parsetree.reconstr; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.partialserializationtest.NodeRoot; import org.eclipse.xtext.resource.SaveOptions; +import org.junit.Test; /** * @author Moritz Eysholdt @@ -19,7 +20,7 @@ import org.eclipse.xtext.resource.SaveOptions; public class PartialSerializationTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(PartialSerializationTestLanguageStandaloneSetup.class); } @@ -28,25 +29,25 @@ public class PartialSerializationTest extends AbstractXtextTests { return getSerializer().serialize(obj, SaveOptions.defaultOptions()); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String model = " #1 node test ( node subnode )"; NodeRoot root = (NodeRoot) getModel(model); assertEquals("node test ( node subnode )", doSerialize(root.getNode())); } - public void testSimpleSurroundComments1() throws Exception { + @Test public void testSimpleSurroundComments1() throws Exception { String model = "/* x1 */ #1 /* x2 */ node /* x3 */ test ( node subnode /* x4 */ ) /* x5 */"; NodeRoot root = (NodeRoot) getModel(model); assertEquals(model, doSerialize(root)); } - public void testSimpleSurroundComments2() throws Exception { + @Test public void testSimpleSurroundComments2() throws Exception { String model = "/* x1 */ #1 /* x2 */ node /* x3 */ test ( node subnode /* x4 */ ) /* x5 */"; NodeRoot root = (NodeRoot) getModel(model); assertEquals("/* x2 */ node /* x3 */ test ( node subnode /* x4 */ ) /* x5 */", doSerialize(root.getNode())); } - public void testSimpleSurroundComments3() throws Exception { + @Test public void testSimpleSurroundComments3() throws Exception { String model = "/* x1 */ #1 /* x2 */ node /* x3 */ test /* x4 */ ( /* x5 */ node /* x6 */ subnode /* x7 */ ) /* x8 */"; NodeRoot root = (NodeRoot) getModel(model); String ser = doSerialize(root.getNode().getChildren().get(0)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java index 61dafd081..374d737f3 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362Test.java @@ -7,11 +7,12 @@ *******************************************************************************/ package org.eclipse.xtext.parsetree.reconstr; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.Model; import org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.SerializationBug269362TestLanguageFactory; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -23,7 +24,7 @@ public class SerializationBug269362Test extends AbstractXtextTests { private Model model; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SerializationBug269362TestLanguageStandaloneSetup.class); resourceSet = get(XtextResourceSet.class); @@ -34,7 +35,7 @@ public class SerializationBug269362Test extends AbstractXtextTests { resource.getContents().add(model); } - public void testSerialize_01() throws Exception { + @Test public void testSerialize_01() throws Exception { model.setBar("bar"); model.setFoo("foo"); String result = serialize(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java index 190fc1db5..bbd9975d2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTest.java @@ -11,7 +11,7 @@ package org.eclipse.xtext.parsetree.reconstr; import java.io.IOException; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.TreeConstructionReport; import org.eclipse.xtext.parsetree.reconstr.impl.TokenStringBuffer; import org.eclipse.xtext.parsetree.reconstr.serializationerror.Indent; @@ -20,6 +20,7 @@ import org.eclipse.xtext.parsetree.reconstr.serializationerror.TwoOptions; import org.eclipse.xtext.parsetree.reconstr.serializationerror.TwoRequired; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; public class SerializationErrorTest extends AbstractXtextTests { @@ -30,7 +31,7 @@ public class SerializationErrorTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SerializationErrorTestLanguageStandaloneSetup.class); } @@ -51,7 +52,7 @@ public class SerializationErrorTest extends AbstractXtextTests { return r; } - public void testMissingElement() throws Exception { + @Test public void testMissingElement() throws Exception { Model m = (Model) getModel("tworequired a b"); // System.out.println(EmfFormatter.objToStr(m)); ((TwoRequired) m.getTest()).setOne(null); @@ -63,7 +64,7 @@ public class SerializationErrorTest extends AbstractXtextTests { assertTrue(r.toString(), r.toString().contains("TwoRequired.one is not set")); } - public void testValueConverterError() throws Exception { + @Test public void testValueConverterError() throws Exception { Model m = (Model) getModel("tworequired a b"); ((TwoRequired) m.getTest()).setOne("|nv4l|d"); TreeConstructionReport r = ser(m); @@ -71,7 +72,7 @@ public class SerializationErrorTest extends AbstractXtextTests { assertTrue(r.toString(), r.toString().contains("invalid characters")); } - public void testElementTooMuch() throws Exception { + @Test public void testElementTooMuch() throws Exception { Model m = (Model) getModel("twooptions one a"); // System.out.println(EmfFormatter.objToStr(m)); ((TwoOptions) m.getTest()).setTwo("b"); @@ -90,7 +91,7 @@ public class SerializationErrorTest extends AbstractXtextTests { } - public void testDeep() throws Exception { + @Test public void testDeep() throws Exception { Model m = (Model) getModel("{ twooptions one a { twooptions one a { twooptions one a }}}"); // System.out.println(EmfFormatter.objToStr(m)); Indent i = ((Indent) m.getTest()).getIndent().get(0).getIndent().get(0); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java index 004c9631c..dc69aba6d 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java @@ -9,11 +9,12 @@ package org.eclipse.xtext.parsetree.reconstr; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.simplerewritetest.EmptyObjectBug284850; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguageStandaloneSetup; +import org.junit.Test; public class SimpleReconstrTest extends AbstractXtextTests { @@ -23,27 +24,27 @@ public class SimpleReconstrTest extends AbstractXtextTests { return false; } - public void testSimple1() throws Exception { + @Test public void testSimple1() throws Exception { String model = "a b"; assertEquals(model, parseAndSerialize(model)); } - public void testSimple2() throws Exception { + @Test public void testSimple2() throws Exception { String model = "( a b ) !"; assertEquals(model, parseAndSerialize(model)); } - public void testFollowingHiddenTokens() throws Exception { + @Test public void testFollowingHiddenTokens() throws Exception { String model = "a "; assertEquals(model, parseAndSerialize(model)); } - public void testComplex() throws Exception { + @Test public void testComplex() throws Exception { String model = "( ( a b ) ! c d e f ( x s ) ( \t ( a \n\rb/*ffo \n bar */ ) ! c ) ! ) //holla\n!"; assertEquals(model, parseAndSerialize(model)); } - public void testComplex1() throws Exception { + @Test public void testComplex1() throws Exception { String model = "(a b) //holla\n!"; assertEquals(model, parseAndSerialize(model)); } @@ -58,60 +59,60 @@ public class SimpleReconstrTest extends AbstractXtextTests { return getSerializer().serialize(result, SaveOptions.defaultOptions()); } - public void testSimpleExpressions5() throws Exception { + @Test public void testSimpleExpressions5() throws Exception { with(SimpleExpressionsTestLanguageStandaloneSetup.class); String model = "a + b - c * d / e"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleExpressions1() throws Exception { + @Test public void testSimpleExpressions1() throws Exception { with(SimpleExpressionsTestLanguageStandaloneSetup.class); String model = "a + b - c"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleExpressions3() throws Exception { + @Test public void testSimpleExpressions3() throws Exception { with(SimpleExpressionsTestLanguageStandaloneSetup.class); String model = "a + (b - c)"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTwoNumbers() throws Exception { + @Test public void testSimpleTwoNumbers() throws Exception { String model = "2 45"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTwoNumbersWithDefault() throws Exception { + @Test public void testSimpleTwoNumbersWithDefault() throws Exception { String model = "0 45"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTwoNumbersWithDefault2() throws Exception { + @Test public void testSimpleTwoNumbersWithDefault2() throws Exception { String model = "0 45 # 0 # 1 # 2"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleManyStrings1() throws Exception { + @Test public void testSimpleManyStrings1() throws Exception { String model = "= \"xxx\" \"yyy\""; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleManyStrings2() throws Exception { + @Test public void testSimpleManyStrings2() throws Exception { String model = "= \"xxx\" \"yyy\" \"zzzz\""; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleAlternativeAssignment1() throws Exception { + @Test public void testSimpleAlternativeAssignment1() throws Exception { String model = "#2 mykeyword1"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleAlternativeBoolTrue() throws Exception { + @Test public void testSimpleAlternativeBoolTrue() throws Exception { String model = "#4 myoption kw blupp"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleAlternativeBoolFalse() throws Exception { + @Test public void testSimpleAlternativeBoolFalse() throws Exception { String model = "#4 kw blupp"; assertEquals(model, parseAndSerialize(model)); } @@ -137,119 +138,119 @@ public class SimpleReconstrTest extends AbstractXtextTests { assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient104() throws Exception { + @Test public void testSimpleTransient104() throws Exception { String model = "#5 *, 0"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient105() throws Exception { + @Test public void testSimpleTransient105() throws Exception { String model = "#5 *, 1"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient106() throws Exception { + @Test public void testSimpleTransient106() throws Exception { String model = "#5 *, *"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient107() throws Exception { + @Test public void testSimpleTransient107() throws Exception { String model = "#5 0, 0"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient108() throws Exception { + @Test public void testSimpleTransient108() throws Exception { String model = "#5 0, 1"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient109() throws Exception { + @Test public void testSimpleTransient109() throws Exception { String model = "#5 0, *"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient110() throws Exception { + @Test public void testSimpleTransient110() throws Exception { String model = "#5 1, 0"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient111() throws Exception { + @Test public void testSimpleTransient111() throws Exception { String model = "#5 1, 1"; assertEquals(model, parseAndSerialize(model)); } - public void testSimpleTransient112() throws Exception { + @Test public void testSimpleTransient112() throws Exception { String model = "#5 1, *"; assertEquals(model, parseAndSerialize(model)); } // FIXME: this depends on // https://bugs.eclipse.org/bugs/show_bug.cgi?id=250313 - public void testSimpleAlternativeAssignment2() throws Exception { + @Test public void testSimpleAlternativeAssignment2() throws Exception { String model = "#2 \"str\""; assertEquals(model, parseAndSerialize(model)); } - public void testCrossRef() throws Exception { + @Test public void testCrossRef() throws Exception { String model = "type A extends B type B extends A"; assertEquals(model, parseAndSerialize(model)); } - public void testSpare() throws Exception { + @Test public void testSpare() throws Exception { String model = "#3 foo1"; assertEquals(model, parseAndSerialize(model)); } - public void testConsume11() throws Exception { + @Test public void testConsume11() throws Exception { String model = "#6 v1 1 2 a"; assertEquals(model, parseAndSerialize(model)); } - public void testConsume12() throws Exception { + @Test public void testConsume12() throws Exception { String model = "#6 v2 a b 2"; assertEquals(model, parseAndSerialize(model)); } - public void testConsume21() throws Exception { + @Test public void testConsume21() throws Exception { String model = "#7 #6 v1 1 2 a"; assertEquals(model, parseAndSerialize(model)); } - public void testConsume22() throws Exception { + @Test public void testConsume22() throws Exception { String model = "#7 #6 v2 a b 2"; assertEquals(model, parseAndSerialize(model)); } - public void testLoop1() throws Exception { + @Test public void testLoop1() throws Exception { String model = "kw0 #8 abc kw1 ab kw30"; assertEquals("#8 abc ab kw30", parseAndSerialize(model)); } - public void testLoop2() throws Exception { + @Test public void testLoop2() throws Exception { String model = "#9 abc adad kw2 kw3 kw6"; assertEquals("#9 abc kw1 adad kw4 kw5", parseAndSerialize(model)); } - public void testLoop3() throws Exception { + @Test public void testLoop3() throws Exception { String model = "kw3 #10 adad kw4 abcde kw5 kw4 abc kw5"; assertEquals("kw1 #10 adad kw4 abcde kw5 kw4 abc kw5", parseAndSerialize(model)); } - public void testLoop4() throws Exception { + @Test public void testLoop4() throws Exception { String model = "#11 kw2 asd kw5 kw6"; assertEquals("#11 kw1 asd kw5", parseAndSerialize(model)); } - public void testLoopBug285452a() throws Exception { + @Test public void testLoopBug285452a() throws Exception { String model = "#12 interface test"; assertEquals(model, parseAndSerialize(model)); } - public void testLoopBug285452b() throws Exception { + @Test public void testLoopBug285452b() throws Exception { String model = "#12 class test"; assertEquals(model, parseAndSerialize(model)); } - public void testDuplicateBug284491() throws Exception { + @Test public void testDuplicateBug284491() throws Exception { String model = "#13 final static"; assertEquals(model, parseAndSerialize(model)); } @@ -263,39 +264,39 @@ public class SimpleReconstrTest extends AbstractXtextTests { assertEquals(model, actual); } - public void testMultiInheritanceBug280439() throws Exception { + @Test public void testMultiInheritanceBug280439() throws Exception { String model = "#15 a b"; EObject result = getModel(model); assertEquals(model, getSerializer().serialize(result, SaveOptions.defaultOptions())); } - public void testEObjectRef() throws Exception { + @Test public void testEObjectRef() throws Exception { String model = "#16 obj refs obj"; EObject result = getModel(model); assertEquals(model, getSerializer().serialize(result, SaveOptions.defaultOptions())); } - public void testTypeBug305577a() throws Exception { + @Test public void testTypeBug305577a() throws Exception { String model = "#17 ka foo"; assertEquals(model, parseAndSerialize(model)); } - public void testTypeBug305577b() throws Exception { + @Test public void testTypeBug305577b() throws Exception { String model = "#17 kb foo"; assertEquals(model, parseAndSerialize(model)); } - public void testTypeBug305577c() throws Exception { + @Test public void testTypeBug305577c() throws Exception { String model = "#18 ka foo"; assertEquals(model, parseAndSerialize(model)); } - public void testTypeBug305577d() throws Exception { + @Test public void testTypeBug305577d() throws Exception { String model = "#17 kb foo"; assertEquals(model, parseAndSerialize(model)); } - public void testBug305171() throws Exception { + @Test public void testBug305171() throws Exception { String model = "#19 kx a,b ky c,d foo"; assertEquals(model, parseAndSerialize(model)); @@ -318,24 +319,24 @@ public class SimpleReconstrTest extends AbstractXtextTests { assertEquals(model, parseAndSerialize(model)); } - public void testEnumBug310435Enum() throws Exception { + @Test public void testEnumBug310435Enum() throws Exception { String model = "#20 kw1 lit1 kw2 lit2 kw1 lit1 kw2 lit2 kw1 lit1 kw2 lit2"; assertEquals(model, parseAndSerialize(model)); } - public void testEnumBug310435Val() throws Exception { + @Test public void testEnumBug310435Val() throws Exception { String model = "#21 kw2 '234' kw1 foo kw2 '[]' kw1 bar"; assertEquals(model, parseAndSerialize(model)); } - public void testRefnameTest() throws Exception { + @Test public void testRefnameTest() throws Exception { String model = "#22 id1 id2 ID3 ID4 kw1 kw2 id1 kw3 ID3 kw2 id2 kw3 ID4"; assertEquals(model, parseAndSerialize(model)); } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SimpleReconstrTestLanguageStandaloneSetup.class); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java index d56124200..0faa128eb 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/TreeConstTest.java @@ -17,8 +17,9 @@ import org.eclipse.xtext.Group; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.TypeRef; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.impl.TreeConstructionNFAProvider; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Sets; @@ -31,7 +32,7 @@ public class TreeConstTest extends AbstractXtextTests { private TreeConstructionNFAProvider nfa = new TreeConstructionNFAProvider(); @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -67,44 +68,44 @@ public class TreeConstTest extends AbstractXtextTests { fail("Types '" + refs + "' are not expected. Actual:" + actual2 + " Expected: " + Joiner.on(", ").join(expected)); } - public void testSingleAssignment() throws Exception { + @Test public void testSingleAssignment() throws Exception { AbstractRule rule = parseRule("Model: name=ID;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Model"); } - public void testSingleAssignmentOrNull() throws Exception { + @Test public void testSingleAssignmentOrNull() throws Exception { AbstractRule rule = parseRule("Model: 'foo' name=ID?;"); Group group = (Group) rule.getAlternatives(); assertTypes(nfa.getNFA(group).getTypes(), "Model", "null"); assertTypes(nfa.getNFA(group.getElements().get(0)).getTypesToCheck()); } - public void testSingleAction1() throws Exception { + @Test public void testSingleAction1() throws Exception { AbstractRule rule = parseRule("Model: 'someKeyword' {Model};"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Model"); } - public void testSingleAction2() throws Exception { + @Test public void testSingleAction2() throws Exception { AbstractRule rule = parseRule("Model: 'someKeyword' {TypeRestriction};"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "TypeRestriction"); } - public void testMultiAction1() throws Exception { + @Test public void testMultiAction1() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1} | 'b' {Type2};"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Type1", "Type2"); } - public void testMultiAction2() throws Exception { + @Test public void testMultiAction2() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1} | 'b' {Type2} | 'c';"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Type1", "Type2", "null"); } - public void testMultiAction3() throws Exception { + @Test public void testMultiAction3() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1} | 'b' {Type2} | 'c' name=ID;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Type1", "Type2", "Model"); } - public void testMultiAction4() throws Exception { + @Test public void testMultiAction4() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1} | 'b' {Type2} | 'c' | name=ID;"); Alternatives alt = (Alternatives) rule.getAlternatives(); assertTypes(nfa.getNFA(alt).getTypes(), "Type1", "Type2", "Model", "null"); @@ -114,52 +115,52 @@ public class TreeConstTest extends AbstractXtextTests { assertTypes(nfa.getNFA(alt.getElements().get(3)).getTypesToCheck(), "Model"); } - public void testAssignedAction1() throws Exception { + @Test public void testAssignedAction1() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1.sub=current};"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Type1"); } - public void testAssignedAction2() throws Exception { + @Test public void testAssignedAction2() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1.sub=current} 'b' {Type2.sub=current};"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Type2"); } - public void testAssignedAction3() throws Exception { + @Test public void testAssignedAction3() throws Exception { AbstractRule rule = parseRule("Model: 'a' {Type1.sub=current} | 'b' {Type2.sub=current};"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Type1", "Type2"); } - public void testAssignedRuleCall() throws Exception { + @Test public void testAssignedRuleCall() throws Exception { AbstractRule rule = parseRule("Model: 'something' foo=Bar; Bar: name=ID;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Model"); } - public void testRuleCall1() throws Exception { + @Test public void testRuleCall1() throws Exception { AbstractRule rule = parseRule("Model: Foo; Foo: name=ID;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Foo"); } - public void testRuleCall2() throws Exception { + @Test public void testRuleCall2() throws Exception { AbstractRule rule = parseRule("Model: Foo | 'bar'; Foo: name=ID;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Foo", "null"); } - public void testRuleCall3() throws Exception { + @Test public void testRuleCall3() throws Exception { AbstractRule rule = parseRule("Model: Foo | 'bar' name=ID | 'null'; Foo: name=ID;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Foo", "Model", "null"); } - public void testRuleCall4() throws Exception { + @Test public void testRuleCall4() throws Exception { AbstractRule rule = parseRule("Model: Foo | Bar; Foo: name=ID; Bar: val=INT;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Foo", "Bar"); } - public void testRuleCall5() throws Exception { + @Test public void testRuleCall5() throws Exception { AbstractRule rule = parseRule("Model: (Foo | Bar) v2=ID v1=ID; Foo: name=ID; Bar: val=INT;"); assertTypes(nfa.getNFA(rule.getAlternatives()).getTypes(), "Foo", "Bar"); } - public void testExpression1() throws Exception { + @Test public void testExpression1() throws Exception { StringBuilder s = new StringBuilder(); s.append("Expression: Add; "); s.append("Add returns Expression: Mult ({Add.left=current} '+' right=Mult)?; "); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java index 45bcf0c32..ff5351ce5 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java @@ -1,35 +1,36 @@ package org.eclipse.xtext.parsetree.reconstr; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.SaveOptions; +import org.junit.Test; public class WhitespacePreservingCallbackTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ComplexReconstrTestLanguageStandaloneSetup.class); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { check("a"); } - public void testHiddenInBetween() throws Exception { + @Test public void testHiddenInBetween() throws Exception { check("a \t /* foo bar */ + b"); } // FIXME: Make this test work again -// public void testFail1() throws Exception { +// @Test public void testFail1() throws Exception { // IAstFactory f = getASTFactory(); // failsWith(f.create("Add"), XtextSerializationException.class); // } // FIXME: Make this test work again -// public void testFail2() throws Exception { +// @Test public void testFail2() throws Exception { // IAstFactory f = getASTFactory(); // EObject add = f.create("Add"); // diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java index 173256acc..d1e59b0f5 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/XtextGrammarReconcilationTest.java @@ -8,20 +8,21 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; public class XtextGrammarReconcilationTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); XtextStandaloneSetup.doSetup(); with(XtextStandaloneSetup.class); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { // this fails see bug #252181 String model = "grammar foo with org.eclipse.xtext.common.Terminals Honolulu : name=ID;"; @@ -45,7 +46,7 @@ public class XtextGrammarReconcilationTest extends AbstractXtextTests { assertEquals(expectedModel, result); } - public void testSelf() { + @Test public void testSelf() { Grammar g = getGrammarAccess().getGrammar(); for (AbstractRule r : g.getRules()) { // AbstractRule r = GrammarUtil.findRuleForName(g, "GrammarID"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java index 25b58d4db..bc34c25a7 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java @@ -1,8 +1,9 @@ package org.eclipse.xtext.parsetree.transientvalues; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API @@ -10,7 +11,7 @@ import org.eclipse.xtext.resource.XtextResource; public class TransientValuesTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(TransientValuesTestStandaloneSetup.class); } @@ -20,7 +21,7 @@ public class TransientValuesTest extends AbstractXtextTests { return false; } - public void testRequired1() throws Exception { + @Test public void testRequired1() throws Exception { final String model = "test required 1 1"; EObject m = getModel(model); // System.out.println(EmfFormater.objToStr(m, "")); @@ -28,21 +29,21 @@ public class TransientValuesTest extends AbstractXtextTests { assertEquals(model, s); } - public void testOptional1() throws Exception { + @Test public void testOptional1() throws Exception { final String in = "test optional 12"; final String out = "test optional"; String s = serialize(getModel(in)); assertEquals(out, s); } - public void testOptional2() throws Exception { + @Test public void testOptional2() throws Exception { final String in = "test optional 12:13"; final String out = "test optional"; String s = serialize(getModel(in)); assertEquals(out, s); } - public void testList() throws Exception { + @Test public void testList() throws Exception { final String in = "test list 1 2 3 4 5 6"; final String out = "test list 1 3 5"; String s = serialize(getModel(in)).trim(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java index 704bc94cd..74818617b 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTest.java @@ -1,7 +1,8 @@ package org.eclipse.xtext.parsetree.unassignedtext; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API @@ -9,7 +10,7 @@ import org.eclipse.xtext.resource.XtextResource; public class UnassignedTextTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(UnassignedTextTestLanguageStandaloneSetup.class); } @@ -19,56 +20,56 @@ public class UnassignedTextTest extends AbstractXtextTests { return false; } - public void testCaseInsensitiveKeyword() throws Exception { + @Test public void testCaseInsensitiveKeyword() throws Exception { final String in = "kEyWoRd 7"; final String out = "KeyWord 7"; String s = serialize(getModel(in)); assertEquals(out, s); } - public void testPlural1() throws Exception { + @Test public void testPlural1() throws Exception { final String in = "contents: 0 items"; final String out = "contents: 0 items"; String s = serialize(getModel(in)).trim(); assertEquals(out, s); } - public void testPlural2() throws Exception { + @Test public void testPlural2() throws Exception { final String in = "contents: 0 item"; final String out = "contents: 0 items"; String s = serialize(getModel(in)).trim(); assertEquals(out, s); } - public void testPlural3() throws Exception { + @Test public void testPlural3() throws Exception { final String in = "contents: 1 items"; final String out = "contents: 1 item"; String s = serialize(getModel(in)).trim(); assertEquals(out, s); } - public void testPlural4() throws Exception { + @Test public void testPlural4() throws Exception { final String in = "contents: 1 item"; final String out = "contents: 1 item"; String s = serialize(getModel(in)).trim(); assertEquals(out, s); } - public void testMulti() throws Exception { + @Test public void testMulti() throws Exception { final String in = "multi 1 accegj01 acddegj01 accehj11"; final String out = "multi 1 accegj01 accegj02 accegj03"; String s = serialize(getModel(in)).trim(); assertEquals(out, s); } - public void testDataType() throws Exception { + @Test public void testDataType() throws Exception { final String in = "datatype 3 'mystr'"; final String out = "datatype 3 str"; String s = serialize(getModel(in)).trim(); assertEquals(out, s); } - public void testCommonTerminals() throws Exception { + @Test public void testCommonTerminals() throws Exception { final String in = "terminals xyz 789 'yo' X"; final String out = "terminals abc 123 'abc' X"; String s = serialize(getModel(in)).trim(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java index 61c26c45e..314dc5405 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java @@ -12,9 +12,10 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; +import org.junit.Test; import com.google.common.collect.Lists; @@ -24,7 +25,7 @@ import com.google.common.collect.Lists; */ public class CommentOnEofBug_234135_Test extends AbstractXtextTests { - public void testCommentOnEof() throws Exception { + @Test public void testCommentOnEof() throws Exception { with(ReferenceGrammarTestLanguageStandaloneSetup.class); String model = "//comment"; List leafNodes = Lists.newArrayList(getRootNode(model).getLeafNodes()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java index 22197c748..41b15f939 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java @@ -8,17 +8,18 @@ *******************************************************************************/ package org.eclipse.xtext.reference; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; +import org.junit.Test; /** * @author Jan Köhnlein - Initial contribution and API */ public class LeafNodeBug_234132_Test extends AbstractXtextTests { - public void testLeafNodeBug() throws Exception { + @Test public void testLeafNodeBug() throws Exception { with(ReferenceGrammarTestLanguageStandaloneSetup.class); String model = readFileIntoString("org/eclipse/xtext/reference/leafNodeBug_234132.tst"); ICompositeNode rootNode = getRootNodeAndExpect(model, 1); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java index dbfd7af3a..5d34ad7e2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/Bug306325Test.java @@ -16,11 +16,12 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Factory; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parser.encoding.EncodingTestLanguageStandaloneSetup; import org.eclipse.xtext.parser.encoding.encodingTest.Model; import org.eclipse.xtext.parser.encoding.encodingTest.Word; import org.eclipse.xtext.util.ITextRegion; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -28,12 +29,12 @@ import org.eclipse.xtext.util.ITextRegion; public class Bug306325Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EncodingTestLanguageStandaloneSetup.class); } - public void testLocationInUtf8EncodedFile() throws Exception { + @Test public void testLocationInUtf8EncodedFile() throws Exception { performTestWithEncoding("UTF-8"); performTestWithEncoding("UTF-16"); performTestWithEncoding("ISO-8859-1"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java index 4bc76ec13..8a1c51a9e 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ClassloaderClasspathUriResolverTest.java @@ -12,27 +12,29 @@ package org.eclipse.xtext.resource; import java.net.URL; import java.net.URLClassLoader; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Before; +import org.junit.Test; -public class ClassloaderClasspathUriResolverTest extends TestCase { +public class ClassloaderClasspathUriResolverTest extends AbstractXtextTests { private ClassloaderClasspathUriResolver _resolver; @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { super.setUp(); _resolver = new ClassloaderClasspathUriResolver(); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put( "ecore", new XMIResourceFactoryImpl()); } - public void testClasspathUriForFile() { + @Test public void testClasspathUriForFile() { URI classpathUri = URI .createURI("classpath:/org/eclipse/xtext/resource/mydsl.ecore"); URL rootURL = getClass().getClassLoader().getResource( @@ -41,7 +43,7 @@ public class ClassloaderClasspathUriResolverTest extends TestCase { normalizeUriAndLoadResource(classpathUri, expectedUri); } - public void testClasspathUriForFileWithFragment() { + @Test public void testClasspathUriForFileWithFragment() { URI classpathUri = URI .createURI("classpath:/org/eclipse/xtext/resource/mydsl.ecore#/"); URL rootURL = getClass().getClassLoader().getResource( @@ -50,7 +52,7 @@ public class ClassloaderClasspathUriResolverTest extends TestCase { normalizeUriAndLoadResource(classpathUri, expectedUri); } - public void testClasspathUriForFileInJar() { + @Test public void testClasspathUriForFileInJar() { URI classpathUri = URI.createURI("classpath:/model/simple.ecore"); URL rootURL = getClass().getClassLoader().getResource( "model/simple.ecore"); @@ -58,7 +60,7 @@ public class ClassloaderClasspathUriResolverTest extends TestCase { normalizeUriAndLoadResource(classpathUri, expectedUri); } - public void testClasspathUriForFileInJarWithFragment() { + @Test public void testClasspathUriForFileInJarWithFragment() { URI classpathUri = URI.createURI("classpath:/model/simple.ecore#/"); URL rootURL = getClass().getClassLoader().getResource( "model/simple.ecore"); @@ -76,7 +78,7 @@ public class ClassloaderClasspathUriResolverTest extends TestCase { assertTrue("Resource not loaded", resource.isLoaded()); } - public void testBug293760() throws Exception { + @Test public void testBug293760() throws Exception { ClassloaderClasspathUriResolver resolver = new ClassloaderClasspathUriResolver(); URL resource = getClass().getResource("mydsl.ecore"); URL url = new URL(resource.toString().replace("mydsl.ecore", "some folder/")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java index 2a63625a0..615b92016 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ConcurrentAccessTest.java @@ -11,8 +11,6 @@ import java.io.File; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; @@ -27,13 +25,17 @@ import org.eclipse.emf.mwe.utils.StandaloneSetup; import org.eclipse.xtext.util.concurrent.AbstractReadWriteAcces; import org.eclipse.xtext.util.concurrent.IReadAccess; import org.eclipse.xtext.util.concurrent.IUnitOfWork; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.Lists; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class ConcurrentAccessTest extends TestCase { +public class ConcurrentAccessTest extends Assert { private Resource resource; @@ -41,9 +43,8 @@ public class ConcurrentAccessTest extends TestCase { new StandaloneSetup(); } - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { ResourceSet resourceSet = new ResourceSetImpl(); resource = new XtextResource(URI.createFileURI("something.ecore")); resourceSet.getResources().add(resource); @@ -75,19 +76,18 @@ public class ConcurrentAccessTest extends TestCase { } } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { resource = null; - super.tearDown(); } - public void testDummy() { + @Test public void testDummy() { assertEquals(1, resource.getResourceSet().getResources().size()); EcoreUtil.resolveAll(resource); assertEquals(101, resource.getResourceSet().getResources().size()); } - public void testResolveSingleThreaded() { + @Test public void testResolveSingleThreaded() { ResourceSet resourceSet = new ResourceSetImpl(); resourceSet.getResources().add(resource); assertEquals(1, resourceSet.getResources().size()); @@ -105,7 +105,7 @@ public class ConcurrentAccessTest extends TestCase { assertEquals(101, resourceSet.getResources().size()); } - public void testMultiThreaded() throws InterruptedException { + @Test public void testMultiThreaded() throws InterruptedException { ResourceSet resourceSet = new XtextResourceSet(); resourceSet.getResources().add(resource); boolean wasOk = resolveAllSupertypesMultithreaded((EPackage) resource.getContents().get(0)); @@ -114,7 +114,7 @@ public class ConcurrentAccessTest extends TestCase { assertFalse("unresolvedProxy", wasOk); } - public void testMultiThreadedSynchronized() throws InterruptedException { + @Test public void testMultiThreadedSynchronized() throws InterruptedException { ResourceSet resourceSet = new SynchronizedXtextResourceSet(); resourceSet.getResources().add(resource); boolean wasOk = resolveAllSupertypesMultithreaded((EPackage) resource.getContents().get(0)); @@ -122,7 +122,7 @@ public class ConcurrentAccessTest extends TestCase { assertTrue("unresolvedProxy", wasOk); } - public void testMultiThreadedUnitOfWork() throws InterruptedException { + @Test public void testMultiThreadedUnitOfWork() throws InterruptedException { ResourceSet resourceSet = new XtextResourceSet(); resourceSet.getResources().add(resource); boolean wasOk = resolveAllSupertypesStateAccess((EPackage) resource.getContents().get(0)); @@ -131,7 +131,7 @@ public class ConcurrentAccessTest extends TestCase { assertFalse("unresolvedProxy", wasOk); } - public void testMultiThreadedSynchronizedUnitOfWork() throws InterruptedException { + @Test public void testMultiThreadedSynchronizedUnitOfWork() throws InterruptedException { ResourceSet resourceSet = new SynchronizedXtextResourceSet(); resourceSet.getResources().add(resource); boolean wasOk = resolveAllSupertypesStateAccess((EPackage) resource.getContents().get(0)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java index 873d76abc..7a9306e2b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/DerivedStateAwareResourceTest.java @@ -10,7 +10,8 @@ package org.eclipse.xtext.resource; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EcoreFactory; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -26,7 +27,7 @@ public class DerivedStateAwareResourceTest extends AbstractXtextTests { } } - public void testInitialization() throws Exception { + @Test public void testInitialization() throws Exception { TestedResource resource = new TestedResource(); assertTrue(resource.getContents().isEmpty()); resource.setDerivedStateComputer(new IDerivedStateComputer() { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java index 4a7349ff4..c64e4b44d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTest.java @@ -8,12 +8,13 @@ package org.eclipse.xtext.resource; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.Foo; import org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.FooBar; import org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.Model; import org.eclipse.xtext.util.TextRegion; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -29,19 +30,19 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { private EObjectAtOffsetHelper eObjectAtOffsetHelper; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(EObjectAtOffsetTestLanguageStandaloneSetup.class); eObjectAtOffsetHelper = new EObjectAtOffsetHelper(); } - public void testBug349626() throws Exception { + @Test public void testBug349626() throws Exception { String modelAsString = "foo foo0"; XtextResource resource = getResourceFromString(modelAsString); assertNull(eObjectAtOffsetHelper.resolveCrossReferencedElementAt(resource, modelAsString.length())); } - public void testElements() throws Exception { + @Test public void testElements() throws Exception { String modelAsString = "foo foo0 bar bar0 foo0 bar bar1 foo0"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -50,7 +51,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkContainedElementAt(resource, modelAsString, "bar bar1 ", model.getBars().get(1)); } - public void testCrossRefs_01() throws Exception { + @Test public void testCrossRefs_01() throws Exception { String modelAsString = "bar bar0 foo0 bar bar1 foo1,foo2 foo foo0 foo foo1 foo foo2"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -59,7 +60,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkCrossReferencedElementAt(resource, modelAsString, "foo2 ", model.getFoos().get(2)); } - public void testCrossRefs_02() throws Exception { + @Test public void testCrossRefs_02() throws Exception { String modelAsString = "zonk bar bar0 foo0 bar bar1 foo1,foo2 foo foo0 foo foo1 foo foo2"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -68,7 +69,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkCrossReferencedElementAt(resource, modelAsString, "foo2 ", model.getFoos().get(2)); } - public void testCrossRefsAfterUnassignedRuleCall_01() throws Exception { + @Test public void testCrossRefsAfterUnassignedRuleCall_01() throws Exception { String modelAsString = "bar bar0 foo0 foo1 foo foo0 foo foo1"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -76,7 +77,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkCrossReferencedElementAt(resource, modelAsString, "foo1", model.getFoos().get(1)); } - public void testCrossRefsAfterUnassignedRuleCall_02() throws Exception { + @Test public void testCrossRefsAfterUnassignedRuleCall_02() throws Exception { String modelAsString = "zonk 1 bar bar0 foo0 foo1 foo foo0 foo foo1"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -84,7 +85,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkCrossReferencedElementAt(resource, modelAsString, "foo1", model.getFoos().get(1)); } - public void testCrossRefsAfterAction_01() throws Exception { + @Test public void testCrossRefsAfterAction_01() throws Exception { String modelAsString = "bar bar0 foo0 foobar foo1 foo2 foo foo0 foo foo1 foo foo2"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -93,7 +94,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkCrossReferencedElementAt(resource, modelAsString, "foo2", model.getFoos().get(2)); } - public void testCrossRefsAfterAction_02() throws Exception { + @Test public void testCrossRefsAfterAction_02() throws Exception { String modelAsString = "zonk 1 bar bar0 foo0 foobar foo1 foo2 foo foo0 foo foo1 foo foo2"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -102,7 +103,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkCrossReferencedElementAt(resource, modelAsString, "foo2", model.getFoos().get(2)); } - public void testAction() throws Exception { + @Test public void testAction() throws Exception { String modelAsString = "bar bar0 foo0 foobar foo1 foo foo0 foo foo1"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -112,7 +113,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkContainedElementAt(resource, modelAsString, "bar bar0 ", ((FooBar) model.getBars().get(0)).getBar()); } - public void testAction_02() throws Exception { + @Test public void testAction_02() throws Exception { String modelAsString = "zonk 1 bar bar0 foo0 foobar foo1 foo foo0 foo foo1"; XtextResource resource = getResourceFromString(modelAsString); Model model = (Model) resource.getContents().get(0); @@ -122,7 +123,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { checkContainedElementAt(resource, modelAsString, "bar bar0 ", ((FooBar) model.getBars().get(0)).getBar()); } - public void testFindCrossReferencedElementAt() throws Exception { + @Test public void testFindCrossReferencedElementAt() throws Exception { String firstPart = "foo Foo1 foo Foo2 zonk bar Bar1 Foo1"; String modelAsString = firstPart+",Foo2"; XtextResource resource = getResourceFromString(modelAsString); @@ -132,7 +133,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { assertEquals("Foo1", foo1.getName()); } - public void testFindCrossReferencedElementAt_1() throws Exception { + @Test public void testFindCrossReferencedElementAt_1() throws Exception { String firstPart = "foo Foo1=X.Y foo Foo2=X.Y zonk bar Bar1 Foo1=X.Y"; String modelAsString = firstPart+",Foo2=X.Y"; XtextResource resource = getResourceFromString(modelAsString); @@ -142,7 +143,7 @@ public class EObjectAtOffsetTest extends AbstractXtextTests { assertEquals("Foo1=X.Y", foo1.getName()); } - public void testGetCrossReferenceNode() throws Exception { + @Test public void testGetCrossReferenceNode() throws Exception { String firstPart = "foo Foo1=X.Y foo Foo2=X.Y zonk bar Bar1 Foo1=X.Y"; String modelAsString = firstPart+",Foo2=X.Y"; XtextResource resource = getResourceFromString(modelAsString); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java index da68bf4d7..ae1067e86 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ExternalContentSupportTest.java @@ -18,8 +18,9 @@ import org.eclipse.emf.ecore.resource.URIHandler; import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.IExternalContentSupport.IExternalContentProvider; +import org.junit.Test; import com.google.common.collect.Maps; @@ -32,7 +33,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE private ExternalContentSupport support; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); uriToContent = Maps.newHashMap(); @@ -40,7 +41,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { uriToContent = null; support = null; super.tearDown(); @@ -58,13 +59,13 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE return this; } - public void testConfigureConverter() { + @Test public void testConfigureConverter() { URIConverter converter = new ExtensibleURIConverterImpl(); support.configureConverter(converter, this); checkConverter(converter); } - public void testConfigureResourceSet() { + @Test public void testConfigureResourceSet() { XtextResourceSet resourceSet = get(XtextResourceSet.class); support.configureResourceSet(resourceSet, this); checkConverter(resourceSet.getURIConverter()); @@ -77,7 +78,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE } } - public void testGetResource_01() { + @Test public void testGetResource_01() { XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setClasspathURIContext(getClass()); support.configureResourceSet(resourceSet, this); @@ -87,7 +88,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE assertEquals("org.eclipse.xtext.Xtext", ((Grammar) resource.getContents().get(0)).getName()); } - public void testGetResource_02() { + @Test public void testGetResource_02() { String grammarInstead = "grammar org.foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate something 'http://something'\n" + "Model: name=ID;"; @@ -102,7 +103,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE assertEquals("org.foo.bar", ((Grammar) resource.getContents().get(0)).getName()); } - public void testGetResource_03() { + @Test public void testGetResource_03() { String grammarInstead = "grammar org.foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate something 'http://something'\n" + "Model: name=ID;"; @@ -118,7 +119,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE assertEquals("org.foo.bar", ((Grammar) resource.getContents().get(0)).getName()); } - public void testCreateResource_01() throws IOException { + @Test public void testCreateResource_01() throws IOException { XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setClasspathURIContext(getClass()); support.configureResourceSet(resourceSet, this); @@ -130,7 +131,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE assertEquals("org.eclipse.xtext.Xtext", ((Grammar) resource.getContents().get(0)).getName()); } - public void testCreateResource_02() throws IOException { + @Test public void testCreateResource_02() throws IOException { String grammarInstead = "grammar org.foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate something 'http://something'\n" + "Model: name=ID;"; @@ -147,7 +148,7 @@ public class ExternalContentSupportTest extends AbstractXtextTests implements IE assertEquals("org.foo.bar", ((Grammar) resource.getContents().get(0)).getName()); } - public void testCreateResource_03() throws IOException { + @Test public void testCreateResource_03() throws IOException { String grammarInstead = "grammar org.foo.bar with org.eclipse.xtext.common.Terminals\n" + "generate something 'http://something'\n" + "Model: name=ID;"; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java index 8e08414bd..80ff656dd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/LocationInFileProviderTest.java @@ -10,7 +10,7 @@ package org.eclipse.xtext.resource; import java.util.List; import org.eclipse.emf.common.util.EList; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.locationprovidertest.Bus; import org.eclipse.xtext.resource.locationprovidertest.Component; import org.eclipse.xtext.resource.locationprovidertest.Element; @@ -19,6 +19,7 @@ import org.eclipse.xtext.resource.locationprovidertest.Mode; import org.eclipse.xtext.resource.locationprovidertest.Model; import org.eclipse.xtext.resource.locationprovidertest.Processor; import org.eclipse.xtext.util.ITextRegion; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -31,7 +32,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { private ILocationInFileProvider locationInFileProvider; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LocationProviderTestLanguageStandaloneSetup.class); modelAsString = @@ -52,7 +53,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { elements = null; modelAsString = null; model = null; @@ -60,7 +61,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { super.tearDown(); } - public void testContainmentRefSignificantLocation() throws Exception { + @Test public void testContainmentRefSignificantLocation() throws Exception { assertEquals(2, elements.size()); ITextRegion location = locationInFileProvider.getSignificantTextRegion(model, LocationprovidertestPackage.Literals.MODEL__ELEMENTS, 0); assertEquals(modelAsString.indexOf("x"), location.getOffset()); @@ -74,7 +75,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals(modelAsString.length(), location.getLength()); } - public void testCrossRefSignificantLocation() throws Exception { + @Test public void testCrossRefSignificantLocation() throws Exception { assertEquals(2, elements.size()); int indexOfFirstY = modelAsString.indexOf("y"); int indexOfSecondY = modelAsString.indexOf("y", indexOfFirstY + 1); @@ -98,7 +99,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals(1, location.getLength()); } - public void testEObjectSignificantLocation() throws Exception { + @Test public void testEObjectSignificantLocation() throws Exception { assertEquals(2, elements.size()); ITextRegion location = locationInFileProvider.getSignificantTextRegion(elements.get(0)); assertEquals(modelAsString.indexOf("x"), location.getOffset()); @@ -108,7 +109,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals(1, location.getLength()); } - public void testAttributeSignificantLocation() { + @Test public void testAttributeSignificantLocation() { assertEquals(2, elements.size()); ITextRegion location = locationInFileProvider.getSignificantTextRegion(elements.get(0), LocationprovidertestPackage.Literals.ELEMENT__NAME, 0); assertEquals(modelAsString.indexOf("x"), location.getOffset()); @@ -119,7 +120,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals(1, location.getLength()); } - public void testContainmentRefFullLocation() throws Exception { + @Test public void testContainmentRefFullLocation() throws Exception { assertEquals(2, elements.size()); ITextRegion location = locationInFileProvider.getFullTextRegion(model, LocationprovidertestPackage.Literals.MODEL__ELEMENTS, 0); assertEquals(0, location.getOffset()); @@ -133,7 +134,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals(modelAsString.length(), location.getLength()); } - public void testCrossRefFullLocation() throws Exception { + @Test public void testCrossRefFullLocation() throws Exception { assertEquals(2, elements.size()); int indexOfFirstY = modelAsString.indexOf("y"); int indexOfSecondY = modelAsString.indexOf("y", indexOfFirstY + 1); @@ -157,7 +158,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals(modelAsString.indexOf(" element y"), location.getLength()); } - public void testEObjectFullLocation() throws Exception { + @Test public void testEObjectFullLocation() throws Exception { assertEquals(2, elements.size()); ITextRegion location = locationInFileProvider.getFullTextRegion(elements.get(0)); assertEquals(modelAsString.indexOf("element x"), location.getOffset()); @@ -167,7 +168,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals("element y".length(), location.getLength()); } - public void testAttributeFullLocation() { + @Test public void testAttributeFullLocation() { assertEquals(2, elements.size()); ITextRegion location = locationInFileProvider.getFullTextRegion(elements.get(0), LocationprovidertestPackage.Literals.ELEMENT__NAME, 0); assertEquals(modelAsString.indexOf("x"), location.getOffset()); @@ -178,14 +179,14 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals("y".length(), location.getLength()); } - public void testBug353969_Setup() throws Exception { + @Test public void testBug353969_Setup() throws Exception { EList components = model.getComponents(); assertEquals(2, components.size()); assertTrue(components.get(0) instanceof Processor); assertTrue(components.get(1) instanceof Bus); } - public void testBug353969_01() throws Exception { + @Test public void testBug353969_01() throws Exception { Processor p = (Processor) model.getComponents().get(0); EList modes = p.getMode(); assertEquals(2, modes.size()); @@ -198,7 +199,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals("m1".length(), m1SignificantRegion.getLength()); } - public void testBug353969_02() throws Exception { + @Test public void testBug353969_02() throws Exception { Processor p = (Processor) model.getComponents().get(0); EList modes = p.getMode(); assertEquals(2, modes.size()); @@ -211,7 +212,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals("m2".length(), m2SignificantRegion.getLength()); } - public void testBug353969_03() throws Exception { + @Test public void testBug353969_03() throws Exception { Bus b = (Bus) model.getComponents().get(1); EList modes = b.getMode(); assertEquals(2, modes.size()); @@ -224,7 +225,7 @@ public class LocationInFileProviderTest extends AbstractXtextTests { assertEquals("mb1".length(), mb1SignificantRegion.getLength()); } - public void testBug353969_04() throws Exception { + @Test public void testBug353969_04() throws Exception { Bus b = (Bus) model.getComponents().get(1); EList modes = b.getMode(); assertEquals(2, modes.size()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java index 60e5ec5ce..83f26d5ff 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ResourceSetReferencingResourceSetTest.java @@ -7,21 +7,21 @@ *******************************************************************************/ package org.eclipse.xtext.resource; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API */ -public class ResourceSetReferencingResourceSetTest extends TestCase { +public class ResourceSetReferencingResourceSetTest extends Assert { - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { ResourceSetReferencingResourceSetImpl set1 = new ResourceSetReferencingResourceSetImpl(); Resource resource = getResource("foo1","foo2"); set1.getResources().add(resource); @@ -40,7 +40,7 @@ public class ResourceSetReferencingResourceSetTest extends TestCase { } - public void testNotTranitive() throws Exception { + @Test public void testNotTranitive() throws Exception { ResourceSetReferencingResourceSetImpl set1 = new ResourceSetReferencingResourceSetImpl(); Resource resource = getResource("foo1","foo3"); set1.getResources().add(resource); @@ -58,7 +58,7 @@ public class ResourceSetReferencingResourceSetTest extends TestCase { assertTrue(((InternalEObject)eClass).eIsProxy()); } - public void testShadowing() throws Exception { + @Test public void testShadowing() throws Exception { ResourceSetReferencingResourceSetImpl set1 = new ResourceSetReferencingResourceSetImpl(); Resource resource = getResource("foo1","foo2"); set1.getResources().add(resource); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java index 4c5ba65ea..0a0ddae97 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourcePerformanceTest.java @@ -7,8 +7,9 @@ *******************************************************************************/ package org.eclipse.xtext.resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -21,7 +22,7 @@ public class XtextResourcePerformanceTest extends AbstractXtextTests { private String model; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ReferenceGrammarTestLanguageStandaloneSetup.class); StringBuilder modelBuilder = new StringBuilder(NUM_ELEMENTS * 64); @@ -38,7 +39,7 @@ public class XtextResourcePerformanceTest extends AbstractXtextTests { model = modelBuilder.toString(); } - public void testLoad() throws Exception { + @Test public void testLoad() throws Exception { XtextResource resource = getResourceFromString(model); assertNotNull(resource); assertFalse(resource.getParseResult().hasSyntaxErrors()); @@ -46,7 +47,7 @@ public class XtextResourcePerformanceTest extends AbstractXtextTests { assertTrue(resource.getErrors().isEmpty()); } - public void testLoadModelWithLinkingErrors() throws Exception { + @Test public void testLoadModelWithLinkingErrors() throws Exception { StringBuilder modelBuilder = new StringBuilder(NUM_ELEMENTS * 64); modelBuilder.append("spielplatz " + NUM_ELEMENTS + " {\n"); for (int i = 1; i <= NUM_ELEMENTS; i++) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java index a30357581..22f62f72e 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/XtextResourceTest.java @@ -10,12 +10,13 @@ package org.eclipse.xtext.resource; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.parser.antlr.IReferableElementsUnloader; import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup; import org.eclipse.xtext.util.Wrapper; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -28,13 +29,13 @@ public class XtextResourceTest extends AbstractXtextTests { private final String simpleModel = "spielplatz 1 { kind ( Bob 0 ) }"; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ReferenceGrammarTestLanguageStandaloneSetup.class); resource = getResourceFromString(""); } - public void testInitialState() throws Exception { + @Test public void testInitialState() throws Exception { assertNotNull(resource); assertTrue(resource.isLoaded()); assertFalse("resource.isTrackingModification()", resource.isTrackingModification()); @@ -50,36 +51,36 @@ public class XtextResourceTest extends AbstractXtextTests { assertNull(parseResult.getRootASTElement()); } - public void testModify_01() throws Exception { + @Test public void testModify_01() throws Exception { resource.update(0, 0, simpleModel); assertFalse(resource.isModified()); } - public void testModify_02() throws Exception { + @Test public void testModify_02() throws Exception { resource.reparse(simpleModel); assertFalse(resource.isModified()); } - public void testModify_03() throws Exception { + @Test public void testModify_03() throws Exception { resource.reparse(simpleModel); assertFalse(resource.isModified()); modifySpielplatz(); assertFalse(resource.isModified()); } - public void testModify_04() throws Exception { + @Test public void testModify_04() throws Exception { resource.setTrackingModification(true); resource.update(0, 0, simpleModel); assertTrue(resource.isModified()); } - public void testModify_05() throws Exception { + @Test public void testModify_05() throws Exception { resource.setTrackingModification(true); resource.reparse(simpleModel); assertFalse(resource.isModified()); } - public void testModify_06() throws Exception { + @Test public void testModify_06() throws Exception { resource.setTrackingModification(true); resource.reparse(simpleModel); assertFalse(resource.isModified()); @@ -97,7 +98,7 @@ public class XtextResourceTest extends AbstractXtextTests { obj.eSet(feature, 3); } - public void testUnload() throws Exception { + @Test public void testUnload() throws Exception { resource.reparse(simpleModel); IParseResult parseResult = resource.getParseResult(); resource.unload(); @@ -105,7 +106,7 @@ public class XtextResourceTest extends AbstractXtextTests { assertTrue(parseResult.getRootASTElement().eIsProxy()); } - public void testUnloadReferables() throws Exception { + @Test public void testUnloadReferables() throws Exception { resource.reparse(simpleModel); final Wrapper unloaded = Wrapper.wrap(Boolean.FALSE); resource.setUnloader(new IReferableElementsUnloader() { @@ -117,7 +118,7 @@ public class XtextResourceTest extends AbstractXtextTests { assertTrue("unloaded", unloaded.get()); } - public void testUpdate() throws Exception { + @Test public void testUpdate() throws Exception { resource.update(0, 0, simpleModel); IParseResult parseResult = resource.getParseResult(); @@ -128,7 +129,7 @@ public class XtextResourceTest extends AbstractXtextTests { assertNotNull(parseResult.getRootASTElement()); } - public void testErrorMarkers() throws Exception { + @Test public void testErrorMarkers() throws Exception { String model = "spielplatz 1 {kind(B 1) erwachsener(E 1) familie(F E E B, C)}"; resource.update(0, 0, model); EcoreUtil.resolveAll(resource); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java index 762509896..945e7b88f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/containers/StateBasedContainerTest.java @@ -16,6 +16,8 @@ import org.eclipse.xtext.resource.impl.ChangedResourceDescriptionDelta; import org.eclipse.xtext.resource.impl.ResourceDescriptionChangeEvent; import org.eclipse.xtext.resource.impl.ResourceDescriptionsBasedContainer; import org.eclipse.xtext.resource.impl.ResourceDescriptionsBasedContainerTest; +import org.junit.After; +import org.junit.Test; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; @@ -28,15 +30,14 @@ public class StateBasedContainerTest extends ResourceDescriptionsBasedContainerT private boolean simulateEmpty; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); simulateEmpty = false; } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { simulateEmpty = false; - super.tearDown(); } @Override @@ -57,7 +58,7 @@ public class StateBasedContainerTest extends ResourceDescriptionsBasedContainerT } @Override - public void testBug352214() { + @Test public void testBug352214() { container.getResourceDescriptions(); // initialize uri map ResourceDescriptionChangeEvent event = new ResourceDescriptionChangeEvent(Collections.singletonList( new ChangedResourceDescriptionDelta(resourceDescription, null)), null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java index 6e4c6dbf1..615aefcee 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/EcoreResourceDescriptionManagerTest.java @@ -13,8 +13,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map; -import junit.framework.TestCase; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.ENamedElement; @@ -32,6 +30,8 @@ import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.IResourceDescription; import org.eclipse.xtext.resource.generic.GenericResourceDescriptionManager; +import org.junit.Assert; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -43,20 +43,20 @@ import com.google.inject.Injector; * @author Sven Efftinge - Initial contribution and API * @author Jan Koehnlein */ -public class EcoreResourceDescriptionManagerTest extends TestCase { +public class EcoreResourceDescriptionManagerTest extends Assert { private GenericResourceDescriptionManager getEmfResourceDescriptionsManager() { Injector injector = Guice.createInjector(new EcoreRuntimeModule()); return injector.getInstance(GenericResourceDescriptionManager.class); } - public void testEcore() throws Exception { + @Test public void testEcore() throws Exception { Map index = createIndex(EcorePackage.eINSTANCE.eResource()); checkEcore(index, "ecore", false); checkEcore(index, EcorePackage.eNS_URI, true); } - public void testNestedPackage() throws Exception { + @Test public void testNestedPackage() throws Exception { Resource resource = new XMIResourceImpl(); EPackage parent = EcoreFactory.eINSTANCE.createEPackage(); parent.setName("parent"); @@ -79,7 +79,7 @@ public class EcoreResourceDescriptionManagerTest extends TestCase { assertEquals(6,index.size()); } - public void testMissingNsURI() { + @Test public void testMissingNsURI() { Resource resource = new XMIResourceImpl(); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName("test"); @@ -93,7 +93,7 @@ public class EcoreResourceDescriptionManagerTest extends TestCase { assertEquals(2,index.size()); } - public void testMissingName() { + @Test public void testMissingName() { Resource resource = new XMIResourceImpl(); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setNsURI("http://test"); @@ -107,7 +107,7 @@ public class EcoreResourceDescriptionManagerTest extends TestCase { assertEquals(2,index.size()); } - public void testMissingMiddleName() { + @Test public void testMissingMiddleName() { Resource resource = new XMIResourceImpl(); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName("test"); @@ -165,7 +165,7 @@ public class EcoreResourceDescriptionManagerTest extends TestCase { return index; } - public void testPerformance() throws Exception { + @Test public void testPerformance() throws Exception { GenericResourceDescriptionManager manager = getEmfResourceDescriptionsManager(); Collection uris = ImmutableList.copyOf(EPackage.Registry.INSTANCE.keySet()); for(String uri: uris) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java index 0f7db9ed6..29bd07572 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ecore/XMLEncodingProviderTest.java @@ -7,29 +7,29 @@ *******************************************************************************/ package org.eclipse.xtext.resource.ecore; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.xtext.resource.ClassloaderClasspathUriResolver; import org.eclipse.xtext.resource.IClasspathUriResolver; import org.eclipse.xtext.resource.generic.XMLEncodingProvider; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class XMLEncodingProviderTest extends TestCase { +public class XMLEncodingProviderTest extends Assert { private String packagePath; private IClasspathUriResolver resolver; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { packagePath = getClass().getPackage().getName().replaceAll("\\.", "/"); resolver = new ClassloaderClasspathUriResolver(); } - public void testName() throws Exception { + @Test public void testName() throws Exception { XMLEncodingProvider xmlEncodingProvider = new XMLEncodingProvider(); assertEquals("UTF-8", xmlEncodingProvider.getEncoding(getURI("utf8.ecore"))); assertEquals("ISO-8859-1", xmlEncodingProvider.getEncoding(getURI("iso-8859-1.ecore"))); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java index 448ab6efa..5766a5941 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/ignorecase/DefaultResourceDescriptionManagerTest.java @@ -10,8 +10,6 @@ package org.eclipse.xtext.resource.ignorecase; import java.util.Collection; import java.util.Collections; -import junit.framework.TestCase; - import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcorePackage; @@ -24,20 +22,22 @@ import org.eclipse.xtext.resource.impl.DefaultResourceDescription; import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionDelta; import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionManager; import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class DefaultResourceDescriptionManagerTest extends TestCase { +public class DefaultResourceDescriptionManagerTest extends Assert { private Resource resource; private DefaultResourceDescription resourceDescription; private DefaultResourceDescriptionManager manager; private Collection importedNames; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { EObject copy = EcoreUtil.copy(EcorePackage.eINSTANCE); resource = new ResourceImpl(); resource.getContents().add(copy); @@ -60,7 +60,7 @@ public class DefaultResourceDescriptionManagerTest extends TestCase { importedNames = Collections.emptySet(); } - public void testIsAffected() { + @Test public void testIsAffected() { DefaultResourceDescriptionDelta delta = new DefaultResourceDescriptionDelta(null, resourceDescription); assertFalse(manager.isAffected(delta, resourceDescription)); importedNames = Collections.singleton(QualifiedName.create("eclass")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java index e85e513d4..4e5f05bea 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultReferenceDescriptionTest.java @@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; import org.eclipse.xtext.EcoreUtil2; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguagePackage; import org.eclipse.xtext.linking.langATestLanguage.Main; @@ -41,6 +41,7 @@ import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.CancelIndicator; import org.eclipse.xtext.util.SimpleAttributeResolver; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -50,7 +51,7 @@ import com.google.common.collect.Lists; */ public class DefaultReferenceDescriptionTest extends AbstractXtextTests { - public void testgetReferenceDescriptions() throws Exception { + @Test public void testgetReferenceDescriptions() throws Exception { with(new LangATestLanguageStandaloneSetup()); XtextResource targetResource = getResource("type C", "bar.langatestlanguage"); EObject typeC = targetResource.getContents().get(0).eContents().get(0); @@ -69,7 +70,7 @@ public class DefaultReferenceDescriptionTest extends AbstractXtextTests { assertEquals(LangATestLanguagePackage.Literals.TYPE__EXTENDS,refDesc.getEReference()); } - public void testgetReferenceDescriptionForMultiValue() throws Exception { + @Test public void testgetReferenceDescriptionForMultiValue() throws Exception { with(new LangATestLanguageStandaloneSetup()); XtextResource targetResource = getResource("type C type D", "bar.langatestlanguage"); EObject typeC = targetResource.getContents().get(0).eContents().get(0); @@ -95,7 +96,7 @@ public class DefaultReferenceDescriptionTest extends AbstractXtextTests { assertEquals(LangATestLanguagePackage.Literals.TYPE__IMPLEMENTS,refDesc2.getEReference()); } - public void testSpecialReferences() { + @Test public void testSpecialReferences() { EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName("test"); ePackage.setNsPrefix("test"); @@ -164,7 +165,7 @@ public class DefaultReferenceDescriptionTest extends AbstractXtextTests { assertEquals(EcoreUtil.getURI(object), referenceDescription.getContainerEObjectURI()); } - public void testCrossResourceContainment() { + @Test public void testCrossResourceContainment() { EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName("test"); ePackage.setNsPrefix("test"); @@ -229,7 +230,7 @@ public class DefaultReferenceDescriptionTest extends AbstractXtextTests { } /** @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=330812 */ - public void testLazyLinkingProxyReferences() { + @Test public void testLazyLinkingProxyReferences() { URI resourceUri = URI.createPlatformResourceURI("test.ecore", true); LazyURIEncoder lazyURIEncoder = new LazyURIEncoder(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java index e29f35203..c388e62e2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescription2Test.java @@ -4,7 +4,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; @@ -13,16 +13,17 @@ import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.util.SimpleAttributeResolver; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; public class DefaultResourceDescription2Test extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new LangATestLanguageStandaloneSetup()); } - public void testNotYetLinked() throws Exception { + @Test public void testNotYetLinked() throws Exception { XtextResourceSet rs = get(XtextResourceSet.class); Resource res1 = rs.createResource(URI.createURI("foo.langatestlanguage")); res1.load(new StringInputStream("type Foo"), null); @@ -36,7 +37,7 @@ public class DefaultResourceDescription2Test extends AbstractXtextTests { } - public void testValidExternalLink() throws Exception { + @Test public void testValidExternalLink() throws Exception { XtextResourceSet rs = get(XtextResourceSet.class); Resource res1 = rs.createResource(URI.createURI("foo.langatestlanguage")); res1.load(new StringInputStream("type Foo"), null); @@ -50,7 +51,7 @@ public class DefaultResourceDescription2Test extends AbstractXtextTests { assertEquals(QualifiedName.create("foo"),names.iterator().next()); } - public void testValidLocalLink() throws Exception { + @Test public void testValidLocalLink() throws Exception { XtextResourceSet rs = get(XtextResourceSet.class); Resource res1 = rs.createResource(URI.createURI("foo.langatestlanguage")); res1.load(new StringInputStream("type Foo"), null); @@ -64,7 +65,7 @@ public class DefaultResourceDescription2Test extends AbstractXtextTests { assertFalse(names.iterator().hasNext()); } - public void testBrokenLink() throws Exception { + @Test public void testBrokenLink() throws Exception { XtextResourceSet rs = get(XtextResourceSet.class); Resource res1 = rs.createResource(URI.createURI("foo.langatestlanguage")); res1.load(new StringInputStream("type Foo"), null); @@ -78,7 +79,7 @@ public class DefaultResourceDescription2Test extends AbstractXtextTests { assertEquals(QualifiedName.create("baz"),names.iterator().next()); } - public void testClasspathURIIsNormalized() { + @Test public void testClasspathURIIsNormalized() { XtextResourceSet xtextResourceSet = new XtextResourceSet(); xtextResourceSet.setClasspathURIContext(this); URI classpathURI = URI.createURI("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.ecore"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java index 8a5cb3460..0ae599c8e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java @@ -13,8 +13,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.util.EcoreUtil; @@ -22,6 +20,8 @@ import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.EObjectDescription; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.IReferenceDescription; +import org.junit.Assert; +import org.junit.Test; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -30,7 +30,7 @@ import com.google.common.collect.Sets; /** * @author Sven Efftinge - Initial contribution and API */ -public class DefaultResourceDescriptionDeltaTest extends TestCase { +public class DefaultResourceDescriptionDeltaTest extends Assert { public static QualifiedName FOO = QualifiedName.create("foo"); public static QualifiedName FOP = QualifiedName.create("fop"); public static QualifiedName BAR = QualifiedName.create("bar"); @@ -69,13 +69,13 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { } - public void testHasChanges_1() throws Exception { + @Test public void testHasChanges_1() throws Exception { TestResDesc resourceDesc = new TestResDesc(); TestResDesc resourceDesc2 = new TestResDesc(); assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_2() throws Exception { + @Test public void testHasChanges_2() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); @@ -85,7 +85,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_3() throws Exception { + @Test public void testHasChanges_3() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, null)); @@ -97,7 +97,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_4() throws Exception { + @Test public void testHasChanges_4() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.imported.add(BAR); @@ -111,7 +111,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_5() throws Exception { + @Test public void testHasChanges_5() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, null)); @@ -123,7 +123,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_6() throws Exception { + @Test public void testHasChanges_6() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, null)); @@ -134,7 +134,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_7() throws Exception { + @Test public void testHasChanges_7() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, Collections.singletonMap("foo", "bar"))); @@ -146,7 +146,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertTrue(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_8() throws Exception { + @Test public void testHasChanges_8() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add( @@ -161,7 +161,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { } /** see https://bugs.eclipse.org/bugs/show_bug.cgi?id=356063 */ - public void testHasChanges_9() throws Exception { + @Test public void testHasChanges_9() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.exported.add( EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, ImmutableMap.of("foo", "bar", "qux", "quux"))); @@ -209,7 +209,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertTrue(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_DifferentTypes() throws Exception { + @Test public void testHasChanges_DifferentTypes() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, Collections.singletonMap("foo", "bar"))); @@ -227,7 +227,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertTrue(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_DifferentURIs() throws Exception { + @Test public void testHasChanges_DifferentURIs() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, Collections.singletonMap("foo", "bar"))); @@ -245,7 +245,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertTrue(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanges_MultipleEObjects() throws Exception { + @Test public void testHasChanges_MultipleEObjects() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, Collections.singletonMap("foo", "bar"))); @@ -259,7 +259,7 @@ public class DefaultResourceDescriptionDeltaTest extends TestCase { assertFalse(new DefaultResourceDescriptionDelta(resourceDesc, resourceDesc2).haveEObjectDescriptionsChanged()); } - public void testHasChanged_differentOrder() throws Exception { + @Test public void testHasChanged_differentOrder() throws Exception { TestResDesc resourceDesc = new TestResDesc(); resourceDesc.imported.add(FOO); resourceDesc.exported.add(EObjectDescription.create(BAR, EcorePackage.Literals.EANNOTATION, Collections.singletonMap("foo", "bar"))); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java index 46cb14176..d0a762aaf 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionTest.java @@ -10,8 +10,6 @@ package org.eclipse.xtext.resource.impl; import java.util.ArrayList; import java.util.Collection; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; @@ -26,6 +24,9 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.Lists; @@ -33,7 +34,7 @@ import com.google.common.collect.Lists; * @author Sven Efftinge - Initial contribution and API * @author Sebastian Zarnekow - Initial contribution and API */ -public class DefaultResourceDescriptionTest extends TestCase { +public class DefaultResourceDescriptionTest extends Assert { private DefaultResourceDescription description; private EPackage pack; @@ -43,8 +44,8 @@ public class DefaultResourceDescriptionTest extends TestCase { private IQualifiedNameProvider nameProvider; private DefaultResourceDescriptionStrategy strategy; - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { resource = new XMLResourceImpl(); resource.setURI(URI.createURI("foo:/test")); nameProvider = new IQualifiedNameProvider.AbstractImpl() { @@ -70,7 +71,7 @@ public class DefaultResourceDescriptionTest extends TestCase { } - public void testGetExportedObject_1() throws Exception { + @Test public void testGetExportedObject_1() throws Exception { strategy.setQualifiedNameProvider(new IQualifiedNameProvider.AbstractImpl() { public QualifiedName getFullyQualifiedName(EObject obj) { if (obj instanceof EPackage) @@ -86,7 +87,7 @@ public class DefaultResourceDescriptionTest extends TestCase { assertEquals(pack, list.get(0).getEObjectOrProxy()); } - public void testGetExportedObject_2() throws Exception { + @Test public void testGetExportedObject_2() throws Exception { strategy.setQualifiedNameProvider(new IQualifiedNameProvider.AbstractImpl() { public QualifiedName getFullyQualifiedName(EObject obj) { if (obj instanceof EClassifier) @@ -104,7 +105,7 @@ public class DefaultResourceDescriptionTest extends TestCase { assertEquals(dtype, list.get(1).getEObjectOrProxy()); } - public void testGetExportedObject_3() throws Exception { + @Test public void testGetExportedObject_3() throws Exception { Iterable iterable = description.getExportedObjects(); ArrayList list = Lists.newArrayList(iterable); assertEquals(3, list.size()); @@ -116,19 +117,19 @@ public class DefaultResourceDescriptionTest extends TestCase { assertEquals(dtype, list.get(2).getEObjectOrProxy()); } - public void testGetExportedEObjects_EClass_String() throws Exception { + @Test public void testGetExportedEObjects_EClass_String() throws Exception { assertContains(description.getExportedObjects(pack.eClass(), QualifiedName.create(pack.getName()), false), pack); assertContains(description.getExportedObjects(pack.eClass(), QualifiedName.create("foo"), false)); assertContains(description.getExportedObjects(eClass.eClass(), QualifiedName.create("foo"), false)); } - public void testGetExportedEObjectsIgnoreCase() throws Exception { + @Test public void testGetExportedEObjectsIgnoreCase() throws Exception { assertContains(description.getExportedObjects(pack.eClass(), QualifiedName.create(pack.getName().toUpperCase()), true), pack); assertContains(description.getExportedObjects(pack.eClass(), QualifiedName.create("foo").toUpperCase(),true)); assertContains(description.getExportedObjects(eClass.eClass(), QualifiedName.create("foo").toUpperCase(),true)); } - public void testGetExportedEObjects_EClass() throws Exception { + @Test public void testGetExportedEObjects_EClass() throws Exception { assertContains(description.getExportedObjectsByType(EcorePackage.Literals.EPACKAGE),pack); assertContains(description.getExportedObjectsByType(EcorePackage.Literals.ECLASSIFIER),eClass,dtype); assertContains(description.getExportedObjectsByType(EcorePackage.Literals.ECLASS),eClass); @@ -136,7 +137,7 @@ public class DefaultResourceDescriptionTest extends TestCase { assertContains(description.getExportedObjectsByType(EcorePackage.Literals.EATTRIBUTE)); } - public void testGetExportedEObjectsForEObject() throws Exception { + @Test public void testGetExportedEObjectsForEObject() throws Exception { assertContains(description.getExportedObjectsByObject(pack), pack); assertContains(description.getExportedObjectsByObject(eClass),eClass); assertContains(description.getExportedObjectsByObject(dtype),dtype); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java index 54f3211e2..1584f668b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceDescriptionsBasedContainerTest.java @@ -10,8 +10,6 @@ package org.eclipse.xtext.resource.impl; import java.util.Collections; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; @@ -25,6 +23,9 @@ import org.eclipse.xtext.resource.IReferenceDescription; import org.eclipse.xtext.resource.IResourceDescription; import org.eclipse.xtext.resource.IResourceDescriptions; import org.eclipse.xtext.resource.ISelectable; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; @@ -32,7 +33,7 @@ import com.google.common.collect.Iterables; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class ResourceDescriptionsBasedContainerTest extends TestCase implements IResourceDescriptions { +public class ResourceDescriptionsBasedContainerTest extends Assert implements IResourceDescriptions { private static final QualifiedName SOME_NAME = QualifiedName.create("SomeName"); protected ResourceDescriptionsBasedContainer container; @@ -71,9 +72,8 @@ public class ResourceDescriptionsBasedContainerTest extends TestCase implements } - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { eClass = EcoreFactory.eINSTANCE.createEClass(); eClass.setName("SomeName"); uri = URI.createURI("myURI"); @@ -92,50 +92,50 @@ public class ResourceDescriptionsBasedContainerTest extends TestCase implements return new ResourceDescriptionsBasedContainer(this); } - public void testGetExportedObjectsByType_01() { + @Test public void testGetExportedObjectsByType_01() { EClass classifier = EcorePackage.Literals.ECLASSIFIER; Iterable iterable = container.getExportedObjectsByType(classifier); EObject eObject = Iterables.getOnlyElement(iterable).getEObjectOrProxy(); assertSame(eClass, eObject); } - public void testGetExportedObjectsByType_02() { + @Test public void testGetExportedObjectsByType_02() { eClass = null; Iterable iterable = container.getExportedObjectsByType(EcorePackage.Literals.ECLASSIFIER); assertTrue(Iterables.isEmpty(iterable)); } - public void testGetExportedObjects_01() { + @Test public void testGetExportedObjects_01() { Iterable iterable = container.getExportedObjects(EcorePackage.Literals.ECLASSIFIER, SOME_NAME, false); EObject eObject = Iterables.getOnlyElement(iterable).getEObjectOrProxy(); assertSame(eClass, eObject); } - public void testGetExportedObjects_02() { + @Test public void testGetExportedObjects_02() { eClass = null; Iterable iterable = container.getExportedObjects(EcorePackage.Literals.ECLASSIFIER, SOME_NAME, false); assertTrue(Iterables.isEmpty(iterable)); } - public void testGetExportedObjects_03() { + @Test public void testGetExportedObjects_03() { Iterable iterable = container.getExportedObjects(EcorePackage.Literals.ECLASSIFIER, SOME_NAME.toUpperCase(), true); EObject eObject = Iterables.getOnlyElement(iterable).getEObjectOrProxy(); assertSame(eClass, eObject); } - public void testGetExportedObjects_04() { + @Test public void testGetExportedObjects_04() { Iterable iterable = container.getExportedObjects(EcorePackage.Literals.ECLASSIFIER, SOME_NAME.toLowerCase(), true); EObject eObject = Iterables.getOnlyElement(iterable).getEObjectOrProxy(); assertSame(eClass, eObject); } - public void testGetExportedObjects_05() { + @Test public void testGetExportedObjects_05() { eClass = null; Iterable iterable = container.getExportedObjects(EcorePackage.Literals.ECLASSIFIER, SOME_NAME, true); assertTrue(Iterables.isEmpty(iterable)); } - public void testBug352214() { + @Test public void testBug352214() { container.getResourceDescriptions(); // initialize uri map ResourceDescriptionChangeEvent event = new ResourceDescriptionChangeEvent(Collections.singletonList( new ChangedResourceDescriptionDelta(resourceDescription, null)), null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java index b989d0f7a..4e03f6b96 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/ResourceSetBasedResourceDescriptionsTest.java @@ -12,8 +12,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.ENamedElement; @@ -33,6 +31,9 @@ import org.eclipse.xtext.resource.IResourceDescription; import org.eclipse.xtext.resource.IResourceDescription.Manager; import org.eclipse.xtext.resource.IResourceServiceProvider; import org.eclipse.xtext.util.IResourceScopeCache; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -43,7 +44,7 @@ import com.google.common.collect.Sets; * @author Sebastian Zarnekow - Initial contribution and API * @author Holger Schill */ -public class ResourceSetBasedResourceDescriptionsTest extends TestCase implements IResourceServiceProvider.Registry, Function { +public class ResourceSetBasedResourceDescriptionsTest extends Assert implements IResourceServiceProvider.Registry, Function { private ResourceSet resourceSet; private DefaultResourceDescriptionManager resourceDescriptionManager; @@ -51,9 +52,8 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement private int nameCount; private ResourceSetBasedResourceDescriptions resDescs; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { resourceSet = new ResourceSetImpl(); IQualifiedNameProvider qualifiedNameProvider = new IQualifiedNameProvider.AbstractImpl() { @@ -87,14 +87,14 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement }; } - public void testEmptyResourceSet() { + @Test public void testEmptyResourceSet() { Iterable iterable = container.getExportedObjectsByType(EcorePackage.Literals.EOBJECT); assertTrue(Iterables.isEmpty(iterable)); iterable = container.getExportedObjects(EcorePackage.Literals.EOBJECT, QualifiedName.create("Zonk"), false); assertTrue(Iterables.isEmpty(iterable)); } - public void testOneElement_Mismatch() { + @Test public void testOneElement_Mismatch() { QualifiedName qualifiedName = QualifiedName.create("SomeName"); EClass type = EcorePackage.Literals.EPACKAGE; Resource resource = createResource(); @@ -107,7 +107,7 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement assertTrue(Iterables.isEmpty(iterable)); } - public void testOneElement_Match() { + @Test public void testOneElement_Match() { QualifiedName qualifiedName = QualifiedName.create("SomeName"); EClass type = EcorePackage.Literals.EPACKAGE; Resource resource = createResource(); @@ -124,7 +124,7 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement assertSame(element, Iterables.getOnlyElement(iterable).getEObjectOrProxy()); } - public void testTwoElements_OneMatch() { + @Test public void testTwoElements_OneMatch() { QualifiedName qualifiedName = QualifiedName.create("SomeName"); EClass type = EcorePackage.Literals.EPACKAGE; Resource resource = createResource(); @@ -142,7 +142,7 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement assertSame(element, Iterables.getOnlyElement(iterable).getEObjectOrProxy()); } - public void testTwoResources_TwoMatches() { + @Test public void testTwoResources_TwoMatches() { QualifiedName qualifiedName = QualifiedName.create("SomeName"); EClass type = EcorePackage.Literals.EPACKAGE; Resource resource = createResource(); @@ -168,7 +168,7 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement assertEquals(expectedSet, transformedSet); } - public void testPerformance10Resources100EClassesEach() { + @Test public void testPerformance10Resources100EClassesEach() { int resourceCount = 10; int eClassCount = 100; for(int i = 0; i < resourceCount; i++) { @@ -220,7 +220,7 @@ public class ResourceSetBasedResourceDescriptionsTest extends TestCase implement return getResourceServiceProvider(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE); } - public void testBug_352450 () throws Exception { + @Test public void testBug_352450 () throws Exception { int resourceCount = 3; int eClassCount = 1; for(int i = 0; i < resourceCount; i++) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java index 2cfeef7d7..6a18eb137 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopeTest.java @@ -7,8 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.scoping; -import junit.framework.TestCase; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EcoreFactory; @@ -18,6 +16,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.scoping.impl.AbstractScope; import org.eclipse.xtext.scoping.impl.SimpleScope; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -25,36 +26,35 @@ import com.google.common.collect.Iterables; * @author Sven Efftinge - Initial contribution and API * @author Holger Schill - Contribution to Bug 309764 */ -public class ScopeTest extends TestCase { +public class ScopeTest extends Assert { private AbstractScope scope; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { scope = getEcoreClassifiersScope(); } - public void testContentByEObject_existent() throws Exception { + @Test public void testContentByEObject_existent() throws Exception { assertNotNull(scope.getSingleElement(EcorePackage.eINSTANCE.getEAnnotation())); } - public void testContentByEObject_nonExistent() throws Exception { + @Test public void testContentByEObject_nonExistent() throws Exception { assertNull(scope.getSingleElement(EcorePackage.eINSTANCE.getEAnnotation_Contents())); } - public void testContentByEObject_withProxy() throws Exception { + @Test public void testContentByEObject_withProxy() throws Exception { EClass eClass = EcoreFactory.eINSTANCE.createEClass(); ((InternalEObject) eClass).eSetProxyURI(EcoreUtil.getURI(EcorePackage.eINSTANCE.getEAnnotation())); assertNotNull(scope.getSingleElement(eClass)); } - public void testContentByName_existent() throws Exception { + @Test public void testContentByName_existent() throws Exception { QualifiedName qualifiedName = QualifiedName.create(EcorePackage.eINSTANCE.getEAnnotation().getName()); assertEquals(qualifiedName, scope.getSingleElement(qualifiedName).getName()); } - public void testContentByName_nonExistent() throws Exception { + @Test public void testContentByName_nonExistent() throws Exception { assertNull(scope.getSingleElement(QualifiedName.create("unknown_name"))); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java index fd3431b20..a14986c4f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/ScopesTest.java @@ -11,25 +11,25 @@ package org.eclipse.xtext.scoping; import java.util.ArrayList; import java.util.Iterator; -import junit.framework.TestCase; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API * */ -public class ScopesTest extends TestCase { +public class ScopesTest extends Assert { private QualifiedName FOO = QualifiedName.create("Foo"); private QualifiedName BAR = QualifiedName.create("Bar"); - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { EAttribute attr = EcoreFactory.eINSTANCE.createEAttribute(); attr.setName("Foo"); EAttribute attr2 = EcoreFactory.eINSTANCE.createEAttribute(); @@ -45,7 +45,7 @@ public class ScopesTest extends TestCase { assertEquals(BAR, iterator.next().getName()); } - public void testWithNull() throws Exception { + @Test public void testWithNull() throws Exception { EAttribute attr = EcoreFactory.eINSTANCE.createEAttribute(); attr.setName("Foo"); EAttribute attr2 = EcoreFactory.eINSTANCE.createEAttribute(); @@ -63,7 +63,7 @@ public class ScopesTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testWithDifferentElements() throws Exception { + @Test public void testWithDifferentElements() throws Exception { EAttribute attr = EcoreFactory.eINSTANCE.createEAttribute(); attr.setName("Foo"); EDataType datatype = EcoreFactory.eINSTANCE.createEDataType(); @@ -85,7 +85,7 @@ public class ScopesTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testEmptyIterable() throws Exception { + @Test public void testEmptyIterable() throws Exception { ArrayList list = new ArrayList(); Iterable iterable = Scopes.scopedElementsFor(list); assertFalse(iterable.iterator().hasNext()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java index 00c5de57d..118f92456 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/AbstractScopeTest.java @@ -17,16 +17,18 @@ import org.eclipse.emf.ecore.resource.impl.ResourceImpl; import org.eclipse.xtext.resource.EObjectDescription; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import junit.framework.TestCase; - /** * @author Sebastian Zarnekow - Initial contribution and API */ -public abstract class AbstractScopeTest extends TestCase { +public abstract class AbstractScopeTest extends Assert { protected IEObjectDescription descriptionA; protected IEObjectDescription descriptionA_aliased; @@ -36,9 +38,8 @@ public abstract class AbstractScopeTest extends TestCase { protected EAnnotation annotationB; private Resource resource; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { resource = new ResourceImpl(URI.createURI("uri")); annotationA = EcoreFactory.eINSTANCE.createEAnnotation(); annotationB = EcoreFactory.eINSTANCE.createEAnnotation(); @@ -50,8 +51,8 @@ public abstract class AbstractScopeTest extends TestCase { descriptionB_as_A = EObjectDescription.create("a", annotationB); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { annotationA = null; annotationB = null; descriptionA = null; @@ -59,96 +60,95 @@ public abstract class AbstractScopeTest extends TestCase { descriptionB = null; descriptionB_as_A = null; resource = null; - super.tearDown(); } protected abstract IScope createScope(IScope parent, Iterable content); - public void testSingleByName() { + @Test public void testSingleByName() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB)); assertSame(descriptionA, scope.getSingleElement(descriptionA.getName())); assertSame(descriptionB, scope.getSingleElement(descriptionB.getName())); } - public void testSingleByNameWithDuplicate() { + @Test public void testSingleByNameWithDuplicate() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB_as_A, descriptionB)); assertSame(descriptionA, scope.getSingleElement(descriptionA.getName())); assertSame(descriptionB, scope.getSingleElement(descriptionB.getName())); } - public void testSingleByObject() { + @Test public void testSingleByObject() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB)); assertSame(descriptionA, scope.getSingleElement(annotationA)); assertSame(descriptionB, scope.getSingleElement(annotationB)); } - public void testSingleByObjectWithDuplicate_01() { + @Test public void testSingleByObjectWithDuplicate_01() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB_as_A, descriptionB)); assertSame(descriptionA, scope.getSingleElement(annotationA)); assertSame(descriptionB, scope.getSingleElement(annotationB)); } - public void testSingleByObjectWithDuplicate_02() { + @Test public void testSingleByObjectWithDuplicate_02() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionB_as_A, descriptionA, descriptionB)); assertNull(scope.getSingleElement(annotationA)); assertSame(descriptionB_as_A, scope.getSingleElement(annotationB)); } - public void testSingleByObjectWithDuplicate_03() { + @Test public void testSingleByObjectWithDuplicate_03() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionB_as_A, descriptionA, descriptionA_aliased)); assertSame(descriptionA_aliased, scope.getSingleElement(annotationA)); assertSame(descriptionB_as_A, scope.getSingleElement(annotationB)); } - public void testByName() { + @Test public void testByName() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB)); assertEqualElements(Collections.singleton(descriptionA), scope.getElements(descriptionA.getName())); assertEqualElements(Collections.singleton(descriptionB), scope.getElements(descriptionB.getName())); } - public void testByNameWithDuplicate_01() { + @Test public void testByNameWithDuplicate_01() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB_as_A, descriptionB)); assertEqualElements(ImmutableList.of(descriptionA, descriptionB_as_A), scope.getElements(descriptionA.getName())); assertEqualElements(Collections.singleton(descriptionB), scope.getElements(descriptionB.getName())); } - public void testByNameWithDuplicate_02() { + @Test public void testByNameWithDuplicate_02() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionB_as_A, descriptionA, descriptionB)); assertEqualElements(ImmutableList.of(descriptionB_as_A, descriptionA), scope.getElements(descriptionA.getName())); assertEqualElements(Collections.singleton(descriptionB), scope.getElements(descriptionB.getName())); } - public void testByObject() { + @Test public void testByObject() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB)); assertEqualElements(ImmutableList.of(descriptionA), scope.getElements(annotationA)); assertEqualElements(ImmutableList.of(descriptionB), scope.getElements(annotationB)); } - public void testByObjectWithDuplicate_01() { + @Test public void testByObjectWithDuplicate_01() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB_as_A, descriptionB)); assertEqualElements(ImmutableList.of(descriptionA), scope.getElements(annotationA)); assertEqualElements(ImmutableList.of(descriptionB), scope.getElements(annotationB)); } - public void testByObjectWithDuplicate_02() { + @Test public void testByObjectWithDuplicate_02() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionB_as_A, descriptionA, descriptionB)); assertEqualElements(ImmutableList.of(), scope.getElements(annotationA)); assertEqualElements(ImmutableList.of(descriptionB_as_A, descriptionB), scope.getElements(annotationB)); } - public void testByObjectWithDuplicate_03() { + @Test public void testByObjectWithDuplicate_03() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionB_as_A, descriptionA, descriptionA_aliased)); assertEqualElements(ImmutableList.of(descriptionA_aliased), scope.getElements(annotationA)); assertEqualElements(ImmutableList.of(descriptionB_as_A), scope.getElements(annotationB)); } - public void testByObjectWithDuplicate_04() { + @Test public void testByObjectWithDuplicate_04() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA_aliased, descriptionB_as_A, descriptionA)); assertEqualElements(ImmutableList.of(descriptionA_aliased), scope.getElements(annotationA)); assertEqualElements(ImmutableList.of(descriptionB_as_A), scope.getElements(annotationB)); } - public void testByObjectWithDuplicate_05() { + @Test public void testByObjectWithDuplicate_05() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA_aliased, descriptionA, descriptionB_as_A)); assertEqualElements(ImmutableList.of(descriptionA_aliased, descriptionA), scope.getElements(annotationA)); assertEqualElements(ImmutableList.of(), scope.getElements(annotationB)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java index 3f0c13071..b7bebfd9b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/Bug318343Test.java @@ -9,13 +9,14 @@ package org.eclipse.xtext.scoping.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguagePackage; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.scoping.IScope; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; /** * @author Holger Schill - Initial contribution and API @@ -27,7 +28,7 @@ public class Bug318343Test extends AbstractXtextTests { private Resource resource2; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LangATestLanguageStandaloneSetup.class); globalScopeProvider = get(DefaultGlobalScopeProvider.class); @@ -38,17 +39,17 @@ public class Bug318343Test extends AbstractXtextTests { resource2.load(new StringInputStream("type t2"),null); } - public void testScopeContainsT1() throws Exception { + @Test public void testScopeContainsT1() throws Exception { IScope scope = globalScopeProvider.getScope(resource2, LangATestLanguagePackage.Literals.TYPE__EXTENDS); assertNotNull(scope.getSingleElement(QualifiedName.create("t1"))); } - public void testScopeContainsNotT2() throws Exception { + @Test public void testScopeContainsNotT2() throws Exception { IScope scope = globalScopeProvider.getScope(resource2, LangATestLanguagePackage.Literals.TYPE__EXTENDS); assertNull(scope.getSingleElement(QualifiedName.create("t2"))); } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { resource1 = null; resource2 = null; globalScopeProvider = null; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java index d7bbb9cde..fb485a8dd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/DeclarativeScopeProviderTest.java @@ -14,9 +14,10 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -24,7 +25,7 @@ import org.eclipse.xtext.scoping.IScope; */ public class DeclarativeScopeProviderTest extends AbstractXtextTests { @SuppressWarnings("unused") - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); AbstractDeclarativeScopeProvider provider = new AbstractDeclarativeScopeProvider() { private IScope scope_EClass(EClass clazz, EReference ref) { @@ -37,7 +38,7 @@ public class DeclarativeScopeProviderTest extends AbstractXtextTests { } @SuppressWarnings("unused") - public void testNested() throws Exception { + @Test public void testNested() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope b = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); @@ -57,7 +58,7 @@ public class DeclarativeScopeProviderTest extends AbstractXtextTests { } @SuppressWarnings("unused") - public void testPolymorphic() throws Exception { + @Test public void testPolymorphic() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope b = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope c = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); @@ -82,7 +83,7 @@ public class DeclarativeScopeProviderTest extends AbstractXtextTests { } @SuppressWarnings("unused") - public void testScopeByType() throws Exception { + @Test public void testScopeByType() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope b = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope c = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); @@ -107,7 +108,7 @@ public class DeclarativeScopeProviderTest extends AbstractXtextTests { } @SuppressWarnings("unused") - public void testScopeByReference() throws Exception { + @Test public void testScopeByReference() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope b = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope c = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); @@ -131,7 +132,7 @@ public class DeclarativeScopeProviderTest extends AbstractXtextTests { } @SuppressWarnings("unused") - public void testScopeByType2() throws Exception { + @Test public void testScopeByType2() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope b = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope c = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); @@ -155,7 +156,7 @@ public class DeclarativeScopeProviderTest extends AbstractXtextTests { } @SuppressWarnings("unused") - public void testScopeByReference2() throws Exception { + @Test public void testScopeByReference2() throws Exception { final IScope a = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope b = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); final IScope c = new SimpleScope(IScope.NULLSCOPE, Collections. emptySet()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java index 38d294a76..0277bf760 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportNormalizerTest.java @@ -7,16 +7,16 @@ *******************************************************************************/ package org.eclipse.xtext.scoping.impl; -import junit.framework.TestCase; - import org.eclipse.xtext.naming.QualifiedName; +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class ImportNormalizerTest extends TestCase { +public class ImportNormalizerTest extends Assert { - public void testNull() throws Exception { + @Test public void testNull() throws Exception { try { new ImportNormalizer(null, true, false); fail("Expected exception"); @@ -25,7 +25,7 @@ public class ImportNormalizerTest extends TestCase { } } - public void testResolve() throws Exception { + @Test public void testResolve() throws Exception { QualifiedName xtextRelativeName = QualifiedName.create("xtext"); QualifiedName ytextRelativeName = QualifiedName.create("ytext"); QualifiedName xytextRelativeName = QualifiedName.create("xtext","ytext"); @@ -45,7 +45,7 @@ public class ImportNormalizerTest extends TestCase { assertEquals(xtextRelativeName, xtextImportNormalizer.resolve(xtextRelativeName)); } - public void testResolveIgnoreCase() throws Exception { + @Test public void testResolveIgnoreCase() throws Exception { QualifiedName xtextRelativeName = QualifiedName.create("xtext"); QualifiedName ytextRelativeName = QualifiedName.create("ytext"); QualifiedName xytextRelativeName = QualifiedName.create("xtext","ytext"); @@ -65,7 +65,7 @@ public class ImportNormalizerTest extends TestCase { assertEquals(xtextRelativeName, xtextImportNormalizer.resolve(xtextRelativeName)); } - public void testDeresolve() throws Exception { + @Test public void testDeresolve() throws Exception { QualifiedName namespace = QualifiedName.create("org", "eclipse", "xtext"); QualifiedName xtextFQN = namespace.append("Xtext"); QualifiedName ytextFQN = namespace.skipLast(1).append("ytext"); @@ -87,7 +87,7 @@ public class ImportNormalizerTest extends TestCase { assertEquals(QualifiedName.create("ytext"), wildCardImportNormalizer.deresolve(xytextFQN)); } - public void testDeresolveIgnoreCase() throws Exception { + @Test public void testDeresolveIgnoreCase() throws Exception { QualifiedName namespace = QualifiedName.create("org", "eclipse", "xtext"); QualifiedName xtextFQN = namespace.append("Xtext"); QualifiedName ytextFQN = namespace.skipLast(1).append("ytext"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java index e28e3bf4e..73db09f53 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportScopeTest.java @@ -27,13 +27,13 @@ import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.ISelectable; import org.eclipse.xtext.resource.impl.AliasedEObjectDescription; import org.eclipse.xtext.scoping.IScope; - -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API */ -public class ImportScopeTest extends TestCase { +public class ImportScopeTest extends Assert { /** * subclassed just to make protected members accessible from within this OSGi bundle @@ -61,7 +61,7 @@ public class ImportScopeTest extends TestCase { } - public void testGetAllWithDuplicates() throws Exception { + @Test public void testGetAllWithDuplicates() throws Exception { final IEObjectDescription desc1 = EObjectDescription.create(QualifiedName.create("com","foo","bar"), EcorePackage.Literals.EANNOTATION); final IEObjectDescription desc2 = EObjectDescription.create(QualifiedName.create("com","foo","bar"), EcorePackage.Literals.EATTRIBUTE); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), false); @@ -70,7 +70,7 @@ public class ImportScopeTest extends TestCase { assertEquals(4,size(scope.getAllElements())); } - public void testImports_01() throws Exception { + @Test public void testImports_01() throws Exception { final IEObjectDescription desc1 = EObjectDescription.create(QualifiedName.create("com","foo","bar"), EcorePackage.Literals.EANNOTATION); final IEObjectDescription desc2 = EObjectDescription.create(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), false); @@ -87,7 +87,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testRelativeImports_01() throws Exception { + @Test public void testRelativeImports_01() throws Exception { final IEObjectDescription desc1 = EObjectDescription.create(QualifiedName.create("com","foo","bar"), EcorePackage.Literals.EANNOTATION); final IEObjectDescription desc2 = EObjectDescription.create(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE); IScope outer = new SimpleScope(newArrayList(desc1,desc2), false); @@ -109,7 +109,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testDuplicatesNotVisible_01() throws Exception { + @Test public void testDuplicatesNotVisible_01() throws Exception { final IEObjectDescription desc1 = EObjectDescription.create(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION); final IEObjectDescription desc2 = EObjectDescription.create(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), false); @@ -123,7 +123,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testDuplicatesNotVisible_01_IgnoreCase() throws Exception { + @Test public void testDuplicatesNotVisible_01_IgnoreCase() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","Foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -137,7 +137,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testDuplicatesNotVisible_02_IgnoreCase() throws Exception { + @Test public void testDuplicatesNotVisible_02_IgnoreCase() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","Foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -151,7 +151,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testDuplicatesNotVisible_02() throws Exception { + @Test public void testDuplicatesNotVisible_02() throws Exception { final IEObjectDescription desc1 = EObjectDescription.create(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION); final IEObjectDescription desc2 = EObjectDescription.create(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), false); @@ -164,7 +164,7 @@ public class ImportScopeTest extends TestCase { assertNotNull(scope.getSingleElement(QualifiedName.create("de","foo"))); } - public void testDuplicatesNotVisible_03_IgnoreCase() throws Exception { + @Test public void testDuplicatesNotVisible_03_IgnoreCase() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -177,7 +177,7 @@ public class ImportScopeTest extends TestCase { assertNotNull(scope.getSingleElement(QualifiedName.create("de","Foo"))); } - public void testDuplicatesNotVisible_04_IgnoreCase() throws Exception { + @Test public void testDuplicatesNotVisible_04_IgnoreCase() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -190,7 +190,7 @@ public class ImportScopeTest extends TestCase { assertNotNull(scope.getSingleElement(QualifiedName.create("de","Foo"))); } - public void testDuplicatesNotVisible_05() throws Exception { + @Test public void testDuplicatesNotVisible_05() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com", "Foo"), EcorePackage.Literals.EANNOTATION, null); SimpleScope outer = new SimpleScope(newArrayList(desc1), false); ImportNormalizer n1 = new ImportNormalizer(QualifiedName.create("com"), true, false); @@ -203,7 +203,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testDuplicatesNotVisible_05_IgnoreCase() throws Exception { + @Test public void testDuplicatesNotVisible_05_IgnoreCase() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","Foo"), EcorePackage.Literals.EANNOTATION, null); SimpleScope outer = new SimpleScope(newArrayList(desc1), true); ImportNormalizer n1 = new ImportNormalizer(QualifiedName.create("COM"), true, true); @@ -216,7 +216,7 @@ public class ImportScopeTest extends TestCase { assertFalse(iterator.hasNext()); } - public void testMultipleElementsByName_00() throws Exception { + @Test public void testMultipleElementsByName_00() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -229,7 +229,7 @@ public class ImportScopeTest extends TestCase { assertEquals(2,size(elements)); } - public void testMultipleElementsByName_01() throws Exception { + @Test public void testMultipleElementsByName_01() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -242,7 +242,7 @@ public class ImportScopeTest extends TestCase { assertEquals(2,size(elements)); } - public void testGetAllLocalElements_00() throws Exception { + @Test public void testGetAllLocalElements_00() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -254,7 +254,7 @@ public class ImportScopeTest extends TestCase { assertEquals(2,size(elements)); } - public void testGetAllLocalElements_01() throws Exception { + @Test public void testGetAllLocalElements_01() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -266,7 +266,7 @@ public class ImportScopeTest extends TestCase { assertEquals(2,size(elements)); } - public void testAllAliasedElements_00() throws Exception { + @Test public void testAllAliasedElements_00() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EATTRIBUTE, null); final ArrayList newArrayList = newArrayList(desc1,desc2); @@ -280,7 +280,7 @@ public class ImportScopeTest extends TestCase { assertSame(desc2,((AliasedEObjectDescription)iterator.next()).getAliasedEObjectDescription()); } - public void testAllAliasedElements_01() throws Exception { + @Test public void testAllAliasedElements_01() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EATTRIBUTE, null); final ArrayList newArrayList = newArrayList(desc1,desc2); @@ -294,7 +294,7 @@ public class ImportScopeTest extends TestCase { assertSame(desc2,((AliasedEObjectDescription)iterator.next()).getAliasedEObjectDescription()); } - public void testAllAliasedElements_02() throws Exception { + @Test public void testAllAliasedElements_02() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); final ArrayList newArrayList = newArrayList(desc1,desc2); @@ -305,7 +305,7 @@ public class ImportScopeTest extends TestCase { assertEquals(0,size(elements)); } - public void testAllAliasedElements_03() throws Exception { + @Test public void testAllAliasedElements_03() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); final ArrayList newArrayList = newArrayList(desc1,desc2); @@ -316,7 +316,7 @@ public class ImportScopeTest extends TestCase { assertEquals(0,size(elements)); } - public void testAllAliasedElements_04() throws Exception { + @Test public void testAllAliasedElements_04() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","bar"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc3 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); @@ -329,7 +329,7 @@ public class ImportScopeTest extends TestCase { assertSame(desc2,((AliasedEObjectDescription)elements.iterator().next()).getAliasedEObjectDescription()); } - public void testAllAliasedElements_05() throws Exception { + @Test public void testAllAliasedElements_05() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("com","bar"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc3 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); @@ -342,7 +342,7 @@ public class ImportScopeTest extends TestCase { assertSame(desc2,((AliasedEObjectDescription)elements.iterator().next()).getAliasedEObjectDescription()); } - public void testGetByEObject_00() throws Exception { + @Test public void testGetByEObject_00() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -354,7 +354,7 @@ public class ImportScopeTest extends TestCase { assertEquals("com.foo",iterable.iterator().next().getName().toString()); } - public void testGetByEObject_01() throws Exception { + @Test public void testGetByEObject_01() throws Exception { final IEObjectDescription desc1 = new EObjectDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new EObjectDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); @@ -384,7 +384,7 @@ public class ImportScopeTest extends TestCase { } } - public void testGetByEObject_02() throws Exception { + @Test public void testGetByEObject_02() throws Exception { final IEObjectDescription desc1 = new ProxyReturningDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new ProxyReturningDescription(QualifiedName.create("de","foo"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), false); @@ -394,7 +394,7 @@ public class ImportScopeTest extends TestCase { assertEquals("foo", description.getName().toString()); } - public void testGetByEObject_03() throws Exception { + @Test public void testGetByEObject_03() throws Exception { final IEObjectDescription desc1 = new ProxyReturningDescription(QualifiedName.create("com","foo"), EcorePackage.Literals.EANNOTATION, null); final IEObjectDescription desc2 = new ProxyReturningDescription(QualifiedName.create("de","bar"), EcorePackage.Literals.EATTRIBUTE, null); SimpleScope outer = new SimpleScope(newArrayList(desc1,desc2), true); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java index 2b25c6a9b..a41a2fc88 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ImportedNamespaceAwareLocalScopeProviderTest.java @@ -24,17 +24,17 @@ import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; import org.eclipse.xtext.index.indexTestLanguage.Datatype; import org.eclipse.xtext.index.indexTestLanguage.Entity; import org.eclipse.xtext.index.indexTestLanguage.IndexTestLanguagePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.IQualifiedNameConverter; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.IResourceDescription; +import org.eclipse.xtext.resource.IResourceDescription.Manager; import org.eclipse.xtext.resource.IResourceServiceProvider; import org.eclipse.xtext.resource.ResourceSetReferencingResourceSetImpl; import org.eclipse.xtext.resource.XtextResource; -import org.eclipse.xtext.resource.IResourceDescription.Manager; import org.eclipse.xtext.resource.impl.DefaultResourceDescription; import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionManager; import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy; @@ -42,6 +42,7 @@ import org.eclipse.xtext.resource.impl.DefaultResourceServiceProvider; import org.eclipse.xtext.resource.impl.ResourceServiceProviderRegistryImpl; import org.eclipse.xtext.scoping.IScope; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; @@ -94,7 +95,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT scopeProvider = new ImportedNamespaceAwareLocalScopeProvider(globalScopeProvider, nameProvider, nameConverter, caseInsensitivityHelper); } - public void testImports() throws Exception { + @Test public void testImports() throws Exception { XtextResource resource = getResource(new StringInputStream("import foo.bar.* "), URI .createURI("import.indextestlanguage")); resource.getResourceSet().createResource(URI.createURI("foo.indextestlanguage")).load( @@ -117,7 +118,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertTrue(names.contains(nameConverter.toQualifiedName("foo.bar.String"))); } - public void testRelativeContext() throws Exception { + @Test public void testRelativeContext() throws Exception { final XtextResource resource = getResource(new StringInputStream( "stuff { " + " baz { " @@ -138,7 +139,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("stuff.baz.String"))); } - public void testRelativePath() throws Exception { + @Test public void testRelativePath() throws Exception { final XtextResource resource = getResource(new StringInputStream( "stuff { " + " import baz.*" @@ -162,7 +163,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("stuff.baz.String"))); } - public void testReexports2() throws Exception { + @Test public void testReexports2() throws Exception { final XtextResource resource = getResource(new StringInputStream( "A { " + " B { " @@ -187,7 +188,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("A.B.D"))); } - public void testLocalElementsNotFromIndex() throws Exception { + @Test public void testLocalElementsNotFromIndex() throws Exception { final XtextResource resource = getResource(new StringInputStream( "A { " + " B { " @@ -207,7 +208,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("A.B.D"))); } - public void testImportsWithoutWildcard() throws Exception { + @Test public void testImportsWithoutWildcard() throws Exception { final XtextResource resource = getResource(new StringInputStream( "foo { " + " import bar.Bar" @@ -231,7 +232,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("Bar"))); } - public void testDuplicateImportsAreIgnored() throws Exception { + @Test public void testDuplicateImportsAreIgnored() throws Exception { final XtextResource resource = getResource(new StringInputStream( "foo { " + " entity Foo {}" @@ -268,7 +269,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT })); } - public void testUnambiguousImportAreShadowed_00() throws Exception { + @Test public void testUnambiguousImportAreShadowed_00() throws Exception { final XtextResource resource = getResource(new StringInputStream( "foo { " + " entity Foo {}" @@ -304,7 +305,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT } })); } - public void testUnambiguousImportAreShadowed_01() throws Exception { + @Test public void testUnambiguousImportAreShadowed_01() throws Exception { final XtextResource resource = getResource(new StringInputStream( "foo { " + " entity Foo {}" @@ -340,7 +341,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT } })); } - public void testUnambiguousImportAreShadowed_02() throws Exception { + @Test public void testUnambiguousImportAreShadowed_02() throws Exception { final XtextResource resource = getResource(new StringInputStream( "foo { " + " entity Foo {}" @@ -377,7 +378,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT })); } - public void testMultipleFiles() throws Exception { + @Test public void testMultipleFiles() throws Exception { ResourceSetImpl rs = new ResourceSetImpl(); final Resource res1 = rs.createResource(URI.createURI("file1.indextestlanguage")); Resource res2 = rs.createResource(URI.createURI("file2.indextestlanguage")); @@ -397,7 +398,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("Bar"))); } - public void testResourceSetReferencingResourceSet() throws Exception { + @Test public void testResourceSetReferencingResourceSet() throws Exception { ResourceSetReferencingResourceSetImpl rs = new ResourceSetReferencingResourceSetImpl(); Resource res = rs.createResource(URI.createURI("file2.indextestlanguage")); res.load(new StringInputStream( @@ -428,7 +429,7 @@ public class ImportedNamespaceAwareLocalScopeProviderTest extends AbstractXtextT assertNotNull(scope.getSingleElement(nameConverter.toQualifiedName("bar.Bar"))); } - public void testResourceSetReferencingResourceSet2() throws Exception { + @Test public void testResourceSetReferencingResourceSet2() throws Exception { ResourceSetReferencingResourceSetImpl rs = new ResourceSetReferencingResourceSetImpl(); Resource res = rs.createResource(URI.createURI("file2.indextestlanguage")); res.load(new StringInputStream("bar {" + " entity Bar{}" + "}"), null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java index d93627317..db4ac5840 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/MapBasedScopeTest.java @@ -11,6 +11,7 @@ import java.util.Collections; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +import org.junit.Test; import com.google.common.collect.ImmutableList; @@ -25,14 +26,14 @@ public class MapBasedScopeTest extends AbstractScopeTest { } @Override - public void testByNameWithDuplicate_01() { + @Test public void testByNameWithDuplicate_01() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionA, descriptionB_as_A, descriptionB)); assertEqualElements(ImmutableList.of(descriptionA), scope.getElements(descriptionA.getName())); assertEqualElements(Collections.singleton(descriptionB), scope.getElements(descriptionB.getName())); } @Override - public void testByNameWithDuplicate_02() { + @Test public void testByNameWithDuplicate_02() { IScope scope = createScope(IScope.NULLSCOPE, ImmutableList.of(descriptionB_as_A, descriptionA, descriptionB)); assertEqualElements(ImmutableList.of(descriptionB_as_A), scope.getElements(descriptionA.getName())); assertEqualElements(Collections.singleton(descriptionB), scope.getElements(descriptionB.getName())); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java index b5539e695..f8e282e14 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ProfilingTest.java @@ -13,13 +13,14 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.index.IndexTestLanguageStandaloneSetup; import org.eclipse.xtext.index.indexTestLanguage.Namespace; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IResourceDescription; import org.eclipse.xtext.resource.IResourceDescription.Manager; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.util.StopWatch; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; import com.google.common.collect.Sets; import com.google.inject.Guice; @@ -44,7 +45,7 @@ public class ProfilingTest extends AbstractXtextTests { } } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { with(new IndexTestLanguageStandaloneSetup(){ @Override public Injector createInjector() { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java index 8c270ebf9..829b028d0 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/ScopeTest.java @@ -16,17 +16,17 @@ import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.EObjectDescription; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +import org.junit.Assert; +import org.junit.Test; import com.google.common.collect.Iterables; -import junit.framework.TestCase; - /** * @author Sven Efftinge - Initial contribution and API */ -public class ScopeTest extends TestCase { +public class ScopeTest extends Assert { - public void testShadowing() throws Exception { + @Test public void testShadowing() throws Exception { IEObjectDescription a = EObjectDescription.create(QualifiedName.create("foo"), EcorePackage.Literals.EANNOTATION); IEObjectDescription b = EObjectDescription @@ -38,7 +38,7 @@ public class ScopeTest extends TestCase { assertNull(inner.getSingleElement(EcorePackage.Literals.EANNOTATION)); } - public void testLaziness() throws Exception { + @Test public void testLaziness() throws Exception { LazinessTestScope c = new LazinessTestScope("c"); LazinessTestScope b = new LazinessTestScope("b", c); LazinessTestScope a = new LazinessTestScope("a", b); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java index cfeb843e8..943e7bc1d 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/scoping/impl/SimpleNameScopeProviderTest.java @@ -12,12 +12,13 @@ import java.util.HashSet; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.ImportUriTestLanguageStandaloneSetup; import org.eclipse.xtext.linking.importedURI.ImportedURIPackage; import org.eclipse.xtext.linking.importedURI.Main; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +import org.junit.Test; import com.google.common.collect.Sets; @@ -27,12 +28,12 @@ import com.google.common.collect.Sets; */ public class SimpleNameScopeProviderTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ImportUriTestLanguageStandaloneSetup.class); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -41,12 +42,12 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { models.addModel("bar.importuritestlanguage", "type bar"); Resource resource = rs.getResource(URI.createURI("foo.importuritestlanguage"), true); - - assertWithXtend("'bar'", "types.first().extends.name", resource.getContents().get(0)); + Main main = (Main) resource.getContents().get(0); + assertEquals("bar", main.getTypes().get(0).getExtends().getName()); } // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266879 - public void testRelativeScope() throws Exception { + @Test public void testRelativeScope() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -55,15 +56,15 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { models.addModel("testfile://my/folder/bar.importuritestlanguage", "type bar type bar2 extends bar"); Resource resource = rs.getResource(URI.createURI("testfile://my/folder/foo.importuritestlanguage"), true); - - assertWithXtend("'bar'", "types.first().extends.name", resource.getContents().get(0)); - assertWithXtend("'bar2'", "types.first().extends.extends.name", resource.getContents().get(0)); - assertWithXtend("'bar'", "types.first().extends.extends.extends.name", resource.getContents().get(0)); - assertWithXtend("null", "types.first().extends.extends.extends.extends", resource.getContents().get(0)); + Main main = (Main) resource.getContents().get(0); + assertEquals("bar", main.getTypes().get(0).getExtends().getName()); + assertEquals("bar2", main.getTypes().get(0).getExtends().getExtends().getName()); + assertEquals("bar", main.getTypes().get(0).getExtends().getExtends().getExtends().getName()); + assertNull(main.getTypes().get(0).getExtends().getExtends().getExtends().getExtends()); } // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266879 - public void testRelativeScopeWithPath() throws Exception { + @Test public void testRelativeScopeWithPath() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -72,14 +73,14 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { models.addModel("testfile://my/folder/bar.importuritestlanguage", "type bar type bar2 extends bar"); Resource resource = rs.getResource(URI.createURI("testfile://my/folder/foo.importuritestlanguage"), true); - - assertWithXtend("'bar'", "types.first().extends.name", resource.getContents().get(0)); - assertWithXtend("'bar2'", "types.first().extends.extends.name", resource.getContents().get(0)); - assertWithXtend("'bar'", "types.first().extends.extends.extends.name", resource.getContents().get(0)); - assertWithXtend("null", "types.first().extends.extends.extends.extends", resource.getContents().get(0)); + Main main = (Main) resource.getContents().get(0); + assertEquals("bar", main.getTypes().get(0).getExtends().getName()); + assertEquals("bar2", main.getTypes().get(0).getExtends().getExtends().getName()); + assertEquals("bar", main.getTypes().get(0).getExtends().getExtends().getExtends().getName()); + assertNull(main.getTypes().get(0).getExtends().getExtends().getExtends().getExtends()); } - public void testScopeFileName() throws Exception { + @Test public void testScopeFileName() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -88,14 +89,14 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { models.addModel("bar.importuritestlanguage", "type bar type bar2 extends bar"); Resource resource = rs.getResource(URI.createURI("foo.importuritestlanguage"), true); - - assertWithXtend("'bar'", "types.first().extends.name", resource.getContents().get(0)); - assertWithXtend("'bar2'", "types.first().extends.extends.name", resource.getContents().get(0)); - assertWithXtend("'bar'", "types.first().extends.extends.extends.name", resource.getContents().get(0)); - assertWithXtend("null", "types.first().extends.extends.extends.extends", resource.getContents().get(0)); + Main main = (Main) resource.getContents().get(0); + assertEquals("bar", main.getTypes().get(0).getExtends().getName()); + assertEquals("bar2", main.getTypes().get(0).getExtends().getExtends().getName()); + assertEquals("bar", main.getTypes().get(0).getExtends().getExtends().getExtends().getName()); + assertNull(main.getTypes().get(0).getExtends().getExtends().getExtends().getExtends()); } - public void testUnresolvableImport() throws Exception { + @Test public void testUnresolvableImport() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -107,7 +108,7 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { assertNotNull(resource); } - public void testCircularImport() throws Exception { + @Test public void testCircularImport() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -116,16 +117,16 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { models.addModel("bar.importuritestlanguage", "import 'foo.importuritestlanguage' type bar extends foo"); Resource resource = rs.getResource(URI.createURI("foo.importuritestlanguage"), true); - - assertWithXtend("'bar'", "types.first().extends.name", resource.getContents().get(0)); - assertWithXtend("'foo'", "types.first().extends.extends.name", resource.getContents().get(0)); - assertWithXtend("true", "types.first().extends.extends == types.first()", resource.getContents().get(0)); + Main main = (Main) resource.getContents().get(0); + assertEquals("bar", main.getTypes().get(0).getExtends().getName()); + assertEquals("foo", main.getTypes().get(0).getExtends().getExtends().getName()); + assertSame(main.getTypes().get(0).getExtends().getExtends(), main.getTypes().get(0)); } /** * https://bugs.eclipse.org/bugs/show_bug.cgi?id=261630 */ - public void testBug261630_duplicateImports() throws Exception { + @Test public void testBug261630_duplicateImports() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); @@ -134,14 +135,14 @@ public class SimpleNameScopeProviderTest extends AbstractXtextTests { models.addModel("bar.importuritestlanguage", "type bar type bar2 extends bar"); Resource resource = rs.getResource(URI.createURI("foo.importuritestlanguage"), true); - - assertWithXtend("'bar'", "types.first().extends.name", resource.getContents().get(0)); - assertWithXtend("'bar2'", "types.first().extends.extends.name", resource.getContents().get(0)); - assertWithXtend("'bar'", "types.first().extends.extends.extends.name", resource.getContents().get(0)); - assertWithXtend("null", "types.first().extends.extends.extends.extends", resource.getContents().get(0)); + Main main = (Main) resource.getContents().get(0); + assertEquals("bar", main.getTypes().get(0).getExtends().getName()); + assertEquals("bar2", main.getTypes().get(0).getExtends().getExtends().getName()); + assertEquals("bar", main.getTypes().get(0).getExtends().getExtends().getExtends().getName()); + assertNull(main.getTypes().get(0).getExtends().getExtends().getExtends().getExtends()); } - public void testGetAllContents() throws Exception { + @Test public void testGetAllContents() throws Exception { SyntheticModelAwareURIConverter models = new SyntheticModelAwareURIConverter(); ResourceSetImpl rs = new ResourceSetImpl(); rs.setURIConverter(models); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java index 153c6803a..f07381dff 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AbstractSemanticSequencerTest.java @@ -8,12 +8,13 @@ package org.eclipse.xtext.serializer; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.serializer.DebugSequenceAcceptor; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.serializer.DebugSequenceAcceptor; import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.NodeModelSemanticSequencer; import org.eclipse.xtext.serializer.serializer.AbstractSequencerTestLanguageSemanticSequencer; +import org.junit.Test; import com.google.inject.Inject; import com.google.inject.Provider; @@ -24,7 +25,7 @@ import com.google.inject.Provider; public abstract class AbstractSemanticSequencerTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SequencerTestLanguageStandaloneSetup.class); getInjector().injectMembers(this); @@ -78,7 +79,7 @@ public abstract class AbstractSemanticSequencerTest extends AbstractXtextTests { assertEquals(expected.toString(), generatedActual.toString()); } - // public void testXtext() throws Exception { + // @Test public void testXtext() throws Exception { // with(XtextStandaloneSetup.class); // EObject model = getGrammarAccess().getGrammar(); // // System.out.println(EmfFormatter.objToStr(model)); @@ -97,333 +98,333 @@ public abstract class AbstractSemanticSequencerTest extends AbstractXtextTests { // assertNotNull(actual); // } - public void testSimpleGroup() throws Exception { + @Test public void testSimpleGroup() throws Exception { testSequence("#1 a b"); } - public void testSimpleAlternative1() throws Exception { + @Test public void testSimpleAlternative1() throws Exception { testSequence("#2 kw2 a"); } - public void testSimpleAlternative2() throws Exception { + @Test public void testSimpleAlternative2() throws Exception { testSequence("#2 kw2 a"); } - public void testSimpleMultiplicities1() throws Exception { + @Test public void testSimpleMultiplicities1() throws Exception { testSequence("#3 a kw1 b kw2 c d kw3 e f"); } - public void testSimpleMultiplicities2() throws Exception { + @Test public void testSimpleMultiplicities2() throws Exception { testSequence("#3 a kw1 kw2 c kw3 e"); } - public void testSimpleMultiplicities3() throws Exception { + @Test public void testSimpleMultiplicities3() throws Exception { testSequence("#3 a kw1 kw2 c kw3"); } - public void testGroupMultiplicities1() throws Exception { + @Test public void testGroupMultiplicities1() throws Exception { testSequence("#4 a kw1 b c kw2 d e f g kw3 h i j k"); } - public void testGroupMultiplicities2() throws Exception { + @Test public void testGroupMultiplicities2() throws Exception { testSequence("#4 a kw1 b c kw2 d e kw3 h i"); } - public void testGroupMultiplicities3() throws Exception { + @Test public void testGroupMultiplicities3() throws Exception { testSequence("#4 a kw1 b c kw2 d e kw3"); } - public void testAlternativeMultiplicities1() throws Exception { + @Test public void testAlternativeMultiplicities1() throws Exception { testSequence("#5 a kw2 b c kw3 d kw3 e kw4 g h kw5 i kw5 j"); } - public void testAlternativeMultiplicities2() throws Exception { + @Test public void testAlternativeMultiplicities2() throws Exception { testSequence("#5 kw1 a kw2 b kw4 g"); } - public void testAlternativeMultiplicities3() throws Exception { + @Test public void testAlternativeMultiplicities3() throws Exception { testSequence("#5 kw1 a kw2 kw3 b kw4 kw5 g"); } - public void testAlternativeMultiplicities4() throws Exception { + @Test public void testAlternativeMultiplicities4() throws Exception { testSequence("#5 kw1 a kw2 kw3 b kw4"); } - public void testList1a() throws Exception { + @Test public void testList1a() throws Exception { testSequence("#6 a, b, c, d, e"); } - public void testList1b() throws Exception { + @Test public void testList1b() throws Exception { testSequence("#6 a, b"); } - public void testList1c() throws Exception { + @Test public void testList1c() throws Exception { testSequence("#6 a"); } - public void testList2a() throws Exception { + @Test public void testList2a() throws Exception { testSequence("#7 a, b, c"); } - public void testList2b() throws Exception { + @Test public void testList2b() throws Exception { testSequence("#7 a, b"); } - public void testList2c() throws Exception { + @Test public void testList2c() throws Exception { testSequence("#7 a"); } - public void testList2d() throws Exception { + @Test public void testList2d() throws Exception { testSequence("#7"); } - public void testSingleKeyword1() throws Exception { + @Test public void testSingleKeyword1() throws Exception { testSequence("#10 kw1"); } - public void testSingleKeyword2() throws Exception { + @Test public void testSingleKeyword2() throws Exception { testSequence("#10 kw2"); } - public void testSingleKeyword3() throws Exception { + @Test public void testSingleKeyword3() throws Exception { testSequence("#10 kw3"); } - public void testSingleKeyword1OrID() throws Exception { + @Test public void testSingleKeyword1OrID() throws Exception { testSequence("#11 kw1"); } - public void testSingleKeywordOrID2() throws Exception { + @Test public void testSingleKeywordOrID2() throws Exception { testSequence("#11 kw2"); } - public void testSingleKeywordOrID3() throws Exception { + @Test public void testSingleKeywordOrID3() throws Exception { testSequence("#11 kw3"); } - public void testSingleKeywordOrID4() throws Exception { + @Test public void testSingleKeywordOrID4() throws Exception { testSequence("#11 foo"); } - public void testSingleTerminals1() throws Exception { + @Test public void testSingleTerminals1() throws Exception { testSequence("#12 $1foo"); } - public void testSingleTerminals2() throws Exception { + @Test public void testSingleTerminals2() throws Exception { testSequence("#12 $2foo"); } - public void testSingleEnum1() throws Exception { + @Test public void testSingleEnum1() throws Exception { testSequence("#13 kw1"); } - public void testSingleEnum2() throws Exception { + @Test public void testSingleEnum2() throws Exception { testSequence("#13 kw1"); } - public void testSingleEnum3() throws Exception { + @Test public void testSingleEnum3() throws Exception { testSequence("#13 kw1"); } - public void testSingleCrossReference1() throws Exception { + @Test public void testSingleCrossReference1() throws Exception { testSequence("#14 $1foo $1foo"); } - public void testSingleCrossReference2() throws Exception { + @Test public void testSingleCrossReference2() throws Exception { testSequence("#14 $2foo $2foo"); } - public void testSingleCrossReference3() throws Exception { + @Test public void testSingleCrossReference3() throws Exception { testSequence("#14 $3foo $3foo"); } - public void testSingleContainmentReference1() throws Exception { + @Test public void testSingleContainmentReference1() throws Exception { testSequence("#15 kw1"); } - public void testSingleContainmentReference2() throws Exception { + @Test public void testSingleContainmentReference2() throws Exception { testSequence("#15 kw2"); } - public void testSingleContainmentReference3() throws Exception { + @Test public void testSingleContainmentReference3() throws Exception { testSequence("#15 kw3"); } // TODO: test multiple keywords - // public void testList3a() throws Exception { + // @Test public void testList3a() throws Exception { // testSequence("#8 a, b, c"); // } // - // public void testList3b() throws Exception { + // @Test public void testList3b() throws Exception { // testSequence("#8 a"); // } // - // public void testList3c() throws Exception { + // @Test public void testList3c() throws Exception { // testSequence("#8 kw3 a"); // } - public void testDependentAlternative1_a() throws Exception { + @Test public void testDependentAlternative1_a() throws Exception { testSequence("#19 foo1"); } - public void testDependentAlternative1_b() throws Exception { + @Test public void testDependentAlternative1_b() throws Exception { testSequence("#19 foo kw1"); } - public void testDependentAlternative2_a() throws Exception { + @Test public void testDependentAlternative2_a() throws Exception { testSequence("#20 foo bar"); } - public void testDependentAlternative2_b() throws Exception { + @Test public void testDependentAlternative2_b() throws Exception { testSequence("#20 foo bar baz"); } - public void testDependentAlternative2_c() throws Exception { + @Test public void testDependentAlternative2_c() throws Exception { testSequence("#20 foo bar kw1"); } - public void testDependentAlternative2_d() throws Exception { + @Test public void testDependentAlternative2_d() throws Exception { testSequence("#20 foo kw1"); } - public void testOptional1_a() throws Exception { + @Test public void testOptional1_a() throws Exception { testSequence("#21 1 2 3"); } - public void testOptional1_b() throws Exception { + @Test public void testOptional1_b() throws Exception { testSequence("#21 0 0 1"); } - public void testOptional1_c() throws Exception { + @Test public void testOptional1_c() throws Exception { testSequence("#21 0 0 0"); } - public void testOptional1_d() throws Exception { + @Test public void testOptional1_d() throws Exception { testSequence("#21 0"); } - public void testOptional1_e() throws Exception { + @Test public void testOptional1_e() throws Exception { testSequence("#21 1"); } - public void testUnorderedAlternative1() throws Exception { + @Test public void testUnorderedAlternative1() throws Exception { testSequence("#23 1 a"); } - public void testUnorderedAlternative2() throws Exception { + @Test public void testUnorderedAlternative2() throws Exception { testSequence("#23 a 1"); } - public void testUnorderedAlternative3() throws Exception { + @Test public void testUnorderedAlternative3() throws Exception { testSequence("#23 kw1 a kw2 b"); } - public void testUnorderedAlternative4() throws Exception { + @Test public void testUnorderedAlternative4() throws Exception { testSequence("#23 kw2 b kw1 a"); } - public void testUnorderedAlternative5() throws Exception { + @Test public void testUnorderedAlternative5() throws Exception { testSequence("#23 1 a kw1 a kw2 b"); } - public void testUnorderedAlternative6() throws Exception { + @Test public void testUnorderedAlternative6() throws Exception { testSequence("#23 kw2 b kw1 a a 1"); } - public void testUnorderedAlternative7() throws Exception { + @Test public void testUnorderedAlternative7() throws Exception { testSequence("#23 kw2 b kw1 a a 1 c d 2 i 7 kw2 x kw1 x 8 g"); } - public void testUnorderedGroup1() throws Exception { + @Test public void testUnorderedGroup1() throws Exception { testSequence("#24 1 a kw1 a kw2 b"); } - public void testUnorderedGroup2() throws Exception { + @Test public void testUnorderedGroup2() throws Exception { testSequence("#24 1 a kw2 b kw1 a"); } - public void testUnorderedGroup3() throws Exception { + @Test public void testUnorderedGroup3() throws Exception { testSequence("#24 a 1 kw1 a kw2 b"); } - public void testUnorderedGroup4() throws Exception { + @Test public void testUnorderedGroup4() throws Exception { testSequence("#24 a 1 kw2 b kw1 a"); } - public void testUnorderedGroup5() throws Exception { + @Test public void testUnorderedGroup5() throws Exception { testSequence("#24 kw1 a kw2 b 1 a "); } - public void testUnorderedGroup6() throws Exception { + @Test public void testUnorderedGroup6() throws Exception { testSequence("#24 kw2 b kw1 a 1 a"); } - public void testUnorderedGroup7() throws Exception { + @Test public void testUnorderedGroup7() throws Exception { testSequence("#24 kw1 a kw2 b a 1"); } - public void testUnorderedGroup8() throws Exception { + @Test public void testUnorderedGroup8() throws Exception { testSequence("#24 kw2 b kw1 a a 1"); } - public void testUnorderedGroupOptional1() throws Exception { + @Test public void testUnorderedGroupOptional1() throws Exception { testSequence("#25 kw1 a kw2 b kw3 c"); } - public void testUnorderedGroupOptional2() throws Exception { + @Test public void testUnorderedGroupOptional2() throws Exception { testSequence("#25 kw1 a kw2 b"); } - public void testUnorderedGroupOptional3() throws Exception { + @Test public void testUnorderedGroupOptional3() throws Exception { testSequence("#25 kw1 a kw3 c"); } - public void testUnorderedGroupOptional4() throws Exception { + @Test public void testUnorderedGroupOptional4() throws Exception { testSequence("#25 kw2 b kw3 c"); } - public void testUnorderedGroupOptional5() throws Exception { + @Test public void testUnorderedGroupOptional5() throws Exception { testSequence("#25 kw2 b kw1 a"); } - public void testUnorderedGroupOptional6() throws Exception { + @Test public void testUnorderedGroupOptional6() throws Exception { testSequence("#25 kw3 c kw1 a"); } - public void testUnorderedGroupOptional7() throws Exception { + @Test public void testUnorderedGroupOptional7() throws Exception { testSequence("#25 kw3 c kw2 b"); } - public void testUnorderedGroupBoolean1() throws Exception { + @Test public void testUnorderedGroupBoolean1() throws Exception { testSequence("#26 kw1 kw2"); } - public void testUnorderedGroupBoolean2() throws Exception { + @Test public void testUnorderedGroupBoolean2() throws Exception { testSequence("#26 kw2 kw1"); } - public void testUnorderedGroupBoolean3() throws Exception { + @Test public void testUnorderedGroupBoolean3() throws Exception { testSequence("#26 kw2 kw3"); } - public void testUnorderedGroupBoolean4() throws Exception { + @Test public void testUnorderedGroupBoolean4() throws Exception { testSequence("#26 kw3 kw2"); } - public void testUnorderedGroupBoolean5() throws Exception { + @Test public void testUnorderedGroupBoolean5() throws Exception { testSequence("#26 kw1 kw3"); } - public void testUnorderedGroupBoolean6() throws Exception { + @Test public void testUnorderedGroupBoolean6() throws Exception { testSequence("#26 kw3 kw1"); } - public void testUnorderedGroupBoolean7() throws Exception { + @Test public void testUnorderedGroupBoolean7() throws Exception { testSequence("#26 kw1 kw2 kw3"); } - public void testUnorderedGroupBoolean8() throws Exception { + @Test public void testUnorderedGroupBoolean8() throws Exception { testSequence("#26 kw3 kw2 kw1"); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java index e667ede9f..63c1f8d73 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTest.java @@ -12,8 +12,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.AbstractElement; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.util.ParseHelper; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.util.ParseHelper; import org.eclipse.xtext.serializer.assignmentFinderTest.ContainmentRef; import org.eclipse.xtext.serializer.assignmentFinderTest.CrossRef; import org.eclipse.xtext.serializer.assignmentFinderTest.EnumBool; @@ -37,6 +37,7 @@ import org.eclipse.xtext.serializer.services.AssignmentFinderTestLanguageGrammar import org.eclipse.xtext.serializer.services.AssignmentFinderTestLanguageGrammarAccess.MixedValueElements; import org.eclipse.xtext.serializer.services.AssignmentFinderTestLanguageGrammarAccess.TerminalBoolElements; import org.eclipse.xtext.serializer.services.AssignmentFinderTestLanguageGrammarAccess.TerminalValElements; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; @@ -48,7 +49,7 @@ import com.google.inject.Inject; */ public class AssignmentFinderTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(AssignmentFinderTestLanguageStandaloneSetup.class); getInjector().injectMembers(this); @@ -69,21 +70,21 @@ public class AssignmentFinderTest extends AbstractXtextTests { return Joiner.on(", ").join(Iterables.transform(found, new GrammarElementTitleSwitch().showAssignments())); } - public void testKeywordVal1() throws Exception { + @Test public void testKeywordVal1() throws Exception { KeywordValElements g = grammar.getKeywordValAccess(); KeywordVal model = parser.parse("#00 kw1").getKeywordVal(); String ass = findAssignments(model, model.getKw(), g.getKwKw1Keyword_0_0(), g.getKwKw2Keyword_1_0()); assertEquals("kw='kw1'", ass); } - public void testKeywordVal2() throws Exception { + @Test public void testKeywordVal2() throws Exception { KeywordValElements g = grammar.getKeywordValAccess(); KeywordVal model = parser.parse("#00 kw2").getKeywordVal(); String ass = findAssignments(model, model.getKw(), g.getKwKw1Keyword_0_0(), g.getKwKw2Keyword_1_0()); assertEquals("kw='kw2'", ass); } - public void testTerminalVal1() throws Exception { + @Test public void testTerminalVal1() throws Exception { TerminalValElements g = grammar.getTerminalValAccess(); TerminalVal model = parser.parse("#01 %BAR").getTerminalVal(); String ass = findAssignments(model, model.getTerm(), g.getTermTerminal1TerminalRuleCall_0_0(), @@ -91,7 +92,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("term=Terminal1", ass); } - public void testTerminalVal2() throws Exception { + @Test public void testTerminalVal2() throws Exception { TerminalValElements g = grammar.getTerminalValAccess(); TerminalVal model = parser.parse("#01 %bar").getTerminalVal(); String ass = findAssignments(model, model.getTerm(), g.getTermTerminal1TerminalRuleCall_0_0(), @@ -99,7 +100,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("term=Terminal2", ass); } - public void testTerminalVal3() throws Exception { + @Test public void testTerminalVal3() throws Exception { TerminalValElements g = grammar.getTerminalValAccess(); TerminalVal model = parser.parse("#01 %foo").getTerminalVal(); String ass = findAssignments(model, model.getTerm(), g.getTermTerminal1TerminalRuleCall_0_0(), @@ -107,7 +108,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("term='%foo'", ass); } - public void testEnumVal1() throws Exception { + @Test public void testEnumVal1() throws Exception { EnumValElements g = grammar.getEnumValAccess(); EnumVal model = parser.parse("#02 lit1").getEnumVal(); String ass = findAssignments(model, model.getEn(), g.getEnEnum1EnumRuleCall_0_0(), @@ -115,7 +116,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("en=Enum1", ass); } - public void testEnumVal2() throws Exception { + @Test public void testEnumVal2() throws Exception { EnumValElements g = grammar.getEnumValAccess(); EnumVal model = parser.parse("#02 lit2").getEnumVal(); String ass = findAssignments(model, model.getEn(), g.getEnEnum1EnumRuleCall_0_0(), @@ -123,14 +124,14 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("en=Enum2", ass); } - public void testKeywordBool() throws Exception { + @Test public void testKeywordBool() throws Exception { KeywordBoolElements g = grammar.getKeywordBoolAccess(); KeywordBool model = parser.parse("#03 kw1").getKeywordBool(); String ass = findAssignments(model, model.isKw(), g.getKwKw1Keyword_0_0(), g.getKwKw2Keyword_1_0()); assertEquals("kw?='kw1', kw?='kw2'", ass); } - public void testTerminalBool() throws Exception { + @Test public void testTerminalBool() throws Exception { TerminalBoolElements g = grammar.getTerminalBoolAccess(); TerminalBool model = parser.parse("#04 %BAR").getTerminalBool(); String ass = findAssignments(model, model.isTerm(), g.getTermTerminal1TerminalRuleCall_0_0(), @@ -138,7 +139,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("term?=Terminal1, term?=Terminal2, term?='%foo'", ass); } - public void testEnumBool() throws Exception { + @Test public void testEnumBool() throws Exception { EnumBoolElements g = grammar.getEnumBoolAccess(); EnumBool model = parser.parse("#05 lit1").getEnumBool(); String ass = findAssignments(model, model.isEn(), g.getEnEnum1EnumRuleCall_0_0(), @@ -146,7 +147,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("en?=Enum1, en?=Enum2", ass); } - public void testMixedBool1() throws Exception { + @Test public void testMixedBool1() throws Exception { MixedBoolElements g = grammar.getMixedBoolAccess(); MixedBool model = parser.parse("#06 true").getMixedBool(); String ass = findAssignments(model, model.isVal(), g.getValKw1Keyword_0_0(), @@ -154,7 +155,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("val?='kw1', val=Boolean", ass); } - public void testMixedBool2() throws Exception { + @Test public void testMixedBool2() throws Exception { MixedBoolElements g = grammar.getMixedBoolAccess(); MixedBool model = parser.parse("#06 false").getMixedBool(); String ass = findAssignments(model, model.isVal(), g.getValKw1Keyword_0_0(), @@ -162,7 +163,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("val=Boolean", ass); } - public void testMixedValue1() throws Exception { + @Test public void testMixedValue1() throws Exception { MixedValueElements g = grammar.getMixedValueAccess(); MixedValue model = parser.parse("#07 lit1").getMixedValue(); String ass = findAssignments(model, model.getVal(), g.getValDatEnumParserRuleCall_1_0(), @@ -170,7 +171,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("val=Enum1", ass); } - public void testMixedValue2() throws Exception { + @Test public void testMixedValue2() throws Exception { MixedValueElements g = grammar.getMixedValueAccess(); MixedValue model = parser.parse("#07 lit3").getMixedValue(); String ass = findAssignments(model, model.getVal(), g.getValDatEnumParserRuleCall_1_0(), @@ -178,7 +179,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("val=DatEnum", ass); } - public void testContainmentRef1() throws Exception { + @Test public void testContainmentRef1() throws Exception { ContainmentRefElements g = grammar.getContainmentRefAccess(); ContainmentRef model = parser.parse("#08 kw1 foo").getContainmentRef(); String ass = findAssignments(model, model.getCtx(), g.getCtxContainmentRef1ParserRuleCall_0_0(), @@ -186,7 +187,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("ctx=ContainmentRef1", ass); } - public void testContainmentRef2() throws Exception { + @Test public void testContainmentRef2() throws Exception { ContainmentRefElements g = grammar.getContainmentRefAccess(); ContainmentRef model = parser.parse("#08 kw2 foo").getContainmentRef(); String ass = findAssignments(model, model.getCtx(), g.getCtxContainmentRef1ParserRuleCall_0_0(), @@ -194,7 +195,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("ctx=ContainmentRef2", ass); } - public void testCrossRef1() throws Exception { + @Test public void testCrossRef1() throws Exception { CrossRefElements g = grammar.getCrossRefAccess(); CrossRef model = parser.parse("#09 %BAR %BAR").getCrossRef(); String ass = findAssignments(model, model.getCrossRef(), @@ -203,7 +204,7 @@ public class AssignmentFinderTest extends AbstractXtextTests { assertEquals("crossRef=[CrossRef|Terminal1]", ass); } - public void testCrossRef2() throws Exception { + @Test public void testCrossRef2() throws Exception { CrossRefElements g = grammar.getCrossRefAccess(); CrossRef model = parser.parse("#09 %bar %bar").getCrossRef(); String ass = findAssignments(model, model.getCrossRef(), diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java index 3655a2c15..aa60560f0 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextFinderTest.java @@ -11,14 +11,15 @@ import java.util.Collections; import java.util.List; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.util.ParseHelper; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.util.ParseHelper; import org.eclipse.xtext.serializer.analysis.Context2NameFunction; import org.eclipse.xtext.serializer.contextFinderTest.Model; import org.eclipse.xtext.serializer.contextFinderTest.ParentRefTest1; import org.eclipse.xtext.serializer.contextFinderTest.ParentRefTest2; import org.eclipse.xtext.serializer.contextFinderTest.ParentRefTestChild; import org.eclipse.xtext.serializer.sequencer.IContextFinder; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -29,7 +30,7 @@ import com.google.inject.Inject; */ public class ContextFinderTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ContextFinderTestLanguageStandaloneSetup.class); getInjector().injectMembers(this); @@ -60,90 +61,90 @@ public class ContextFinderTest extends AbstractXtextTests { return Joiner.on(", ").join(result); } - public void testAttributeExclusionTest1() throws Exception { + @Test public void testAttributeExclusionTest1() throws Exception { Model model = parseHelper.parse("#1 kw1 bar"); assertEquals("AttributeExclusionTest1", findContextsByContents(model.getAttributeExclusion())); } - public void testAttributeExclusionTest2() throws Exception { + @Test public void testAttributeExclusionTest2() throws Exception { Model model = parseHelper.parse("#1 kw2 bar"); assertEquals("AttributeExclusionTest2", findContextsByContents(model.getAttributeExclusion())); } - public void testNestedTypeTest1() throws Exception { + @Test public void testNestedTypeTest1() throws Exception { Model model = parseHelper.parse("#2 kw1 bar"); assertEquals("NestedTypeTest1", findContextsByContents(model.getNestedType())); } - public void testNestedTypeTest2() throws Exception { + @Test public void testNestedTypeTest2() throws Exception { Model model = parseHelper.parse("#2 kw2 bar"); assertEquals("NestedTypeTest2", findContextsByContents(model.getNestedType())); } - public void testNestedTypeRecursiveTest1() throws Exception { + @Test public void testNestedTypeRecursiveTest1() throws Exception { Model model = parseHelper.parse("#3 kw1 . ."); assertEquals("NestedTypeRecursiveTest1, NestedTypeRecursiveTest1_NestedTypeRecursiveTest_2_0", findContextsByContents(model.getNestedTypeRecursiveTest2())); } - public void testNestedTypeRecursiveTest2() throws Exception { + @Test public void testNestedTypeRecursiveTest2() throws Exception { Model model = parseHelper.parse("#3 kw2 . ."); assertEquals("NestedTypeRecursiveTest2, NestedTypeRecursiveTest2_NestedTypeRecursiveTest_2_0", findContextsByContents(model.getNestedTypeRecursiveTest2())); } - public void testParentRefTest1() throws Exception { + @Test public void testParentRefTest1() throws Exception { Model model = parseHelper.parse("#4 kw1 foo"); ParentRefTestChild child1 = ((ParentRefTest1) model.getParentRef()).getChild1(); assertEquals("ParentRefTestChild1", findContextsByContentsAndContainer(child1)); } - public void testParentRefTest2() throws Exception { + @Test public void testParentRefTest2() throws Exception { Model model = parseHelper.parse("#4 kw2 foo"); ParentRefTestChild child2 = ((ParentRefTest2) model.getParentRef()).getChild2(); assertEquals("ParentRefTestChild2", findContextsByContentsAndContainer(child2)); } - public void testParentRefTest3() throws Exception { + @Test public void testParentRefTest3() throws Exception { Model model = parseHelper.parse("#4 kw1 foo foo foo"); ParentRefTestChild child1 = ((ParentRefTest1) model.getParentRef()).getChild1().getChild().getChild(); assertEquals("ParentRefTestChild1", findContextsByContentsAndContainer(child1)); } - public void testParentRefTest4() throws Exception { + @Test public void testParentRefTest4() throws Exception { Model model = parseHelper.parse("#4 kw2 foo foo foo"); ParentRefTestChild child2 = ((ParentRefTest2) model.getParentRef()).getChild2().getChild().getChild(); assertEquals("ParentRefTestChild2", findContextsByContentsAndContainer(child2)); } - public void testRootContainer() throws Exception { + @Test public void testRootContainer() throws Exception { Model model = parseHelper.parse("#0 model #1 kw1 bar"); assertEquals("Model", findContextsByContentsAndContainer(model)); assertEquals("Model2", findContextsByContentsAndContainer(model.getModel())); } - public void testQuantityExclusionTest1() throws Exception { + @Test public void testQuantityExclusionTest1() throws Exception { Model model = parseHelper.parse("#5 kw1 bar"); assertEquals("QuantityExclusionTest1", findContextsByContents(model.getQuantityExclusion())); } - public void testQuantityExclusionTest2() throws Exception { + @Test public void testQuantityExclusionTest2() throws Exception { Model model = parseHelper.parse("#5 kw2 bar"); assertEquals("QuantityExclusionTest2", findContextsByContents(model.getQuantityExclusion())); } - public void testQuantityExclusionTest3() throws Exception { + @Test public void testQuantityExclusionTest3() throws Exception { Model model = parseHelper.parse("#5 kw2 bar baz"); assertEquals("QuantityExclusionTest1, QuantityExclusionTest2", findContextsByContents(model.getQuantityExclusion())); } - public void testValueExclusionTest1() throws Exception { + @Test public void testValueExclusionTest1() throws Exception { Model model = parseHelper.parse("#6 lit1"); assertEquals("ValueExclusionTest1", findContextsByContents(model.getValueExclusion())); } - public void testValueExclusionTest2() throws Exception { + @Test public void testValueExclusionTest2() throws Exception { Model model = parseHelper.parse("#6 lit2"); assertEquals("ValueExclusionTest2", findContextsByContents(model.getValueExclusion())); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java index 24877dd3e..be194b327 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java @@ -17,7 +17,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.Context2NameFunction; import org.eclipse.xtext.serializer.analysis.IContextPDAProvider; import org.eclipse.xtext.serializer.analysis.IContextProvider; @@ -26,6 +26,7 @@ import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.Pda; import org.eclipse.xtext.util.formallang.PdaListFormatter; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -84,12 +85,12 @@ public class ContextPDAProviderTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testKeywordAlternative() throws Exception { + @Test public void testKeywordAlternative() throws Exception { String actual = getParserRule("Rule: a1=ID ('kw1' | 'kw2') a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule:\n"); @@ -101,7 +102,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testDelegation1() throws Exception { + @Test public void testDelegation1() throws Exception { String actual = getParserRule("Rule: Delegate; Delegate: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Delegate:\n"); @@ -115,7 +116,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testDelegation2() throws Exception { + @Test public void testDelegation2() throws Exception { String actual = getParserRule("Rule: Foo | Delegate1; Delegate1: 'del' Delegate2 bar=ID; Delegate2: val=ID; Foo: val2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Delegate1:\n"); @@ -146,7 +147,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActionMandatory() throws Exception { + @Test public void testActionMandatory() throws Exception { String actual = getParserRule("Rule: val1=ID {Act.val2=current} val3=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule:\n"); @@ -159,7 +160,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActionOptional() throws Exception { + @Test public void testActionOptional() throws Exception { String actual = getParserRule("Rule: val1=ID ({Act.val2=current} val3=ID)?;"); StringBuilder expected = new StringBuilder(); expected.append("Rule:\n"); @@ -173,7 +174,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActionManyMandatory() throws Exception { + @Test public void testActionManyMandatory() throws Exception { String actual = getParserRule("Rule: val1=ID ({Act.val2=current} val3=ID)+;"); StringBuilder expected = new StringBuilder(); expected.append("Rule:\n"); @@ -188,7 +189,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActionManyOptional() throws Exception { + @Test public void testActionManyOptional() throws Exception { String actual = getParserRule("Rule: val1=ID ({Act.val2=current} val3=ID)*;"); StringBuilder expected = new StringBuilder(); expected.append("Rule:\n"); @@ -204,7 +205,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActionTwoMandatory() throws Exception { + @Test public void testActionTwoMandatory() throws Exception { String actual = getParserRule("Rule: val1=ID {Act1.val2=current} val3=ID {Act2.val2=current} val4=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule:\n"); @@ -221,7 +222,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testExpression1() throws Exception { + @Test public void testExpression1() throws Exception { String actual = getParserRule("Exp: 'kw' Addit; Addit returns Exp: Prim ({Add.left=current} '+' right=Prim)*; Prim returns Exp: {Val} val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Addit:\n"); @@ -261,7 +262,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testOptionalDelegate() throws Exception { + @Test public void testOptionalDelegate() throws Exception { String actual = getParserRule("Rule: Mand | Opt; Mand: 'm' mand=ID; Opt: 'o' opt=ID?;"); StringBuilder expected = new StringBuilder(); expected.append("Mand:\n"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java index 9ee3abf11..d9a94cda6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java @@ -15,11 +15,12 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.Context2NameFunction; import org.eclipse.xtext.serializer.analysis.IContextProvider; import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -31,7 +32,7 @@ import com.google.common.collect.Lists; */ public class ContextProviderTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -64,49 +65,49 @@ public class ContextProviderTest extends AbstractXtextTests { })); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String actual = getContexts("Rule: foo=ID;"); String expected = "Rule returns Rule"; assertEquals(expected, actual); } - public void testUnassignedAction1() throws Exception { + @Test public void testUnassignedAction1() throws Exception { String actual = getContexts("Rule: {Foo};"); String expected = "Rule returns Foo"; assertEquals(expected, actual); } - public void testUnassignedAction2() throws Exception { + @Test public void testUnassignedAction2() throws Exception { String actual = getContexts("Rule: ('foo' {Foo})? val=ID;"); String expected = "Rule returns Foo, Rule"; assertEquals(expected, actual); } - public void testUnassignedAction3() throws Exception { + @Test public void testUnassignedAction3() throws Exception { String actual = getContexts("Rule: ('foo' {Foo})?;"); String expected = "Rule returns Foo, null"; assertEquals(expected, actual); } - public void testUnassignedAction4() throws Exception { + @Test public void testUnassignedAction4() throws Exception { String actual = getContexts("Rule: {Foo} | {Bar};"); String expected = "Rule returns Bar, Foo"; assertEquals(expected, actual); } - public void testUnassignedAction5() throws Exception { + @Test public void testUnassignedAction5() throws Exception { String actual = getContexts("Rule: {Foo} | {Bar} | val=ID;"); String expected = "Rule returns Bar, Foo, Rule"; assertEquals(expected, actual); } - public void testUnassignedAction6() throws Exception { + @Test public void testUnassignedAction6() throws Exception { String actual = getContexts("Rule: 'foo' ('foo' {Foo})?;"); String expected = "Rule returns Foo, null"; assertEquals(expected, actual); } - public void testUnassignedRuleCall1() throws Exception { + @Test public void testUnassignedRuleCall1() throws Exception { String actual = getContexts("Rule: Foo; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Foo returns Foo\n"); @@ -114,7 +115,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall2() throws Exception { + @Test public void testUnassignedRuleCall2() throws Exception { String actual = getContexts("Rule: Foo? val2=ID; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Foo returns Foo\n"); @@ -122,7 +123,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall3() throws Exception { + @Test public void testUnassignedRuleCall3() throws Exception { String actual = getContexts("Rule: Foo?; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Foo returns Foo\n"); @@ -130,7 +131,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall4() throws Exception { + @Test public void testUnassignedRuleCall4() throws Exception { String actual = getContexts("Rule: (Foo 'foo')?; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Foo returns Foo\n"); @@ -138,7 +139,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall5() throws Exception { + @Test public void testUnassignedRuleCall5() throws Exception { String actual = getContexts("Rule: Foo | Bar; Foo: val=ID; Bar: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Bar returns Bar\n"); @@ -147,7 +148,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall6() throws Exception { + @Test public void testUnassignedRuleCall6() throws Exception { String actual = getContexts("Rule: Foo | Bar | val=ID; Foo: val=ID; Bar: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Bar returns Bar\n"); @@ -156,7 +157,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall7() throws Exception { + @Test public void testUnassignedRuleCall7() throws Exception { String actual = getContexts("Rule: Foo | Bar | 'baz'; Foo: val=ID; Bar: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Bar returns Bar\n"); @@ -165,7 +166,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAction1() throws Exception { + @Test public void testAssignedAction1() throws Exception { String actual = getContexts("Rule: val=ID {Foo.bar=current};"); StringBuilder expected = new StringBuilder(); expected.append("Rule returns Foo\n"); @@ -173,7 +174,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAction2() throws Exception { + @Test public void testAssignedAction2() throws Exception { String actual = getContexts("Rule: val=ID ({Foo.bar=current} 'x')?;"); StringBuilder expected = new StringBuilder(); expected.append("Rule returns Foo, Rule\n"); @@ -181,7 +182,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAction3() throws Exception { + @Test public void testAssignedAction3() throws Exception { String actual = getContexts("Rule: val=ID ({Foo.bar=current} 'x')*;"); StringBuilder expected = new StringBuilder(); expected.append("Rule returns Foo, Rule\n"); @@ -189,7 +190,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAction4() throws Exception { + @Test public void testAssignedAction4() throws Exception { String actual = getContexts("Rule: val=ID ({Foo.bar=current} 'x')+;"); StringBuilder expected = new StringBuilder(); expected.append("Rule returns Foo\n"); @@ -197,7 +198,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAction5() throws Exception { + @Test public void testAssignedAction5() throws Exception { String actual = getContexts("Rule: val=ID {Foo.bar=current} 'x' {Baz.bar=current} 'x';"); StringBuilder expected = new StringBuilder(); expected.append("Rule returns Baz\n"); @@ -206,7 +207,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAction6() throws Exception { + @Test public void testAssignedAction6() throws Exception { String actual = getContexts("Model: {Foo.left=current} (val=ID? | {Foo.left=current});"); StringBuilder expected = new StringBuilder(); expected.append("Model returns Foo\n"); @@ -215,7 +216,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedRuleCall1() throws Exception { + @Test public void testAssignedRuleCall1() throws Exception { String actual = getContexts("Rule: foo=Foo; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Foo returns Foo\n"); @@ -223,7 +224,7 @@ public class ContextProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedRuleCall2() throws Exception { + @Test public void testAssignedRuleCall2() throws Exception { String actual = getContexts("Rule: 'foo' foo=Foo; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Foo returns Foo\n"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java index 21a7475fb..68b32eb20 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java @@ -18,7 +18,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.Context2NameFunction; import org.eclipse.xtext.serializer.analysis.IContextProvider; import org.eclipse.xtext.serializer.analysis.IContextTypePDAProvider; @@ -27,6 +27,7 @@ import org.eclipse.xtext.util.Triple; import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.Pda; import org.eclipse.xtext.util.formallang.PdaListFormatter; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -98,12 +99,12 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testKeywordAlternative() throws Exception { + @Test public void testKeywordAlternative() throws Exception { String actual = getParserRule("Rule: a1=ID ('kw1' | 'kw2') a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -115,7 +116,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testDelegation1() throws Exception { + @Test public void testDelegation1() throws Exception { String actual = getParserRule("Rule: Delegate; Delegate: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Delegate_Delegate:\n"); @@ -129,7 +130,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testLoop1() throws Exception { + @Test public void testLoop1() throws Exception { String actual = getParserRule("Rule: ('x' x=ID*)*;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -142,7 +143,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testLoop2() throws Exception { + @Test public void testLoop2() throws Exception { String actual = getParserRule("Model: (('x' x+=ID*) | ('y' y+=ID*))*;"); StringBuilder expected = new StringBuilder(); expected.append("Model_Model:\n"); @@ -158,7 +159,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testDelegation2() throws Exception { + @Test public void testDelegation2() throws Exception { String actual = getParserRule("Rule: Foo | Delegate1; Delegate1: 'del' Delegate2 bar=ID; Delegate2: val=ID; Foo: val2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Delegate2_Delegate1:\n"); @@ -191,7 +192,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testExpression1() throws Exception { + @Test public void testExpression1() throws Exception { String actual = getParserRule("Exp: 'kw' Addit; Addit returns Exp: Prim ({Add.left=current} '+' right=Prim)*; Prim returns Exp: {Val} val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Add_Addit:\n"); @@ -240,7 +241,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testExpression2() throws Exception { + @Test public void testExpression2() throws Exception { String actual = getParserRule("Addition returns Expr: Prim ({Add.left=current} '+' right=Prim)*; Prim returns Expr: {Val} name=ID | '(' Addition ')';"); StringBuilder expected = new StringBuilder(); expected.append("Add_Addition:\n"); @@ -309,7 +310,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testOptionalDelegate() throws Exception { + @Test public void testOptionalDelegate() throws Exception { String actual = getParserRule("Rule: Mand | Opt; Mand: 'm' mand=ID; Opt: 'o' opt=ID?;"); StringBuilder expected = new StringBuilder(); expected.append("Mand_Mand:\n"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java index 2b2668428..fe256775c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java @@ -9,6 +9,7 @@ package org.eclipse.xtext.serializer; import org.eclipse.xtext.serializer.sequencer.GenericSemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API @@ -21,152 +22,152 @@ public class GenericSemanticSequencerTest extends AbstractSemanticSequencerTest } @Override - public void testUnorderedAlternative1() throws Exception { + @Test public void testUnorderedAlternative1() throws Exception { // unsupported } @Override - public void testUnorderedAlternative2() throws Exception { + @Test public void testUnorderedAlternative2() throws Exception { // unsupported } @Override - public void testUnorderedAlternative3() throws Exception { + @Test public void testUnorderedAlternative3() throws Exception { // unsupported } @Override - public void testUnorderedAlternative4() throws Exception { + @Test public void testUnorderedAlternative4() throws Exception { // unsupported } @Override - public void testUnorderedAlternative5() throws Exception { + @Test public void testUnorderedAlternative5() throws Exception { // unsupported } @Override - public void testUnorderedAlternative6() throws Exception { + @Test public void testUnorderedAlternative6() throws Exception { // unsupported } @Override - public void testUnorderedAlternative7() throws Exception { + @Test public void testUnorderedAlternative7() throws Exception { // unsupported } @Override - public void testUnorderedGroup1() throws Exception { + @Test public void testUnorderedGroup1() throws Exception { // unsupported } @Override - public void testUnorderedGroup2() throws Exception { + @Test public void testUnorderedGroup2() throws Exception { // unsupported } @Override - public void testUnorderedGroup3() throws Exception { + @Test public void testUnorderedGroup3() throws Exception { // unsupported } @Override - public void testUnorderedGroup4() throws Exception { + @Test public void testUnorderedGroup4() throws Exception { // unsupported } @Override - public void testUnorderedGroup5() throws Exception { + @Test public void testUnorderedGroup5() throws Exception { // unsupported } @Override - public void testUnorderedGroup6() throws Exception { + @Test public void testUnorderedGroup6() throws Exception { // unsupported } @Override - public void testUnorderedGroup7() throws Exception { + @Test public void testUnorderedGroup7() throws Exception { // unsupported } @Override - public void testUnorderedGroup8() throws Exception { + @Test public void testUnorderedGroup8() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional1() throws Exception { + @Test public void testUnorderedGroupOptional1() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional2() throws Exception { + @Test public void testUnorderedGroupOptional2() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional3() throws Exception { + @Test public void testUnorderedGroupOptional3() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional4() throws Exception { + @Test public void testUnorderedGroupOptional4() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional5() throws Exception { + @Test public void testUnorderedGroupOptional5() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional6() throws Exception { + @Test public void testUnorderedGroupOptional6() throws Exception { // unsupported } @Override - public void testUnorderedGroupOptional7() throws Exception { + @Test public void testUnorderedGroupOptional7() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean1() throws Exception { + @Test public void testUnorderedGroupBoolean1() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean2() throws Exception { + @Test public void testUnorderedGroupBoolean2() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean3() throws Exception { + @Test public void testUnorderedGroupBoolean3() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean4() throws Exception { + @Test public void testUnorderedGroupBoolean4() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean5() throws Exception { + @Test public void testUnorderedGroupBoolean5() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean6() throws Exception { + @Test public void testUnorderedGroupBoolean6() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean7() throws Exception { + @Test public void testUnorderedGroupBoolean7() throws Exception { // unsupported } @Override - public void testUnorderedGroupBoolean8() throws Exception { + @Test public void testUnorderedGroupBoolean8() throws Exception { // unsupported } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java index cfdcbf14c..3b4db4a97 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java @@ -13,10 +13,11 @@ import java.util.Set; import org.apache.log4j.Logger; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraint; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraintContext; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -65,7 +66,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe // } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -97,7 +98,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe return Joiner.on("\n").join(result); } - public void testXtext() { + @Test public void testXtext() { IGrammarConstraintProvider gcp = get(IGrammarConstraintProvider.class); List ctxts = gcp.getConstraints(getGrammarAccess().getGrammar()); // try { @@ -117,7 +118,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe // System.out.println(Joiner.on("\n").join(result)); } - public void testAssignedActionMandatory1() throws Exception { + @Test public void testAssignedActionMandatory1() throws Exception { String actual = getParserRule("Rule: Foo {Bar.left=current} '+' right=ID; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Bar;\n"); @@ -128,7 +129,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testAssignedActionMandatory2() throws Exception { + @Test public void testAssignedActionMandatory2() throws Exception { String actual = getParserRule("Rule: val=ID {Bar.left=current} '+' right=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Bar;\n"); @@ -138,7 +139,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testAssignedActionOptional() throws Exception { + @Test public void testAssignedActionOptional() throws Exception { String actual = getParserRule("Rule: Foo ({Bar.left=current} '+' right=ID)?; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Foo_Foo | Rule_Bar;\n"); @@ -149,7 +150,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testAssignedActionOptionalMany() throws Exception { + @Test public void testAssignedActionOptionalMany() throws Exception { String actual = getParserRule("Rule: Foo ({Bar.left=current} '+' right=ID)*; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Foo_Foo | Rule_Bar;\n"); @@ -160,7 +161,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testAssignedActionManadatoryMany() throws Exception { + @Test public void testAssignedActionManadatoryMany() throws Exception { String actual = getParserRule("Rule: Foo ({Bar.left=current} '+' right=ID)+; Foo: val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Bar;\n"); @@ -171,7 +172,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testExpression1() throws Exception { + @Test public void testExpression1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Prim ({Add.left=current} '+' right=Prim)*;\n"); grammar.append("Prim returns Expr: {Val} name=ID | '(' Addition ')';\n"); @@ -185,7 +186,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testExpression2() throws Exception { + @Test public void testExpression2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Multiplication ({Add.left=current} '+' right=Multiplication)*;\n"); grammar.append("Multiplication returns Expr: Prim ({Mult.left=current} '*' right=Prim)*;\n"); @@ -203,7 +204,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testExpression3() throws Exception { + @Test public void testExpression3() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Prim ({Add.children+=current} ('+' children+=Prim)+)?;\n"); grammar.append("Prim returns Expr: {Val} name=ID | '(' Addition ')';\n"); @@ -217,7 +218,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testExpression4() throws Exception { + @Test public void testExpression4() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Multiplication ({Add.addCh+=current} ('+' addCh+=Multiplication)+)?;\n"); grammar.append("Multiplication returns Expr: Prim ({Mult.mulCh+=current} ('*' mulCh+=Prim)+)?;\n"); @@ -235,7 +236,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testExpression5() throws Exception { + @Test public void testExpression5() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Multiplication ({Bin.left+=current} op='+' right=Multiplication)*;\n"); grammar.append("Multiplication returns Expr: Prim ({Bin.left+=current} op='*' right=Prim)*;\n"); @@ -252,7 +253,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testExpression6() throws Exception { + @Test public void testExpression6() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Assignment returns Expr: Addition ({Bin.left+=current} op='=' right=Addition)*;\n"); grammar.append("Addition returns Expr: Multiplication ({Bin.left+=current} op='+' right=Multiplication)*;\n"); @@ -276,7 +277,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionSequence1() throws Exception { + @Test public void testActionSequence1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: val1=ID {A.a1=current} a2=ID {B.b1=current} b2=ID {C.c1=current} c2=ID;\n"); String actual = getParserRule(grammar.toString()); @@ -292,7 +293,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionSequence2() throws Exception { + @Test public void testActionSequence2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: val1=ID {A.a1=current} a2=ID {A.a1=current} a2=ID {A.a1=current} a2=ID;\n"); String actual = getParserRule(grammar.toString()); @@ -308,7 +309,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionSequence3() throws Exception { + @Test public void testActionSequence3() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: val1=ID ({A.a1=current} a2=ID ({A.a1=current} a2=ID ({A.a1=current} a2=ID)?)?)?;\n"); String actual = getParserRule(grammar.toString()); @@ -324,7 +325,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionSequence4() throws Exception { + @Test public void testActionSequence4() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: {A1} ({A2.left=current})+;\n"); String actual = getParserRule(grammar.toString()); @@ -336,7 +337,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionSequence5() throws Exception { + @Test public void testActionSequence5() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: INT? {Bar} 'bar' ({FooBar.bar=current} 'act')?;"); String actual = getParserRule(grammar.toString()); @@ -348,7 +349,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionAlternative1() throws Exception { + @Test public void testActionAlternative1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: root=ID (val1=ID | {A.a1=current} a2=ID | {B.b1=current} b2=ID | {C.c1=current} c2=ID);\n"); String actual = getParserRule(grammar.toString()); @@ -380,7 +381,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe ')')? )*; */ - public void testActionAlternative2() throws Exception { + @Test public void testActionAlternative2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Bar ({Foo.f1=current} f2=ID f3=ID? f4=ID)*; Bar: bar=ID;\n"); String actual = getParserRule(grammar.toString()); @@ -393,7 +394,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionAlternative3() throws Exception { + @Test public void testActionAlternative3() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: {Foo} foo=ID ({Bar.bar=current} bar2=ID | {Baz.baz=current} baz2=ID);"); String actual = getParserRule(grammar.toString()); @@ -407,7 +408,7 @@ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTe assertEquals(expected.toString(), actual); } - public void testActionSingleAndAssigned() throws Exception { + @Test public void testActionSingleAndAssigned() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: {Act1} act1=ID | Foo ({Act2.left=current} act2=ID)?;\n"); grammar.append("Foo: foo=ID {Act1.f1=current} act1=ID val=ID;\n"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignmentsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignmentsTest.java index f0aa723f5..06244afa1 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignmentsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignmentsTest.java @@ -11,12 +11,13 @@ import java.util.List; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraint; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraintElement; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.RelationalDependencyType; import org.eclipse.xtext.util.Pair; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -27,7 +28,7 @@ import com.google.common.collect.Lists; public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -50,7 +51,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests return Joiner.on("\n").join(result); } - public void testMandatoryGroup1() throws Exception { + @Test public void testMandatoryGroup1() throws Exception { String actual = getParserRule("Rule: 'kw1' a1='a1' a2+='a2'* a3+='a3'+ a4+='a4'?;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -60,7 +61,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testMandatoryGroup2() throws Exception { + @Test public void testMandatoryGroup2() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' a2='a2') (b1='b1'? b2='b2'?) (c1+='c1'+ c2+='c2'+) (d1+='a1'* d2+='d2'*);"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -74,7 +75,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testOptionalGroup1() throws Exception { + @Test public void testOptionalGroup1() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' a2+='a2'* a3+='a3'+ a4+='a4'?)?;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -96,7 +97,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testOptionalGroup2() throws Exception { + @Test public void testOptionalGroup2() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' a2='a2')? (b1='b1'? b2='b2'?)? (c1+='c1'+ c2+='c2'+)? (d1+='a1'* d2+='d2'*)?;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -118,7 +119,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testManyGroup1() throws Exception { + @Test public void testManyGroup1() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1+='a1' a2+='a2'* a3+='a3'+ a4+='a4'?)+;"); StringBuilder expected = new StringBuilder(); expected.append("a1+='a1'\n"); @@ -140,7 +141,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testManyGroup2() throws Exception { + @Test public void testManyGroup2() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' a2='a2')+ (b1='b1'? b2='b2'?)+ (c1+='c1'+ c2+='c2'+)+ (d1+='a1'* d2+='d2'*)+;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -160,7 +161,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testOptionalManyGroup1() throws Exception { + @Test public void testOptionalManyGroup1() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' a2+='a2'* a3+='a3'+ a4+='a4'?)*;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -182,7 +183,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testOptionalManyGroup2() throws Exception { + @Test public void testOptionalManyGroup2() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' a2='a2')* (b1='b1'? b2='b2'?)* (c1+='c1'+ c2+='c2'+)* (d1+='a1'* d2+='d2'*)*;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -202,7 +203,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testKeywords2() throws Exception { + @Test public void testKeywords2() throws Exception { String actual = getParserRule("Rule: 'kw1' (a1='a1' | a2+='a2') b1='b1' b2+='b2'* b3+='b3'+ b4+='b4'?;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); @@ -216,7 +217,7 @@ public class GrammarConstraintProviderAssignmentsTest extends AbstractXtextTests assertEquals(expected.toString(), actual); } - public void testKeywords3() throws Exception { + @Test public void testKeywords3() throws Exception { String actual = getParserRule("Rule: 'kw1' ((a1='a1' | a2+='a2') b1='b1' b2+='b2'* b3+='b3'+ b4+='b4'?)?;"); StringBuilder expected = new StringBuilder(); expected.append("a1='a1'\n"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java index fb5777c65..9011872a8 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderTest.java @@ -12,10 +12,11 @@ import java.util.Set; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraint; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraintContext; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -27,7 +28,7 @@ import com.google.common.collect.Sets; public class GrammarConstraintProviderTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -52,7 +53,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { return Joiner.on("\n").join(result); } - public void testKeywords() throws Exception { + @Test public void testKeywords() throws Exception { String actual = getParserRule("Rule: 'kw1' a1='a1' a2+='a2'* a3+='a3'+ a4+='a4'?;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -60,7 +61,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testTerminals() throws Exception { + @Test public void testTerminals() throws Exception { String actual = getParserRule("Rule: ID a1=ID a2+=ID* a3+=ID+ a4+=ID?;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -68,7 +69,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testDatatype() throws Exception { + @Test public void testDatatype() throws Exception { String actual = getParserRule("Rule: DT a1=DT a2+=DT* a3+=DT+ a4+=DT?; DT: ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -76,7 +77,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testEnum() throws Exception { + @Test public void testEnum() throws Exception { String actual = getParserRule("Rule: a1=EN a2+=EN* a3+=EN+ a4+=EN?; enum EN: foo | bar;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -84,7 +85,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testCrossRef1() throws Exception { + @Test public void testCrossRef1() throws Exception { String actual = getParserRule("Rule: a1=[Rule|ID] a2+=[Rule|ID]* a3+=[Rule|ID]+ a4+=[Rule|ID]?;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -92,7 +93,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testCrossRef2() throws Exception { + @Test public void testCrossRef2() throws Exception { String actual = getParserRule("Rule: a1=[Rule] a2+=[Rule]* a3+=[Rule]+ a4+=[Rule]?;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -100,7 +101,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testCrossRef3() throws Exception { + @Test public void testCrossRef3() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Rule: a1=[Rule|TERMINAL_RULE] a2=[Rule|DatatypeRule] a3=[Rule|EnumRule];\n"); grammar.append("terminal TERMINAL_RULE: 'a'..'z';\n"); @@ -113,7 +114,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testIgnoredRules() throws Exception { + @Test public void testIgnoredRules() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("ParserRule: foo=INT term=TERMINAL_RULE dat=DatatypeRule en=EnumRule;\n"); grammar.append("terminal TERMINAL_RULE: 'a'..'z';\n"); @@ -126,7 +127,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testInlineGroups() throws Exception { + @Test public void testInlineGroups() throws Exception { String actual = getParserRule("Rule: (x1=ID x2=ID) (x3=ID x4=ID)* (x5=ID x6=ID)? (x7=ID x8=ID)+;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -134,7 +135,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testInlineAlternatives() throws Exception { + @Test public void testInlineAlternatives() throws Exception { String actual = getParserRule("Rule: (x1=ID | x2=ID) | (x3=ID | x4=ID)* | (x5=ID | x6=ID)? | (x7=ID | x8=ID)+;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule | Rule_null;\n"); @@ -143,7 +144,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testEmptyAlternatives() throws Exception { + @Test public void testEmptyAlternatives() throws Exception { String actual = getParserRule("Rule: (x1=ID | x2=ID | 'foo') (x3=ID | x4=ID | 'foo' | 'bar');"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule | Rule_null;\n"); @@ -152,7 +153,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAlternatives1() throws Exception { + @Test public void testAssignedAlternatives1() throws Exception { String actual = getParserRule("Rule: a1=(ID|'id') a2=(ID|STRING|'bar') a3+=(ID|STRING|'bar')*;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -160,7 +161,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedAlternatives2() throws Exception { + @Test public void testAssignedAlternatives2() throws Exception { String actual = getParserRule("Rule: a1=(ID|'id') | a2=(ID|STRING|'bar') | a3+=(ID|STRING|'bar')*;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule | Rule_null;\n"); @@ -176,7 +177,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testBooleanAlternative() throws Exception { + @Test public void testBooleanAlternative() throws Exception { String actual = getParserRule("Rule: {Rule} ('false' | isTrue?='true');"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -184,7 +185,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall1() throws Exception { + @Test public void testUnassignedRuleCall1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Sub;\n"); grammar.append("Sub: val=ID;\n"); @@ -196,7 +197,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall2() throws Exception { + @Test public void testUnassignedRuleCall2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: (Sub1 | Sub2) name=ID 'kw1';\n"); grammar.append("Sub1: 'sub1' val1=ID;\n"); @@ -213,7 +214,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall3() throws Exception { + @Test public void testUnassignedRuleCall3() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: (Sub1 | Sub2)? name=ID 'kw1';\n"); grammar.append("Sub1: 'sub1' val1=ID;\n"); @@ -231,7 +232,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall4() throws Exception { + @Test public void testUnassignedRuleCall4() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Sub1 | Sub2 | Sub3;\n"); grammar.append("Sub1: 'sub1' val1=ID;\n"); @@ -249,7 +250,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCallNested1() throws Exception { + @Test public void testUnassignedRuleCallNested1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Sub1 val1=ID;\n"); grammar.append("Sub1: Sub2 val2=ID;\n"); @@ -268,7 +269,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCallNested2() throws Exception { + @Test public void testUnassignedRuleCallNested2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Sub1? val1=ID;\n"); grammar.append("Sub1: Sub2? val2=ID;\n"); @@ -293,7 +294,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAction1() throws Exception { + @Test public void testAction1() throws Exception { String actual = getParserRule("Rule: {Rule} val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule;\n"); @@ -301,7 +302,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAction2() throws Exception { + @Test public void testAction2() throws Exception { String actual = getParserRule("Rule: {Type} val=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Type;\n"); @@ -309,7 +310,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAction3() throws Exception { + @Test public void testAction3() throws Exception { String actual = getParserRule("Rule: 'kw1' {Type1} val1=ID | 'kw2' {Type2} val2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Type1 | Rule_Type2;\n"); @@ -318,7 +319,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAction4() throws Exception { + @Test public void testAction4() throws Exception { String actual = getParserRule("Rule: 'kw1' {Type1} val1=ID | 'kw2' {Type2} val2=ID | 'kw3' val3=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Rule | Rule_Type1 | Rule_Type2;\n"); @@ -328,7 +329,7 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAction5() throws Exception { + @Test public void testAction5() throws Exception { String actual = getParserRule("Rule: 'kw1' {Type1} val1=ID | 'kw2' {Type2} val2=ID | 'kw3' {Type3};"); StringBuilder expected = new StringBuilder(); expected.append("Rule: Rule_Type1 | Rule_Type2 | Rule_Type3;\n"); @@ -338,13 +339,13 @@ public class GrammarConstraintProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - // public void testReturnsNullAlways() throws Exception { + // @Test public void testReturnsNullAlways() throws Exception { // String actual = getParserRule("Rule: val1=NullRule val2=ID; NullRule: 'kw1';"); // StringBuilder expected = new StringBuilder(); // assertEquals(expected.toString(), actual); // } // - // public void testReturnsNullSometimes() throws Exception { + // @Test public void testReturnsNullSometimes() throws Exception { // String actual = getParserRule("Rule: val1=NullRule val2=ID; NullRule: 'kw1' | 'kw2' {NullRule};"); // StringBuilder expected = new StringBuilder(); // assertEquals(expected.toString(), actual); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java index 530189120..dc8587b49 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java @@ -14,8 +14,8 @@ import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.Action; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.serializer.DebugSequenceAcceptor; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.serializer.DebugSequenceAcceptor; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; @@ -28,6 +28,7 @@ import org.eclipse.xtext.serializer.sequencer.IHiddenTokenSequencer; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; import org.eclipse.xtext.serializer.sequencer.NodeModelSemanticSequencer; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -40,7 +41,7 @@ import com.google.inject.Provider; public class HiddenTokenSequencerTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SyntacticSequencerTestLanguageStandaloneSetup.class); getInjector().injectMembers(this); @@ -106,7 +107,7 @@ public class HiddenTokenSequencerTest extends AbstractXtextTests { assertEquals(Joiner.on("\n").join(getNodeSequence(model)), Joiner.on("\n").join(actual.getColumn(4))); } - // public void testXtext() throws Exception { + // @Test public void testXtext() throws Exception { // with(XtextStandaloneSetup.class); // Grammar model = (Grammar) new XtextResourceSet() // .getResource(URI.createURI("classpath:/org/eclipse/xtext/Xtext.xtext"), true).getContents().get(0); @@ -119,7 +120,7 @@ public class HiddenTokenSequencerTest extends AbstractXtextTests { // assertEquals(Join.join("\n", getNodeSequence(model)), Join.join("\n", actual.getColumn(4))); // } - public void testMandatoryKeywords() throws Exception { + @Test public void testMandatoryKeywords() throws Exception { testSequence("#1 a kw1 b kw2 kw3 c kw4"); } @@ -138,55 +139,55 @@ public class HiddenTokenSequencerTest extends AbstractXtextTests { return result; } - public void testExp0_a() throws Exception { + @Test public void testExp0_a() throws Exception { testSequence("#2 a + b + c + d"); } - public void testExp1_a() throws Exception { + @Test public void testExp1_a() throws Exception { testSequence("#3 a + b + c + d"); } - public void testExp1_b() throws Exception { + @Test public void testExp1_b() throws Exception { testSequence("#3 a + b"); } - public void testExp1_c() throws Exception { + @Test public void testExp1_c() throws Exception { testSequence("#3 (a + b)"); } - public void testExp2_a() throws Exception { + @Test public void testExp2_a() throws Exception { testSequence("#4 a * (b + c)"); } - public void testExp2_b() throws Exception { + @Test public void testExp2_b() throws Exception { testSequence("#4 a * (((b + c)))"); } - public void testExp2_c() throws Exception { + @Test public void testExp2_c() throws Exception { testSequence("#4 (a * (((b + c))))"); } - public void testExp2_d() throws Exception { + @Test public void testExp2_d() throws Exception { testSequence("#4 (b + c) * d"); } - public void testExp2_e() throws Exception { + @Test public void testExp2_e() throws Exception { testSequence("#4 ((a * (((b + c)) * d) + e)) + f"); } - public void testCrossRef1_a() throws Exception { + @Test public void testCrossRef1_a() throws Exception { testSequence("#5 $1terminal kw1 $1terminal"); } - public void testCrossRef1_b() throws Exception { + @Test public void testCrossRef1_b() throws Exception { testSequence("#5 datatype kw2 datatype"); } - public void testCrossRef1_c() throws Exception { + @Test public void testCrossRef1_c() throws Exception { testSequence("#5 someid kw3 someid"); } - public void testCrossRef1_d() throws Exception { + @Test public void testCrossRef1_d() throws Exception { testSequence("#5 someid kw4 someid"); } } \ No newline at end of file diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java index 5220f0c45..b58e4a509 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java @@ -15,7 +15,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynAbsorberState; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynEmitterState; @@ -23,6 +23,7 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynState; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition; import org.eclipse.xtext.serializer.sequencer.RuleCallStack; +import org.junit.Test; import com.google.common.collect.Sets; @@ -32,7 +33,7 @@ import com.google.common.collect.Sets; public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -101,7 +102,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes return result; } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID 'kw1' a2=ID;"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertFalse(trans.involvesUnassignedTokenRuleCalls()); @@ -110,7 +111,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("['kw1']", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testTerminal() throws Exception { + @Test public void testTerminal() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID FOO a2=ID; terminal FOO: '$';"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertTrue(trans.involvesUnassignedTokenRuleCalls()); @@ -119,7 +120,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("[FOO]", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testDatatype() throws Exception { + @Test public void testDatatype() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID Foo a2=ID; Foo: ID;"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertTrue(trans.involvesUnassignedTokenRuleCalls()); @@ -128,7 +129,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("[Foo]", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testAmbiguousOptional() throws Exception { + @Test public void testAmbiguousOptional() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID 'kw1' 'kw2'? a2=ID;"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertFalse(trans.involvesUnassignedTokenRuleCalls()); @@ -137,7 +138,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("['kw1']", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testAmbiguousMany() throws Exception { + @Test public void testAmbiguousMany() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID 'kw1' 'kw2'+ a2=ID;"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertFalse(trans.involvesUnassignedTokenRuleCalls()); @@ -146,7 +147,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("['kw1', 'kw2'+]", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testAmbiguousManyOptional() throws Exception { + @Test public void testAmbiguousManyOptional() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID 'kw1' 'kw2'* a2=ID;"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertFalse(trans.involvesUnassignedTokenRuleCalls()); @@ -155,7 +156,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("['kw1']", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testAmbiguousAlternative() throws Exception { + @Test public void testAmbiguousAlternative() throws Exception { ISynAbsorberState start = getParserRule("Rule: a1=ID ('kw1' 'kw2' | 'kw3') a2=ID;"); ISynTransition trans = findTransition(start, "a1=ID", "a2=ID"); assertFalse(trans.involvesUnassignedTokenRuleCalls()); @@ -164,7 +165,7 @@ public class SyntacticSequencerPDAProviderNavigatorTest extends AbstractXtextTes assertEquals("['kw3']", trans.getShortestPathToAbsorber(newStack()).toString()); } - public void testAmbiguousRecursion() throws Exception { + @Test public void testAmbiguousRecursion() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Prim ({Add.left=current} '+' right=Prim)*;\n"); grammar.append("Prim returns Expr: {Val} name=ID | '(' Addition ')';\n"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java index 04ba72b21..7d0c3d9ed 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java @@ -21,7 +21,7 @@ import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.generator.serializer.SyntacticSequencerPDA2ExtendedDot; import org.eclipse.xtext.grammaranalysis.IPDAState.PDAStateType; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.Context2NameFunction; import org.eclipse.xtext.serializer.analysis.IContextProvider; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider; @@ -33,6 +33,7 @@ import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.NfaToProduction; import org.eclipse.xtext.util.formallang.ProductionStringFactory; import org.eclipse.xtext.xbase.lib.Pair; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -131,12 +132,12 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testKeyword() throws Exception { + @Test public void testKeyword() throws Exception { String actual = getParserRule("Rule: a1=ID 'kw1' a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -146,7 +147,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testKeywordOptional() throws Exception { + @Test public void testKeywordOptional() throws Exception { String actual = getParserRule("Rule: a1=ID 'kw1' 'kw2'? a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -156,7 +157,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testKeywordMany() throws Exception { + @Test public void testKeywordMany() throws Exception { String actual = getParserRule("Rule: a1=ID 'kw1' 'kw2'+ a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -166,7 +167,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testKeywordOptionalMany() throws Exception { + @Test public void testKeywordOptionalMany() throws Exception { String actual = getParserRule("Rule: a1=ID 'kw1' 'kw2'* a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -176,7 +177,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testKeywordAlternative() throws Exception { + @Test public void testKeywordAlternative() throws Exception { String actual = getParserRule("Rule: a1=ID ('kw1' | 'kw2') a2=ID;"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -186,7 +187,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testKeywordAllMandatory() throws Exception { + @Test public void testKeywordAllMandatory() throws Exception { String actual = getParserRule("Rule: a1=ID ('kw1' a2=ID | 'kw2' a3=ID 'kw3');"); StringBuilder expected = new StringBuilder(); expected.append("Rule_Rule:\n"); @@ -198,7 +199,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall1() throws Exception { + @Test public void testUnassignedRuleCall1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Sub;\n"); grammar.append("Sub: val=ID;\n"); @@ -213,7 +214,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testUnassignedRuleCall2() throws Exception { + @Test public void testUnassignedRuleCall2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: 'kw1' Sub 'kw4';\n"); grammar.append("Sub: 'kw2' val=ID 'kw3';\n"); @@ -228,7 +229,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedRuleCall2() throws Exception { + @Test public void testAssignedRuleCall2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: 'kw1' sub=Sub 'kw4';\n"); grammar.append("Sub: 'kw2' val=ID 'kw3';\n"); @@ -243,7 +244,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedRuleCallNested1() throws Exception { + @Test public void testAssignedRuleCallNested1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: start=ID sub1=Sub1 val1=ID;\n"); grammar.append("Sub1: 'sub1' sub2=Sub2 val2=ID;\n"); @@ -270,7 +271,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAssignedElements() throws Exception { + @Test public void testAssignedElements() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: t=MyTerminal 'kw1' d=MyDatatype 'kw2' e=MyEnum 'kw3' k='kw4' 'kw5' b='kw6'? \n"); grammar.append(" c1=[Model|MyTerminal] 'kw7' c2=[Model|MyDatatype] 'kw8' c3=[Model|'kw9'];\n"); @@ -293,7 +294,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testRecursion() throws Exception { + @Test public void testRecursion() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Recursion: val=ID | '(' Recursion ')';"); String actual = getParserRule(grammar.toString()); @@ -304,7 +305,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testReturnChoices() throws Exception { + @Test public void testReturnChoices() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: Sub1 | Sub2;\n"); grammar.append("Sub1: 'in1' Infix 'out1';\n"); @@ -331,7 +332,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testExpression0() throws Exception { + @Test public void testExpression0() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Prim ({Add.left=current} '+' right=Prim)*;\n"); grammar.append("Prim returns Expr: {Val} name=ID;\n"); @@ -357,7 +358,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testExpression1() throws Exception { + @Test public void testExpression1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Prim ({Add.left=current} '+' right=Prim)*;\n"); grammar.append("Prim returns Expr: {Val} name=ID | '(' Addition ')';\n"); @@ -387,7 +388,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testOptionalEnd() throws Exception { + @Test public void testOptionalEnd() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: 'model' foo=AbstractRule;\n"); grammar.append("AbstractRule: Rule1 | Rule2;\n"); @@ -469,7 +470,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testExpression5() throws Exception { + @Test public void testExpression5() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Addition returns Expr: Multiplication ({Add.left=current} '+' right=Multiplication)*;\n"); grammar.append("Multiplication returns Expr: Prim ({Mult.left=current} '*' right=Prim)*;\n"); @@ -534,7 +535,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testMultiOptional() throws Exception { + @Test public void testMultiOptional() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Optional: val1=ID? val2=ID? val3=ID?;"); String actual = getParserRule(grammar.toString()); @@ -554,7 +555,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActions1() throws Exception { + @Test public void testActions1() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: {Foo.left=current} (val=ID? | {Foo.left=current});"); String actual = getParserRule(grammar.toString()); @@ -574,7 +575,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActions2() throws Exception { + @Test public void testActions2() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: 'x' ('kw1' {Foo} | 'kw2' {Bar}) val1=ID;"); String actual = getParserRule(grammar.toString()); @@ -588,7 +589,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testActions3() throws Exception { + @Test public void testActions3() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: 'x' ('kw1' {Foo} | 'kw2' {Bar}) val1=ID;"); String actual = getParserRule(grammar.toString()); @@ -602,7 +603,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { assertEquals(expected.toString(), actual); } - public void testAlternativeManyNested() throws Exception { + @Test public void testAlternativeManyNested() throws Exception { StringBuilder grammar = new StringBuilder(); grammar.append("Model: (('x' x+=ID*) | ('y' y+=ID*))*;"); String actual = getParserRule(grammar.toString()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java index cf66f51d4..118a1fac9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java @@ -18,7 +18,7 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; @@ -31,6 +31,7 @@ import org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; import org.eclipse.xtext.serializer.sequencer.NodeModelSemanticSequencer; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -48,7 +49,7 @@ public class SyntacticSequencerTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(SyntacticSequencerTestLanguageStandaloneSetup.class); getInjector().injectMembers(this); @@ -204,87 +205,87 @@ public class SyntacticSequencerTest extends AbstractXtextTests { return result; } - public void testMandatoryKeywords() throws Exception { + @Test public void testMandatoryKeywords() throws Exception { testSequence("#1 a kw1 b kw2 kw3 c kw4"); } - public void testExp0_a() throws Exception { + @Test public void testExp0_a() throws Exception { testSequence("#2 a + b + c + d"); } - public void testExp1_a() throws Exception { + @Test public void testExp1_a() throws Exception { testSequence("#3 a + b + c + d"); } - public void testExp1_b() throws Exception { + @Test public void testExp1_b() throws Exception { testSequence("#3 a + b"); } - public void testExp1_c() throws Exception { + @Test public void testExp1_c() throws Exception { testSequence("#3 (a + b)"); } - public void testExp2_a() throws Exception { + @Test public void testExp2_a() throws Exception { testSequence("#4 a * (b + c)"); } - public void testExp2_b() throws Exception { + @Test public void testExp2_b() throws Exception { testSequence("#4 a * (((b + c)))"); } - public void testExp2_c() throws Exception { + @Test public void testExp2_c() throws Exception { testSequence("#4 (a * (((b + c))))"); } - public void testExp2_d() throws Exception { + @Test public void testExp2_d() throws Exception { testSequence("#4 (b + c) * d"); } - public void testExp2_e() throws Exception { + @Test public void testExp2_e() throws Exception { testSequence("#4 ((a * (((b + c)) * d) + e)) + f"); } - public void testCrossRef1_a() throws Exception { + @Test public void testCrossRef1_a() throws Exception { testSequence("#5 $1terminal kw1 $1terminal"); } - public void testCrossRef1_b() throws Exception { + @Test public void testCrossRef1_b() throws Exception { testSequence("#5 datatype kw2 datatype"); } - public void testCrossRef1_c() throws Exception { + @Test public void testCrossRef1_c() throws Exception { testSequence("#5 someid kw3 someid"); } - public void testCrossRef1_d() throws Exception { + @Test public void testCrossRef1_d() throws Exception { testSequence("#5 someid kw4 someid"); } - public void testBooleanAlternative_a() throws Exception { + @Test public void testBooleanAlternative_a() throws Exception { testSequence("#6 kw1"); } - public void testBooleanAlternative_b() throws Exception { + @Test public void testBooleanAlternative_b() throws Exception { testSequence("#6 kw2"); } - public void testUnassignedDatatype() throws Exception { + @Test public void testUnassignedDatatype() throws Exception { testSequence("#7 foo kw1", "#7 foo matched 1"); } - public void testOpionalSingleTransition() throws Exception { + @Test public void testOpionalSingleTransition() throws Exception { testSequence("#8 kw1 foo", "#8 matched 2 foo"); } - public void testOpionalManyTransition() throws Exception { + @Test public void testOpionalManyTransition() throws Exception { testSequence("#9 kw1 foo", "#9 matched 3 foo"); } - public void testMandatoryManyTransition() throws Exception { + @Test public void testMandatoryManyTransition() throws Exception { testSequence("#10 kw1 foo", "#10 matched 4 foo"); } - public void testAlternativeTransition() throws Exception { + @Test public void testAlternativeTransition() throws Exception { testSequence("#11 kw1 foo", "#11 matched 5 foo"); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java index 320d6004e..f2ebfa017 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java @@ -11,9 +11,10 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.mwe.utils.StandaloneSetup; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.serializer.SerializerTester; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.serializer.SerializerTester; import org.eclipse.xtext.resource.XtextResourceSet; +import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Inject; @@ -42,7 +43,7 @@ public class XtextSerializerTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); new StandaloneSetup().setPlatformUri("../.."); with(new XtextStandaloneSetup() { @@ -61,7 +62,7 @@ public class XtextSerializerTest extends AbstractXtextTests { getInjector().injectMembers(this); } - public void testDummy() { + @Test public void testDummy() { } public void _testXtextXtextWithNM() throws Exception { 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 e5efb9b36..55a3397b1 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 @@ -11,7 +11,8 @@ import java.lang.reflect.Type; import java.util.Date; import java.util.Iterator; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; @@ -21,7 +22,7 @@ import com.google.inject.Provider; import com.google.inject.internal.MoreTypes; import com.google.inject.util.Types; -public class GenericModuleTest extends TestCase { +public class GenericModuleTest extends Assert { public void assertConfigures(CompoundModule module, Class from, Object to, boolean singleton, boolean eagerSingleton, boolean provider) { @@ -54,16 +55,16 @@ public class GenericModuleTest extends TestCase { return false; } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { AbstractGenericModule module = new TestModule(); CompoundModule bindings = module.getBindings(); assertEquals(3, bindings.size()); assertConfigures(bindings, CharSequence.class, String.class, false, false, false); assertConfigures(bindings, Type.class, Class.class, false, false, false); - assertConfigures(bindings, TestCase.class, GenericModuleTest.class, false, false, false); + assertConfigures(bindings, Assert.class, GenericModuleTest.class, false, false, false); } - public void testParameterizedTypes() throws Exception { + @Test public void testParameterizedTypes() throws Exception { ParameterizedTypeModule module = new ParameterizedTypeModule(); Injector createInjector = Guice.createInjector(module); Object bindToType = createInjector.getInstance(Key.get(Types.newParameterizedType(Comparable.class, ParameterizedTypeModule.X.class))); @@ -74,7 +75,7 @@ public class GenericModuleTest extends TestCase { assertSame(module.PROVIDE_X,provide ); } - public void testOverride() throws Exception { + @Test public void testOverride() throws Exception { AbstractGenericModule module = new MyModule(); CompoundModule bindings = module.getBindings(); assertEquals(4, bindings.size()); @@ -83,7 +84,7 @@ public class GenericModuleTest extends TestCase { assertConfiguresNot(bindings, CharSequence.class, String.class, false, false, false); } - public void testInstanceBinding() throws Exception { + @Test public void testInstanceBinding() throws Exception { final Date date = new Date(); AbstractGenericModule m = new AbstractGenericModule() { @SuppressWarnings("unused") @@ -105,7 +106,7 @@ public class GenericModuleTest extends TestCase { } - public void testProviderClassBinding() throws Exception { + @Test public void testProviderClassBinding() throws Exception { AbstractGenericModule m = new AbstractGenericModule() { @SuppressWarnings("unused") public Class> provideDate() { @@ -118,7 +119,7 @@ public class GenericModuleTest extends TestCase { assertConfigures(bindings, Date.class, DateProvider.class, false, false, true); } - public void testProviderClassDeactivation() throws Exception { + @Test public void testProviderClassDeactivation() throws Exception { AbstractGenericModule m = new AbstractGenericModule() { @SuppressWarnings("unused") public Class> provideDate() { @@ -137,7 +138,7 @@ public class GenericModuleTest extends TestCase { } } - public void testProviderInstanceBinding() throws Exception { + @Test public void testProviderInstanceBinding() throws Exception { final Provider provider = new Provider() { public Date get() { return null; @@ -161,7 +162,7 @@ public class GenericModuleTest extends TestCase { assertConfigures(bindings, String.class, FooProvider.class,false,false,true); } - public void testDeactivation() throws Exception { + @Test public void testDeactivation() throws Exception { TestModule module = new TestModule() { @Override public Class bindString() { @@ -169,7 +170,7 @@ public class GenericModuleTest extends TestCase { } @Override - public Class bindTestCase() { + public Class bindTestCase() { return null; } @@ -184,10 +185,10 @@ public class GenericModuleTest extends TestCase { assertConfigures(bindings, CharSequence.class, null, false, false, false); assertConfigures(bindings, Type.class, null, false, false, false); - assertConfigures(bindings, TestCase.class, null, false, false, false); + assertConfigures(bindings, Assert.class, null, false, false, false); } - public void testSingletonBinding() throws Exception { + @Test public void testSingletonBinding() throws Exception { Foo.instantiations = 0; AbstractGenericModule m = new AbstractGenericModule() { @@ -207,7 +208,7 @@ public class GenericModuleTest extends TestCase { assertEquals(1, Foo.instantiations); } - public void testEagerSingletonBinding() throws Exception { + @Test public void testEagerSingletonBinding() throws Exception { Foo.instantiations = 0; AbstractGenericModule m = new AbstractGenericModule() { @@ -227,7 +228,7 @@ public class GenericModuleTest extends TestCase { assertEquals(1, Foo.instantiations); } - public void testNamedBinding() throws Exception { + @Test public void testNamedBinding() throws Exception { @SuppressWarnings("unused") AbstractGenericModule module = new AbstractGenericModule() { String foo() { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java index eab73166d..f0c5f60dd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/service/TestModule.java @@ -10,7 +10,7 @@ package org.eclipse.xtext.service; import java.lang.reflect.Type; -import junit.framework.TestCase; +import org.junit.Assert; public class TestModule extends AbstractGenericModule { public Class bindString() { @@ -21,7 +21,7 @@ public class TestModule extends AbstractGenericModule { return Class.class; } - public Class bindTestCase() { + public Class bindTestCase() { return GenericModuleTest.class; } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java index 6b1c526ab..662d7b0a6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/EmfAssert.java @@ -7,7 +7,7 @@ *******************************************************************************/ package org.eclipse.xtext.tests; -import static junit.framework.Assert.*; +import static org.junit.Assert.*; import java.util.Arrays; import java.util.HashSet; @@ -15,8 +15,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.ComparisonFailure; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; @@ -24,6 +22,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.xtext.util.EmfFormatter; +import org.junit.ComparisonFailure; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java index 5790bd298..6c3db0e3c 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AbstractStringsCountLinesTest.java @@ -7,17 +7,19 @@ *******************************************************************************/ package org.eclipse.xtext.util; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public abstract class AbstractStringsCountLinesTest extends TestCase { +public abstract class AbstractStringsCountLinesTest extends Assert { private char[] separator; - @Override - protected void setUp() { + @Before + public void setUp() { separator = getSeparator(); } @@ -25,34 +27,34 @@ public abstract class AbstractStringsCountLinesTest extends TestCase { assertEquals(text, expected, Strings.countLines(text, separator)); } - public void testCountLines_01() { + @Test public void testCountLines_01() { checkLineCount(0, "foo"); checkLineCount(0, ""); } - public void testCountLines_02() { + @Test public void testCountLines_02() { checkLineCount(0, "foo\r"); checkLineCount(0, "\r"); } - public void testCountLines_03() { + @Test public void testCountLines_03() { checkLineCount(0, "foo\rbar"); checkLineCount(0, "\rbar"); } - public void testCountLines_04() { + @Test public void testCountLines_04() { checkLineCount(1, "foo\r\n"); checkLineCount(1, "\r\n"); checkLineCount(1, "\r\nbar"); } - public void testCountLines_05() { + @Test public void testCountLines_05() { checkLineCount(1, "foo\n"); checkLineCount(1, "\n"); checkLineCount(1, "\nbar"); } - public void testCountLines_06() { + @Test public void testCountLines_06() { checkLineCount(1, "foo\n\r"); checkLineCount(1, "\n\r"); checkLineCount(1, "\n\rbar"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java index 71d3f9345..e981a9214 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/AutoBoxingDispatcherTest.java @@ -7,20 +7,20 @@ *******************************************************************************/ package org.eclipse.xtext.util; -import junit.framework.TestCase; - +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class AutoBoxingDispatcherTest extends TestCase { +public class AutoBoxingDispatcherTest extends Assert { - public void testPrimitiveToObject() throws Exception { + @Test public void testPrimitiveToObject() throws Exception { PolymorphicDispatcher dispatcher = PolymorphicDispatcher.createForSingleTarget("methodWithObjectParameter", this); assertTrue(dispatcher.invoke(true)); } - public void testObjectToPrimitive() throws Exception { + @Test public void testObjectToPrimitive() throws Exception { PolymorphicDispatcher dispatcher = PolymorphicDispatcher.createForSingleTarget("methodWithPrimitiveParameter", this); assertTrue(dispatcher.invoke(Boolean.TRUE)); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java index e2295a830..1abe4ba70 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ChainedIteratorTest.java @@ -10,20 +10,21 @@ package org.eclipse.xtext.util; import java.util.Arrays; import java.util.Iterator; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.google.common.base.Joiner; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -public class ChainedIteratorTest extends TestCase { +public class ChainedIteratorTest extends Assert { - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { Iterator iter = Iterators.concat(iter("a","b"), iter("c"), iter("d")); assertEquals("abcd", Joiner.on("").join(Lists.newArrayList(iter))); } - public void testSecondArgNull() throws Exception { + @Test public void testSecondArgNull() throws Exception { try { Iterators.concat(iter("a","b"), null, null); fail("NPE expected."); @@ -32,7 +33,7 @@ public class ChainedIteratorTest extends TestCase { } } - public void testFirstArgNull() throws Exception { + @Test public void testFirstArgNull() throws Exception { try { Iterators.concat(null, iter("a","b")); fail("nullpointer exception expected"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java index c912fdd0f..6d40a775b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/EcoreGenericsTest.java @@ -7,17 +7,17 @@ *******************************************************************************/ package org.eclipse.xtext.util; -import junit.framework.TestCase; - import org.eclipse.emf.ecore.EClassifier; import org.eclipse.xtext.util.genericTest.GenericTestPackage; +import org.junit.Assert; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API */ -public class EcoreGenericsTest extends TestCase { +public class EcoreGenericsTest extends Assert { - public void testReferenceType() throws Exception { + @Test public void testReferenceType() throws Exception { EcoreGenericsUtil ecoreGenericsUtil = new EcoreGenericsUtil(); EClassifier referenceType = ecoreGenericsUtil.getReferenceType(GenericTestPackage.Literals.A__SOME_REFERENCE, GenericTestPackage.Literals.D); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java index 21ccccb37..84405d0b3 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FilteringIteratorTest.java @@ -12,7 +12,9 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; @@ -20,15 +22,14 @@ import com.google.common.collect.Iterators; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class FilteringIteratorTest extends TestCase implements Predicate { +public class FilteringIteratorTest extends Assert implements Predicate { private String matchMe; private List list; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { matchMe = "matchMe"; list = new ArrayList(); } @@ -37,12 +38,12 @@ public class FilteringIteratorTest extends TestCase implements Predicate return param.equals(matchMe); } - public void testEmptyList() { + @Test public void testEmptyList() { Iterator iter = Iterators.filter(list.iterator(), this); assertFalse(iter.hasNext()); } - public void testConcurrentModificationException() { + @Test public void testConcurrentModificationException() { Iterator iter = Iterators.filter(list.iterator(), this); list.add("null"); try { @@ -52,7 +53,7 @@ public class FilteringIteratorTest extends TestCase implements Predicate } } - public void testRemove() { + @Test public void testRemove() { list.add(matchMe); Iterator iter = Iterators.filter(list.iterator(), this); iter.next(); @@ -63,7 +64,7 @@ public class FilteringIteratorTest extends TestCase implements Predicate } } - public void testHasNext() { + @Test public void testHasNext() { list.add("null"); list.add(matchMe); list.add("null"); @@ -74,7 +75,7 @@ public class FilteringIteratorTest extends TestCase implements Predicate assertFalse(iter.hasNext()); } - public void testNext() { + @Test public void testNext() { list.add("null"); list.add(matchMe); list.add("null"); @@ -87,7 +88,7 @@ public class FilteringIteratorTest extends TestCase implements Predicate assertFalse(iter.hasNext()); } - public void testNextCallsHasNext() { + @Test public void testNextCallsHasNext() { list.add("null"); list.add(matchMe); list.add("null"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java index ce05760f8..c8034331d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/FormattingMigratorTest.java @@ -9,75 +9,75 @@ package org.eclipse.xtext.util; import java.util.regex.Pattern; -import junit.framework.TestCase; - import org.eclipse.xtext.util.internal.FormattingMigrator; +import org.junit.Assert; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class FormattingMigratorTest extends TestCase { +public class FormattingMigratorTest extends Assert { private FormattingMigrator mig = new FormattingMigrator(); private Pattern ws = Pattern.compile("\\s+"); - public void testRobust1() { + @Test public void testRobust1() { String act = mig.migrate(" foo bar ", null, ws); assertNull(act); } - public void testRobust2() { + @Test public void testRobust2() { String act = mig.migrate(" foo bar ", "", ws); assertEquals("", act); } - public void testRobust3() { + @Test public void testRobust3() { String act = mig.migrate(null, " foo bar ", ws); assertEquals(" foo bar ", act); } - public void testRobust4() { + @Test public void testRobust4() { String act = mig.migrate("", " foo bar ", ws); assertEquals(" foo bar ", act); } - public void testKeepFormatting() { + @Test public void testKeepFormatting() { String act = mig.migrate(" foo bar ", " foo bar ", ws); assertEquals(" foo bar ", act); } - public void testKeepFormatting2() { + @Test public void testKeepFormatting2() { String act = mig.migrate(" foo bar ", " foo bar ", ws); assertEquals(" foo bar ", act); } - public void testKeepFormatting3() { + @Test public void testKeepFormatting3() { String act = mig.migrate(" foo bar baz ", "foo baar baz", ws); assertEquals(" foo baar baz ", act); } - public void testInfix() { + @Test public void testInfix() { String act = mig.migrate("foo z bar", "xoo z bax", ws); assertEquals("xoo z bax", act); } - public void testPrefix() { + @Test public void testPrefix() { String act = mig.migrate(" foo xx", "foo yy", ws); assertEquals(" foo yy", act); } - public void testPostfix() { + @Test public void testPostfix() { String act = mig.migrate("xx foo ", "yy foo", ws); assertEquals("yy foo ", act); } - public void testNoMatch1() { + @Test public void testNoMatch1() { String act = mig.migrate(" x y z ", "a b c", ws); assertEquals("a b c", act); } - public void testPartialMatch() { + @Test public void testPartialMatch() { String act = mig.migrate(" xxx zzz ", "xxx yyy zzz", ws); assertEquals(" xxx yyy zzz ", act); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java index 20b5e2e70..2dc55bcf9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/LineFilterOutputStreamTest.java @@ -10,12 +10,14 @@ package org.eclipse.xtext.util; import java.io.ByteArrayOutputStream; import java.io.IOException; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class LineFilterOutputStreamTest extends TestCase { +public class LineFilterOutputStreamTest extends Assert { private ByteArrayOutputStream result; @@ -23,9 +25,8 @@ public class LineFilterOutputStreamTest extends TestCase { private String input; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { result = new ByteArrayOutputStream(500); filterStream = new LineFilterOutputStream(result, " * $Id" + "$"); input = "/**\n" + @@ -37,7 +38,7 @@ public class LineFilterOutputStreamTest extends TestCase { "package foo"; } - public void testWrite_01() throws IOException { + @Test public void testWrite_01() throws IOException { filterStream.write(input.getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -51,7 +52,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_02() throws IOException { + @Test public void testWrite_02() throws IOException { filterStream.write((" * $Id" + "$").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -59,7 +60,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_03() throws IOException { + @Test public void testWrite_03() throws IOException { filterStream.write(("\n * $Id" + "$").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -67,7 +68,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_04() throws IOException { + @Test public void testWrite_04() throws IOException { filterStream.write((" * $Id" + "$\n").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -75,7 +76,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_05() throws IOException { + @Test public void testWrite_05() throws IOException { filterStream.write(("*\n * $Id" + "$").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -83,7 +84,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_06() throws IOException { + @Test public void testWrite_06() throws IOException { filterStream.write((" * $Id" + "$\n *").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -91,7 +92,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_07() throws IOException { + @Test public void testWrite_07() throws IOException { filterStream.write((" * $Id" + "$\n *\n").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); @@ -99,7 +100,7 @@ public class LineFilterOutputStreamTest extends TestCase { assertEquals(expected, res); } - public void testWrite_08() throws IOException { + @Test public void testWrite_08() throws IOException { filterStream.write((" * $Id" + "$\n */").getBytes()); filterStream.flush(); String res = new String(result.toByteArray()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java index 240e01d73..e9e25002b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MapVsMultimap.java @@ -10,7 +10,10 @@ package org.eclipse.xtext.util; import java.util.List; import java.util.Map; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -18,7 +21,7 @@ import com.google.common.collect.Maps; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class MapVsMultimap extends TestCase { +public class MapVsMultimap extends Assert { private int valuesPerBatch = 0; private int batches = 500000; @@ -28,9 +31,8 @@ public class MapVsMultimap extends TestCase { private Map map; @SuppressWarnings("unchecked") - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { allElements = Lists.newArrayList(); for(int batch = 0; batch < batches; batch++) { char c = 'A'; @@ -69,15 +71,14 @@ public class MapVsMultimap extends TestCase { } } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { map = null; multimap = null; allElements = null; - super.tearDown(); } - public void testHashMultiMap() { + @Test public void testHashMultiMap() { for(int i = 0; i < iterations; i++) { for(int j = 0; j< allElements.size(); j++) { String s = allElements.get(j); @@ -96,7 +97,7 @@ public class MapVsMultimap extends TestCase { } } - public void testHashMap() { + @Test public void testHashMap() { for(int i = 0; i < iterations; i++) { for(String s: allElements) { map.get(s); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java index 2dba0b619..cad889e3d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MappingIteratorTest.java @@ -10,7 +10,8 @@ package org.eclipse.xtext.util; import java.util.Arrays; import java.util.Iterator; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.collect.Iterators; @@ -18,25 +19,25 @@ import com.google.common.collect.Iterators; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class MappingIteratorTest extends TestCase implements Function { +public class MappingIteratorTest extends Assert implements Function { public String apply(String param) { return param + "->" + param; } - public void testEmptyIter() { + @Test public void testEmptyIter() { Iterator iter = createMappingIterator(new String[]{}); assertFalse(iter.hasNext()); } - public void testSingleElementIter() { + @Test public void testSingleElementIter() { Iterator iter = createMappingIterator("a"); assertTrue(iter.hasNext()); assertEquals("a->a", iter.next()); assertFalse(iter.hasNext()); } - public void testMultiElementIter() { + @Test public void testMultiElementIter() { Iterator iter = createMappingIterator("a", "b", "c"); assertEquals("a->a", iter.next()); assertEquals("b->b", iter.next()); @@ -44,7 +45,7 @@ public class MappingIteratorTest extends TestCase implements Function x) {return "comp";} @@ -115,7 +115,7 @@ public class PolymorphicDispatcherTest extends TestCase { assertEquals("i",target.invoke(42)); } - public void testMixedTypes() throws Exception { + @Test public void testMixedTypes() throws Exception { Object o1 = new Object() { String label(Number i) { @@ -136,7 +136,7 @@ public class PolymorphicDispatcherTest extends TestCase { assertEquals("Integer_3", dispatcher.invoke(new Integer(3))); } - public void testDifferentParamLength() throws Exception { + @Test public void testDifferentParamLength() throws Exception { Object o1 = new Object() { String label(Integer i, Object stuff) { return "Integer_" + i + "_" + stuff; @@ -163,7 +163,7 @@ public class PolymorphicDispatcherTest extends TestCase { assertEquals("Number_3_foo", dispatcher.invoke(BigInteger.valueOf(3), "foo")); } - public void testAmbiguous() throws Exception { + @Test public void testAmbiguous() throws Exception { Object o1 = new Object() { String label(CharSequence i) { @@ -183,7 +183,7 @@ public class PolymorphicDispatcherTest extends TestCase { } } - public void testNullParams() throws Exception { + @Test public void testNullParams() throws Exception { Object o1 = new Object() { String label(String i, CharSequence y) { @@ -202,7 +202,7 @@ public class PolymorphicDispatcherTest extends TestCase { assertEquals(CharSequence.class.getSimpleName(), dispatcher.invoke(null, new StringBuilder())); } - public void testNullParams_1() throws Exception { + @Test public void testNullParams_1() throws Exception { Object o1 = new Object() { String label(Void x, CharSequence y) { @@ -221,7 +221,7 @@ public class PolymorphicDispatcherTest extends TestCase { assertEquals(CharSequence.class.getSimpleName(), dispatcher.invoke(null, null)); } - public void testPrivateMethodAccess() { + @Test public void testPrivateMethodAccess() { Object o1 = new Object() { private String label(Integer i) { return "Integer_" + i; @@ -241,7 +241,7 @@ public class PolymorphicDispatcherTest extends TestCase { private @interface TestLabelAnnotation { } - public void testCustomFilter() { + @Test public void testCustomFilter() { Object o1 = new Object() { @TestLabelAnnotation private String sillyMethodName(Integer i) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java index dc4e6750d..6a829ef2d 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/ReflectionTest.java @@ -9,12 +9,13 @@ package org.eclipse.xtext.util; import java.lang.reflect.Method; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class ReflectionTest extends TestCase { +public class ReflectionTest extends Assert { private static class MyClass { @SuppressWarnings("unused") @@ -23,7 +24,7 @@ public class ReflectionTest extends TestCase { } } - public void testGetMethodGivesCopy() throws Exception { + @Test public void testGetMethodGivesCopy() throws Exception { Class clazz = MyClass.class; Method declaredMethod = clazz.getDeclaredMethod("getString"); assertNotNull("declaredMethod", declaredMethod); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java index 720f3b051..6b414afae 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/SimpleCacheTest.java @@ -7,14 +7,16 @@ *******************************************************************************/ package org.eclipse.xtext.util; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.base.Function; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class SimpleCacheTest extends TestCase implements Function{ +public class SimpleCacheTest extends Assert implements Function{ private SimpleCache cache; @@ -22,8 +24,8 @@ public class SimpleCacheTest extends TestCase implements Function(this); expectedParam = null; callCount = 0; @@ -35,11 +37,11 @@ public class SimpleCacheTest extends TestCase implements Function split = Strings.split("foo.bar", "."); assertEquals(2, split.size()); assertEquals("foo", split.get(0)); assertEquals("bar", split.get(1)); } - public void testSplit2() throws Exception { + @Test public void testSplit2() throws Exception { List split = Strings.split("foobar", "."); assertEquals(1, split.size()); assertEquals("foobar", split.get(0)); } - public void testSplit3() throws Exception { + @Test public void testSplit3() throws Exception { List split = Strings.split("foobar", "oo"); assertEquals(2, split.size()); @@ -41,7 +42,7 @@ public class StringsTest extends TestCase { } - public void testSplit4() throws Exception { + @Test public void testSplit4() throws Exception { List split = Strings.split("foobar", "o"); assertEquals(3, split.size()); assertEquals("f", split.get(0)); @@ -49,7 +50,7 @@ public class StringsTest extends TestCase { assertEquals("bar", split.get(2)); } - public void testPackUnpack() throws Exception { + @Test public void testPackUnpack() throws Exception { String[] strings = new String[] { ";" , ":", "foo","bar" }; @@ -65,7 +66,7 @@ public class StringsTest extends TestCase { assertNull(Strings.unpack("")); } - public void testRemoveLeadingWhitespace() throws Exception { + @Test public void testRemoveLeadingWhitespace() throws Exception { assertEquals("foo ", Strings.removeLeadingWhitespace("foo ")); assertEquals("foo ", Strings.removeLeadingWhitespace(" foo ")); assertEquals("foo ", Strings.removeLeadingWhitespace("\nfoo ")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java index 22ab3ae5e..33caa3065 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TailWriterTest.java @@ -11,23 +11,26 @@ import java.io.BufferedWriter; import java.io.IOException; import java.io.StringWriter; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class TailWriterTest extends TestCase { +public class TailWriterTest extends Assert { private StringWriter writer; private BufferedWriter buff; - @Override - protected void setUp() { + @Before + public void setUp() { writer = new StringWriter(); } - @Override - protected void tearDown() { + @After + public void tearDown() { writer = null; buff = null; } @@ -45,33 +48,33 @@ public class TailWriterTest extends TestCase { assertEquals(s, writer.getBuffer().toString()); } - public void testSuppressNothing() throws IOException { + @Test public void testSuppressNothing() throws IOException { initWriter(0); String s = "foo\nbar\n"; write(s); check(s); } - public void testSuppressNegative() throws Exception { + @Test public void testSuppressNegative() throws Exception { initWriter(-1); String s = "foo\nbar\n"; write(s); check(s); } - public void testSuppressOne() throws Exception { + @Test public void testSuppressOne() throws Exception { initWriter(1); write("foo\nbar\n"); check("bar\n"); } - public void testSuppressTwo() throws Exception { + @Test public void testSuppressTwo() throws Exception { initWriter(2); write("foo\nbar\nzonk\n"); check("zonk\n"); } - public void testSuppressAll() throws Exception { + @Test public void testSuppressAll() throws Exception { initWriter(4); write("foo\nbar\nzonk\n"); check(""); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java index 9800c59ac..986ddde7a 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TextRegionTest.java @@ -7,14 +7,15 @@ *******************************************************************************/ package org.eclipse.xtext.util; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class TextRegionTest extends TestCase { +public class TextRegionTest extends Assert { - public void testContainsByOffset() { + @Test public void testContainsByOffset() { ITextRegion location = new TextRegion(3, 4); assertTrue(location.contains(3)); assertTrue(location.contains(6)); @@ -22,7 +23,7 @@ public class TextRegionTest extends TestCase { assertFalse(location.contains(7)); } - public void testContainsByLocation() { + @Test public void testContainsByLocation() { ITextRegion location = new TextRegion(3, 4); assertTrue(location.contains(new TextRegion(4,2))); assertTrue(location.contains(new TextRegion(4,3))); @@ -33,7 +34,7 @@ public class TextRegionTest extends TestCase { assertFalse(location.contains(new TextRegion(8,1))); } - public void testMerge() { + @Test public void testMerge() { ITextRegion location = new TextRegion(2, 4); ITextRegion merge = location.merge(ITextRegion.EMPTY_REGION); assertEquals(2, merge.getOffset()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java index 389230485..3aae38952 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/TuplesTest.java @@ -2,11 +2,12 @@ package org.eclipse.xtext.util; import java.util.HashSet; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; -public class TuplesTest extends TestCase { +public class TuplesTest extends Assert { - public void testPair() throws Exception { + @Test public void testPair() throws Exception { Pair p1 = Tuples.create("foo", "bar"); Pair p2 = Tuples.create("foo", null); Pair p3 = Tuples.create(null, "bar"); @@ -26,7 +27,7 @@ public class TuplesTest extends TestCase { assertTrue(set.add(Tuples.create((String) null,(String) null))); } - public void testTriple() throws Exception { + @Test public void testTriple() throws Exception { assertFalse(Tuples.create("foo", "bar", "stuff").equals(Tuples.create("foo", "bar"))); assertFalse(Tuples.create("foo", "bar").equals(Tuples.create("foo", "bar", "stuff"))); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java index 792656ba3..f6396dfd9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/CfgToPdaTest.java @@ -7,16 +7,15 @@ *******************************************************************************/ package org.eclipse.xtext.util.formallang; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.eclipse.xtext.util.formallang.StringProduction.ProdElement; import org.eclipse.xtext.util.formallang.StringPda.StringPdaFactory; +import org.eclipse.xtext.util.formallang.StringProduction.ProdElement; +import org.junit.Assert; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class CfgToPdaTest extends TestCase { +public class CfgToPdaTest extends Assert { private String createPda(StringCfg cfg) { FollowerFunction ff = new FollowerFunctionImpl(cfg); @@ -26,7 +25,7 @@ public class CfgToPdaTest extends TestCase { return actual; } - public void testSimple() { + @Test public void testSimple() { StringCfg cfg = new StringCfg(); cfg.rule("Foo: 'foo' Bar"); cfg.rule("Bar: 'bar'"); @@ -41,7 +40,7 @@ public class CfgToPdaTest extends TestCase { Assert.assertEquals(exp.toString(), createPda(cfg)); } - public void testSimple2() { + @Test public void testSimple2() { StringCfg cfg = new StringCfg(); cfg.rule("Foo: Bar"); cfg.rule("Bar: 'bar1' Baz 'bar2'"); @@ -61,7 +60,7 @@ public class CfgToPdaTest extends TestCase { Assert.assertEquals(exp.toString(), createPda(cfg)); } - public void testRecursion() { + @Test public void testRecursion() { StringCfg cfg = new StringCfg(); cfg.rule("Foo: Bar"); cfg.rule("Bar: 'bar1' Foo? 'bar2'"); @@ -78,7 +77,7 @@ public class CfgToPdaTest extends TestCase { Assert.assertEquals(exp.toString(), createPda(cfg)); } - public void testChain() { + @Test public void testChain() { StringCfg cfg = new StringCfg(); cfg.rule("Foo: Bar1"); cfg.rule("Bar1: Bar2"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java index 58e4d2488..ac6b25460 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/FollowerFunctionTest.java @@ -8,10 +8,11 @@ package org.eclipse.xtext.util.formallang; import static org.eclipse.xtext.util.formallang.FollowerFunctionImpl.UnorderedStrategy.*; -import junit.framework.TestCase; import org.eclipse.xtext.util.formallang.FollowerFunctionImpl.Direction; import org.eclipse.xtext.util.formallang.StringProduction.ProdElement; +import org.junit.Assert; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -20,7 +21,7 @@ import com.google.common.collect.Iterables; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class FollowerFunctionTest extends TestCase { +public class FollowerFunctionTest extends Assert { private class ElementFormatter implements Function { public String apply(ProdElement from) { @@ -71,107 +72,107 @@ public class FollowerFunctionTest extends TestCase { return result; } - public void testSimple() { + @Test public void testSimple() { StringProduction p = sp("'a'"); assertEquals("null", new FF(p).followers("a")); } - public void testSequence1() { + @Test public void testSequence1() { StringProduction p = sp("'a' 'b'"); assertEquals("'b'", new FF(p).followers("a")); } - public void testSequence2() { + @Test public void testSequence2() { StringProduction p = sp("'a' 'b'?"); assertEquals("'b', null", new FF(p).followers("a")); } - public void testSequence3() { + @Test public void testSequence3() { StringProduction p = sp("'a' 'b'? 'c'"); assertEquals("'b', 'c'", new FF(p).followers("a")); } - public void testSequence4() { + @Test public void testSequence4() { StringProduction p = sp("'a' 'b'? 'c'?"); assertEquals("'b', 'c', null", new FF(p).followers("a")); } - public void testSequence5() { + @Test public void testSequence5() { StringProduction p = sp("'a'+ 'b'"); assertEquals("'a', 'b'", new FF(p).followers("a")); } - public void testSequence6() { + @Test public void testSequence6() { StringProduction p = sp("'a'* 'b'"); assertEquals("'a', 'b'", new FF(p).followers("a")); } - public void testSequence7() { + @Test public void testSequence7() { StringProduction p = sp("'a' 'b'*"); assertEquals("'b', null", new FF(p).followers("a")); } - public void testSequence8() { + @Test public void testSequence8() { StringProduction p = sp("'a' 'b'* 'c'?"); assertEquals("'b', 'c', null", new FF(p).followers("a")); } - public void testSequence9() { + @Test public void testSequence9() { StringProduction p = sp("'a' ('b' 'c')"); assertEquals("'b'", new FF(p).followers("a")); } - public void testSequence10() { + @Test public void testSequence10() { StringProduction p = sp("'a' ('b'? 'c')"); assertEquals("'b', 'c'", new FF(p).followers("a")); } - public void testSequence11() { + @Test public void testSequence11() { StringProduction p = sp("'a' ('b'? 'c'?)"); assertEquals("'b', 'c', null", new FF(p).followers("a")); } - public void testSequence12() { + @Test public void testSequence12() { StringProduction p = sp("'a' ('b' 'c')*"); assertEquals("'b', null", new FF(p).followers("c")); } - public void testAlternative1() { + @Test public void testAlternative1() { StringProduction p = sp("'a' ('b' | 'c')"); assertEquals("'b', 'c'", new FF(p).followers("a")); } - public void testAlternative2() { + @Test public void testAlternative2() { StringProduction p = sp("'a' ('b'? | 'c')"); assertEquals("'b', 'c', null", new FF(p).followers("a")); } - public void testAlternative3() { + @Test public void testAlternative3() { StringProduction p = sp("'a' ('b' | 'c')?"); assertEquals("'b', 'c', null", new FF(p).followers("a")); } - public void testAlternative4() { + @Test public void testAlternative4() { StringProduction p = sp("'a' 'b'? ('c' | 'd')?"); assertEquals("'b', 'c', 'd', null", new FF(p).followers("a")); } - public void testAlternative5() { + @Test public void testAlternative5() { StringProduction p = sp("'a' ('b' | 'c')+"); assertEquals("'b', 'c'", new FF(p).followers("a")); } - public void testAlternative6() { + @Test public void testAlternative6() { StringProduction p = sp("'a' ('b' | 'c')+"); assertEquals("'b', 'c', null", new FF(p).followers("b")); } - public void testAlternative7() { + @Test public void testAlternative7() { StringProduction p = sp("'a' ('b' | 'c')+"); assertEquals("'b', 'c', null", new FF(p).followers("c")); } - public void testUnordered1() { + @Test public void testUnordered1() { StringProduction p = sp("'a' ('b' & 'c')"); FF mult = new FF(p).setUnorderedStrategy(MULIT_ALTERNATIVE); FF seq = new FF(p).setUnorderedStrategy(SEQUENCE); @@ -183,7 +184,7 @@ public class FollowerFunctionTest extends TestCase { assertEquals("null", seq.followers("c")); } - public void testUnordered2() { + @Test public void testUnordered2() { StringProduction p = sp("'a' ('b' & 'c' & 'd')"); FF mult = new FF(p).setUnorderedStrategy(MULIT_ALTERNATIVE); FF seq = new FF(p).setUnorderedStrategy(SEQUENCE); @@ -197,7 +198,7 @@ public class FollowerFunctionTest extends TestCase { assertEquals("null", seq.followers("d")); } - public void testUnordered3() { + @Test public void testUnordered3() { StringProduction p = sp("'a' ('b'? & 'c')"); FF mult = new FF(p).setUnorderedStrategy(MULIT_ALTERNATIVE); FF seq = new FF(p).setUnorderedStrategy(SEQUENCE); @@ -209,7 +210,7 @@ public class FollowerFunctionTest extends TestCase { assertEquals("null", seq.followers("c")); } - public void testUnordered4() { + @Test public void testUnordered4() { StringProduction p = sp("'a' ('b'? & 'c'?)"); FF mult = new FF(p).setUnorderedStrategy(MULIT_ALTERNATIVE); FF seq = new FF(p).setUnorderedStrategy(SEQUENCE); @@ -221,47 +222,47 @@ public class FollowerFunctionTest extends TestCase { assertEquals("null", seq.followers("c")); } - public void testStarts1() { + @Test public void testStarts1() { StringProduction p = sp("'a'"); assertEquals("'a'", new FF(p).starts()); } - public void testStarts2() { + @Test public void testStarts2() { StringProduction p = sp("'a'?"); assertEquals("'a', null", new FF(p).starts()); } - public void testStarts3() { + @Test public void testStarts3() { StringProduction p = sp("'a'*"); assertEquals("'a', null", new FF(p).starts()); } - public void testStarts4() { + @Test public void testStarts4() { StringProduction p = sp("'a' 'b'"); assertEquals("'a'", new FF(p).starts()); } - public void testStarts5() { + @Test public void testStarts5() { StringProduction p = sp("'a'? 'b'"); assertEquals("'a', 'b'", new FF(p).starts()); } - public void testStarts6() { + @Test public void testStarts6() { StringProduction p = sp("('a' | 'b') 'c'"); assertEquals("'a', 'b'", new FF(p).starts()); } - public void testStarts7() { + @Test public void testStarts7() { StringProduction p = sp("('a' | 'b')*"); assertEquals("'a', 'b', null", new FF(p).starts()); } - public void testStarts8() { + @Test public void testStarts8() { StringProduction p = sp("('a' 'b')*"); assertEquals("'a', null", new FF(p).starts()); } - public void testStarts9() { + @Test public void testStarts9() { StringProduction p = sp("('a' & 'b')*"); assertEquals("'a', 'b', null", new FF(p).starts()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java index ba4f7d110..bb342c8f5 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/NfaToProductionTest.java @@ -7,21 +7,22 @@ *******************************************************************************/ package org.eclipse.xtext.util.formallang; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.google.common.base.Functions; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class NfaToProductionTest extends TestCase { +public class NfaToProductionTest extends Assert { private String nfa2g(Nfa nfa) { NfaToProduction nfa2g = new NfaToProduction(); return nfa2g.nfaToGrammar(nfa, Functions. identity(), new ProductionStringFactory()); } - public void testAlternative() { + @Test public void testAlternative() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y"); nfa.state("x").followedBy("stop"); @@ -29,7 +30,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x | y) stop", nfa2g(nfa)); } - public void testAlternative2() { + @Test public void testAlternative2() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "z"); nfa.state("x").followedBy("stop"); @@ -38,7 +39,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x | y | z) stop", nfa2g(nfa)); } - public void testAlternative3() { + @Test public void testAlternative3() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "z", "v", "w"); nfa.state("x").followedBy("a"); @@ -51,7 +52,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start ((v | w) b | (x | y | z) a) stop", nfa2g(nfa)); } - public void testAlternative4() { + @Test public void testAlternative4() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "stop"); nfa.state("x").followedBy("stop"); @@ -59,7 +60,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x | y)? stop", nfa2g(nfa)); } - public void testAlternative5() { + @Test public void testAlternative5() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y"); nfa.state("x").followedBy("stop", "x"); @@ -67,7 +68,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x+ | y) stop", nfa2g(nfa)); } - public void testAlternative6() { + @Test public void testAlternative6() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "stop"); nfa.state("x").followedBy("stop", "x"); @@ -75,7 +76,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x* | y?) stop", nfa2g(nfa)); } - public void testAlternative7() { + @Test public void testAlternative7() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("a", "b"); nfa.state("a").followedBy("x", "y"); @@ -85,7 +86,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (a | b) (x | y) stop", nfa2g(nfa)); } - public void testAlternative8() { + @Test public void testAlternative8() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("a", "b"); nfa.state("a").followedBy("c", "d"); @@ -97,7 +98,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (a | b) (c | d) (x | y) stop", nfa2g(nfa)); } - public void testManyGroups1() { + @Test public void testManyGroups1() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y"); nfa.state("x").followedBy("x", "y"); @@ -105,7 +106,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x* y)+ stop", nfa2g(nfa)); } - public void testManyAlternative1() { + @Test public void testManyAlternative1() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "stop"); nfa.state("x").followedBy("x", "y", "stop"); @@ -113,7 +114,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x | y)* stop", nfa2g(nfa)); } - public void testManyAlternative2() { + @Test public void testManyAlternative2() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("a", "b", "c", "stop"); nfa.state("a").followedBy("a", "b", "c", "stop"); @@ -122,7 +123,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (a | b | c)* stop", nfa2g(nfa)); } - public void testManyAlternative3() { + @Test public void testManyAlternative3() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("a1", "b1", "stop"); nfa.state("a1").followedBy("a2"); @@ -132,7 +133,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (a1 a2 | b1 b2)* stop", nfa2g(nfa)); } - public void testManyAlternative4() { + @Test public void testManyAlternative4() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("a1", "b1", "c1", "stop"); nfa.state("a1").followedBy("a2"); @@ -144,7 +145,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (a1 a2 | b1 b2 | c1 c2)* stop", nfa2g(nfa)); } - public void testOptionalChain1() { + @Test public void testOptionalChain1() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "stop"); nfa.state("x").followedBy("y", "stop"); @@ -152,7 +153,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start x? y? stop", nfa2g(nfa)); } - public void testOptionalChain2() { + @Test public void testOptionalChain2() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "y", "z", "stop"); nfa.state("x").followedBy("y", "z", "stop"); @@ -161,27 +162,27 @@ public class NfaToProductionTest extends TestCase { assertEquals("start x? y? z? stop", nfa2g(nfa)); } - public void testSimple() { + @Test public void testSimple() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("stop"); assertEquals("start stop", nfa2g(nfa)); } - public void testSimpleMany() { + @Test public void testSimpleMany() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x"); nfa.state("x").followedBy("x", "stop"); assertEquals("start x+ stop", nfa2g(nfa)); } - public void testSimpleManyOptional() { + @Test public void testSimpleManyOptional() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "stop"); nfa.state("x").followedBy("x", "stop"); assertEquals("start x* stop", nfa2g(nfa)); } - public void testSimpleManyOptional2() { + @Test public void testSimpleManyOptional2() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "stop"); nfa.state("x").followedBy("y"); @@ -190,7 +191,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x y z)* stop", nfa2g(nfa)); } - public void testSimpleManyOptional3() { + @Test public void testSimpleManyOptional3() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "stop"); nfa.state("x").followedBy("y", "z"); @@ -199,28 +200,28 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (x y? z+)* stop", nfa2g(nfa)); } - public void testSimpleOne() { + @Test public void testSimpleOne() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x"); nfa.state("x").followedBy("stop"); assertEquals("start x stop", nfa2g(nfa)); } - public void testSimpleOptional1() { + @Test public void testSimpleOptional1() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x", "stop"); nfa.state("x").followedBy("stop"); assertEquals("start x? stop", nfa2g(nfa)); } - public void testSimpleStartStopIdentical() { + @Test public void testSimpleStartStopIdentical() { StringNfa nfa = new StringNfa("foo", "foo"); nfa.start().followedBy("x", "foo"); nfa.state("x").followedBy("foo"); assertEquals("foo x? foo", nfa2g(nfa)); } - public void testSplitStateAlternatives1() { + @Test public void testSplitStateAlternatives1() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("b", "c"); nfa.state("b").followedBy("d", "e"); @@ -230,7 +231,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start (b (d | e) | c e) stop", nfa2g(nfa)); } - public void testSplitStateAlternatives2() { + @Test public void testSplitStateAlternatives2() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("a", "b"); nfa.state("a").followedBy("c", "d"); @@ -243,7 +244,7 @@ public class NfaToProductionTest extends TestCase { assertEquals("start ((a | b) d (f | g) | a c f | b e g) stop", nfa2g(nfa)); } - public void testSplitStateCycle1() { + @Test public void testSplitStateCycle1() { StringNfa nfa = new StringNfa("start", "stop"); nfa.start().followedBy("x"); nfa.state("x").followedBy("stop", "y"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java index cb9535554..d6f207c29 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/formallang/PdaUtilTest.java @@ -11,14 +11,15 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import com.google.common.collect.Lists; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class PdaUtilTest extends TestCase { +public class PdaUtilTest extends Assert { private PdaUtil util = new PdaUtil(); @@ -33,14 +34,14 @@ public class PdaUtilTest extends TestCase { assertEquals(expected, act); } - public void testShortestPathSimple() { + @Test public void testShortestPathSimple() { StringPda pda = new StringPda("A", "C"); pda.state("A").followedBy("B"); pda.state("B").followedBy("C"); assertEquals("[A, B, C]", util.shortestPathTo(pda, newStack(), "C")); } - public void testShortestPathLoop() { + @Test public void testShortestPathLoop() { StringPda pda = new StringPda("A", "C"); pda.state("A").followedBy("B"); pda.state("B").followedBy("C", "B"); @@ -48,7 +49,7 @@ public class PdaUtilTest extends TestCase { assertEquals("[A, B, C]", util.shortestPathTo(pda, newStack(), "C")); } - public void testShortestPathStackSimple() { + @Test public void testShortestPathStackSimple() { StringPda pda = new StringPda("A", "C"); pda.state("A").followedBy("B"); pda.state("B").followedBy("C").pop("X"); @@ -56,7 +57,7 @@ public class PdaUtilTest extends TestCase { assertEquals("null", util.shortestPathTo(pda, newStack(), "C")); } - public void testShortestPathStackSimplePop() { + @Test public void testShortestPathStackSimplePop() { StringPda pda = new StringPda("A", "C"); pda.state("A").followedBy("B").pop("X"); pda.state("B").followedBy("C").pop("Y"); @@ -65,7 +66,7 @@ public class PdaUtilTest extends TestCase { assertEquals("[A, B, C]", util.shortestPathTo(pda, newStack("Y"), "C")); } - public void testShortestPathStackSimplePopLoop() { + @Test public void testShortestPathStackSimplePopLoop() { StringPda pda = new StringPda("A", "C"); pda.state("A").followedBy("B", "A").pop("X"); pda.state("B").followedBy("C", "B").pop("Y"); @@ -74,14 +75,14 @@ public class PdaUtilTest extends TestCase { assertEquals("[A, B, C]", util.shortestPathTo(pda, newStack("Y"), "C")); } - public void testShortestStackemptyingPathStackSimplePopLoop() { + @Test public void testShortestStackemptyingPathStackSimplePopLoop() { StringPda pda = new StringPda("A", "C"); pda.state("A").followedBy("B"); pda.state("B").followedBy("C", "B").pop("Y"); assertEquals("[A, B, B, C]", util.shortestStackpruningPathTo(pda, newStack("Y", "Y"), "C")); } - public void testShortestStackemptyingPathTwoLoops() { + @Test public void testShortestStackemptyingPathTwoLoops() { StringPda pda = new StringPda("A", "D"); pda.state("A").followedBy("B"); pda.state("B").followedBy("C", "B").push("Y"); @@ -91,13 +92,13 @@ public class PdaUtilTest extends TestCase { assertEquals("[A, B, C, C, C, D]", util.shortestStackpruningPathTo(pda, newStack("Y", "Y"), "D")); } - // public void testShortestStackemptyingSingleState() { + // @Test public void testShortestStackemptyingSingleState() { // PDA pda = newPDA(); // pda.state("A").start().stop(); // assertEquals("[A]", util.shortestStackpruningPathTo(pda, newStack(), "A")); // } - // public void testShortestStackemptyingPathLoops1() { + // @Test public void testShortestStackemptyingPathLoops1() { // PDA pda = newPDA(); // pda.state("A").start().followedBy("B"); // pda.state("B").followedBy("C").pop("X"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java index 01377ec93..246541ad9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractCompositeValidatorTest.java @@ -23,9 +23,10 @@ import org.eclipse.xtext.enumrules.EnumRulesTestLanguageStandaloneSetup; import org.eclipse.xtext.enumrules.enumRulesTestLanguage.EnumRulesTestLanguageFactory; import org.eclipse.xtext.enumrules.enumRulesTestLanguage.EnumRulesTestLanguagePackage; import org.eclipse.xtext.enumrules.enumRulesTestLanguage.Model; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.validation.CompositeEValidator.EValidatorEqualitySupport; +import org.junit.Test; import com.google.inject.Inject; @@ -40,7 +41,7 @@ public abstract class AbstractCompositeValidatorTest extends AbstractXtextTests private Second second; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(createStandaloneSetup()); registry = get(EValidator.Registry.class); @@ -51,7 +52,7 @@ public abstract class AbstractCompositeValidatorTest extends AbstractXtextTests } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { registry = null; pack = null; first = null; @@ -99,11 +100,11 @@ public abstract class AbstractCompositeValidatorTest extends AbstractXtextTests } } - public void testSetup() { + @Test public void testSetup() { assertNotNull("registry", registry); } - public void testFirstAndSecond() { + @Test public void testFirstAndSecond() { EValidator validator = registry.getEValidator(pack); assertNotNull(validator); assertTrue(validator instanceof CompositeEValidator); @@ -116,7 +117,7 @@ public abstract class AbstractCompositeValidatorTest extends AbstractXtextTests assertTrue(contents.contains(equalitySupport)); } - public void testBug_279962() { + @Test public void testBug_279962() { EValidator validator = registry.getEValidator(pack); assertTrue(validator instanceof CompositeEValidator); CompositeEValidator composite = (CompositeEValidator) validator; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java index 13af38d11..4b962a02c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTest.java @@ -13,9 +13,9 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.validation.AssertableDiagnostics; -import org.eclipse.xtext.junit.validation.AssertableDiagnostics.DiagnosticPredicate; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.validation.AssertableDiagnostics; +import org.eclipse.xtext.junit4.validation.AssertableDiagnostics.DiagnosticPredicate; import org.eclipse.xtext.validation.IConcreteSyntaxValidator.DiagnosticChainAcceptor; import org.eclipse.xtext.validation.impl.ConcreteSyntaxDiagnosticProvider.ConcreteSyntaxFeatureDiagnostic; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java index 738bcbdf5..70258d7be 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AbstractValidationMessageAcceptingTestCase.java @@ -9,8 +9,7 @@ package org.eclipse.xtext.validation; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.validation.ValidationMessageAcceptor; +import org.eclipse.xtext.junit4.AbstractXtextTests; /** * @author Sebastian Zarnekow - Initial contribution and API diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java index 5e80fc0a5..0a50b1bbc 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/AssignmentAllocatorTest.java @@ -8,13 +8,14 @@ package org.eclipse.xtext.validation; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.validation.IAssignmentQuantityAllocator.IQuantities; import org.eclipse.xtext.validation.IConcreteSyntaxConstraintProvider.ISyntaxConstraint; import org.eclipse.xtext.validation.IConcreteSyntaxDiagnosticProvider.IConcreteSyntaxDiagnostic; import org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestFactory; import org.eclipse.xtext.validation.csvalidationtest.TransientSerializeables1; import org.eclipse.xtext.validation.csvalidationtest.TransientSerializeables1Enum; +import org.junit.Test; import com.google.common.collect.Lists; @@ -25,7 +26,7 @@ public class AssignmentAllocatorTest extends AbstractXtextTests { private static CsvalidationtestFactory f = CsvalidationtestFactory.eINSTANCE; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ConcreteSyntaxValidationTestLanguageStandaloneSetup.class); allocator = getInjector().getInstance(IAssignmentQuantityAllocator.class); @@ -42,7 +43,7 @@ public class AssignmentAllocatorTest extends AbstractXtextTests { return q.toString(); } - public void testTransient() { + @Test public void testTransient() { TransientSerializeables1 ts = f.createTransientSerializeables1(); assertEquals("((val1:0 enum1:0)? (val2:0 int1:0)?)", getAllocation(ts)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java index 2daa78f33..6d5aed6de 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithEObjectValidatorTest.java @@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EValidator; import org.eclipse.xtext.enumrules.EnumRulesTestLanguageStandaloneSetup; import org.eclipse.xtext.enumrules.enumRulesTestLanguage.EnumRulesTestLanguagePackage; import org.eclipse.xtext.validation.CompositeEValidator.EValidatorEqualitySupport; +import org.junit.Test; import com.google.inject.Binder; import com.google.inject.Guice; @@ -43,7 +44,7 @@ public class CompositeValidatorWithEObjectValidatorTest extends AbstractComposit } @Override - public void testContentsSize() { + @Test public void testContentsSize() { EValidator validator = registry.getEValidator(pack); assertNotNull(validator); assertTrue(validator instanceof CompositeEValidator); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java index 41063f102..c739cf77f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/CompositeValidatorWithoutEObjectValidatorTest.java @@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EValidator; import org.eclipse.xtext.enumrules.EnumRulesTestLanguageStandaloneSetup; import org.eclipse.xtext.enumrules.enumRulesTestLanguage.EnumRulesTestLanguagePackage; import org.eclipse.xtext.validation.CompositeEValidator.EValidatorEqualitySupport; +import org.junit.Test; import com.google.inject.Binder; import com.google.inject.Guice; @@ -43,7 +44,7 @@ public class CompositeValidatorWithoutEObjectValidatorTest extends AbstractCompo } @Override - public void testContentsSize() { + @Test public void testContentsSize() { EValidator validator = registry.getEValidator(pack); assertNotNull(validator); assertTrue(validator instanceof CompositeEValidator); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java index 7822fdc24..fadab1501 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxConstraintProviderTest.java @@ -18,9 +18,10 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.validation.IConcreteSyntaxConstraintProvider.ISyntaxConstraint; import org.eclipse.xtext.validation.impl.ConcreteSyntaxConstraintProvider; +import org.junit.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -54,7 +55,7 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } @@ -91,87 +92,87 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { return ""; } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String constraint = parseRule("Model: name=ID;"); assertEquals("name", constraint); } - public void testGroup1() throws Exception { + @Test public void testGroup1() throws Exception { String constraint = parseRule("Model: name=ID (val=INT 'somekw')?;"); assertEquals("(name val?)", constraint); } - public void testAlternatives1() throws Exception { + @Test public void testAlternatives1() throws Exception { String constraint = parseRule("Model: name=ID | val=INT | 'somekw';"); assertEquals("(name|val)?", constraint); } - public void testAction1() throws Exception { + @Test public void testAction1() throws Exception { String constraint = parseRule("Model: {Model} name=ID;"); assertEquals("({} name)", constraint); } - public void testAction2() throws Exception { + @Test public void testAction2() throws Exception { String constraint = parseRule("Model: {Type1} name=ID;"); assertEquals("({} name)", constraint); } - public void testAction3() throws Exception { + @Test public void testAction3() throws Exception { String constraint = parseRule("Model: 'something' ({Type1} name=ID)? val=INT;"); assertEquals("(({} name)? val)", constraint); } - public void testAction4() throws Exception { + @Test public void testAction4() throws Exception { String constraint = parseRule("Model: 't1' {Type1} | 't2' {Type2} | 't3' {Type3};"); assertEquals("({}|{}|{})", constraint); } - public void testAction5() throws Exception { + @Test public void testAction5() throws Exception { String constraint = parseRule("Model: 't1' {Type1} | 't2' {Type2} | 't3' {Type3} | 't4';"); assertEquals("({}|{}|{})?", constraint); } - public void testAction6() throws Exception { + @Test public void testAction6() throws Exception { String constraint = parseRule("Model: 't1' {Type1} val=ID | 't2' {Type2} val=ID | 't3' {Type3} | 't4';"); assertEquals("(({} val)|({} val)|{})?", constraint); } - public void testAction7() throws Exception { + @Test public void testAction7() throws Exception { String constraint = parseRule("Model: ('t1' {Type1} val=ID | 't2' {Type2} val=ID | 't3' {Type3})?;"); assertEquals("(({} val)|({} val)|{})?", constraint); } - public void testAction8() throws Exception { + @Test public void testAction8() throws Exception { String constraint = parseRule("Model: 't1' {Type1} val=ID | ('something' ({Type2} 't2' | {Type3} 't3'));"); assertEquals("(({} val)|({}|{}))", constraint); } - public void testAction9() throws Exception { + @Test public void testAction9() throws Exception { String constraint = parseRule("Model: ('t1' {Type1} val1=ID | val2=ID) val3=ID;"); assertEquals("((({} val1)|val2) val3)", constraint); } - public void testSummarizeAssignments1() throws Exception { + @Test public void testSummarizeAssignments1() throws Exception { String constraint = parseRule("Model: val+=ID (',' val+=ID)*;"); assertEquals("val+", constraint); } - public void testSummarizeAssignments2() throws Exception { + @Test public void testSummarizeAssignments2() throws Exception { String constraint = parseRule("Model: val+=ID (',' val+=ID)+;"); assertEquals("(val val+)", constraint); } - public void testSummarizeAssignments3() throws Exception { + @Test public void testSummarizeAssignments3() throws Exception { String constraint = parseRule("Model: (val+=ID (',' val+=ID)*)?;"); assertEquals("val*", constraint); } - public void testMulti1() throws Exception { + @Test public void testMulti1() throws Exception { String constraint = parseRule("model : ('kw1' a+=ID b+=ID)* ('kw2' a+=ID c+=ID)* ('kw3' b+=ID c+=ID)*;"); assertEquals("((a b)* (a c)* (b c)*)", constraint); } - public void testRuleCall1() throws Exception { + @Test public void testRuleCall1() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: Sub; "); b.append("Sub: val=ID; "); @@ -179,7 +180,7 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { assertEquals("val", constraint); } - public void testRuleCall2() throws Exception { + @Test public void testRuleCall2() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: (Sub1 | Sub2) name=ID 'somekeyword'; "); b.append("Sub1: 'sub1' val1=ID; "); @@ -188,7 +189,7 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { assertEquals("((val1|val2) name)", constraint); } - public void testRuleCall3() throws Exception { + @Test public void testRuleCall3() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: (Sub1 | Sub2)? name=ID 'somekeyword'; "); b.append("Sub1: 'sub1' val1=ID; "); @@ -197,7 +198,7 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { assertEquals("((val1|val2)? name)", constraint); } - public void testRecursion() throws Exception { + @Test public void testRecursion() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model returns Model: Sub1 | name=ID 'somekeyword'; "); b.append("Sub1 returns Model: '(' Model ')'; "); @@ -205,14 +206,14 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { assertNull(constraint); } - public void testAssignedActions() throws Exception { + @Test public void testAssignedActions() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: 'y' val=ID ({Evil.left=current} ',' right=ID)?; "); String constraint = parseRule(b.toString()); assertNull(constraint); } - public void testNestedAssignedActions() throws Exception { + @Test public void testNestedAssignedActions() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: Foo | Bar; "); b.append("Foo: 'x' val=ID; "); @@ -222,12 +223,12 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { } // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=312220 - public void testUnassignedRuleCall() throws Exception { + @Test public void testUnassignedRuleCall() throws Exception { String constraint = parseRule("WithoutHidden hidden(): '[' 'kw' WS x=INT '.' y=INT ']';"); assertEquals("(x y)", constraint); } - public void testNestedAlternative() throws Exception { + @Test public void testNestedAlternative() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: (SE | Decl) ';'; "); b.append("Decl: type+=ID name+=ID; "); @@ -236,12 +237,12 @@ public class ConcreteSyntaxConstraintProviderTest extends AbstractXtextTests { assertEquals("((ids|ints)+|(type name))", constraint); } - public void testEmptyAlternative() throws Exception { + @Test public void testEmptyAlternative() throws Exception { String constraint = parseRule("Import: ('import' | 'imp') foo=ID?;"); assertEquals("foo?", constraint); } - public void testOptionalGroupWithUnassignedElements() throws Exception { + @Test public void testOptionalGroupWithUnassignedElements() throws Exception { StringBuilder b = new StringBuilder(); b.append("Model: ('(' INT ')')? a=STRING b=STRING;"); String constraint = parseRule(b.toString()); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java index e7b959d16..1cf18c8e9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTest.java @@ -7,7 +7,7 @@ *******************************************************************************/ package org.eclipse.xtext.validation; -import static org.eclipse.xtext.junit.validation.AssertableDiagnostics.*; +import static org.eclipse.xtext.junit4.validation.AssertableDiagnostics.*; import static org.eclipse.xtext.validation.IConcreteSyntaxDiagnosticProvider.*; import org.eclipse.emf.common.util.BasicEList; @@ -48,6 +48,7 @@ import org.eclipse.xtext.validation.csvalidationtest.UnassignedRuleCall2Sub; import org.eclipse.xtext.validation.csvalidationtest.UnassignedRuleCall2SubAction; import org.eclipse.xtext.validation.csvalidationtest.impl.TransientObjectImpl; import org.eclipse.xtext.validation.impl.ConcreteSyntaxValidator; +import org.junit.Test; /** * @author meysholdt - Initial contribution and API @@ -55,7 +56,7 @@ import org.eclipse.xtext.validation.impl.ConcreteSyntaxValidator; public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidationTest { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(ConcreteSyntaxValidationTestLanguageStandaloneSetup.class); validator = getInjector().getInstance(ConcreteSyntaxValidator.class); @@ -75,14 +76,14 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati return getModel(model).eContents().get(0); } - public void testSimpleGroup1() throws Exception { + @Test public void testSimpleGroup1() throws Exception { SimpleGroup m = (SimpleGroup) getModel2("#1 abc def"); validate(m).assertOK(); m.setVal2(null); validate(m).assertAll(err(p.getSimpleGroup_Val2(), ERROR_VALUE_REQUIRED, 1, 1, "")); } - public void testSimpleAlternative1() throws Exception { + @Test public void testSimpleAlternative1() throws Exception { SimpleAlternative m = (SimpleAlternative) getModel2("#2 kw1 abc"); validate(m).assertOK(); m.setVal2("def2"); @@ -90,7 +91,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati err(p.getSimpleAlternative_Val2(), ERROR_VALUE_PROHIBITED, null, 0, "(val1|val2)")); } - public void testSimpleMultiplicities1() throws Exception { + @Test public void testSimpleMultiplicities1() throws Exception { SimpleMultiplicities m = (SimpleMultiplicities) getModel2("#3 abc kw1 def kw2 fgh ijk kw3 lmn opq"); validate(m).assertOK(); m.setVal2(null); @@ -107,7 +108,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertAll(err(p.getSimpleMultiplicities_Val3(), ERROR_LIST_TOO_FEW, 1, null, "")); } - public void testGroupMultiplicities1() throws Exception { + @Test public void testGroupMultiplicities1() throws Exception { GroupMultiplicities m = (GroupMultiplicities) getModel2("#4 abc kw1 def def kw2 fgh ijk kw3 lmn opq"); validate(m).assertOK(); @@ -150,7 +151,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati } - public void testAlternativeMultiplicities1() throws Exception { + @Test public void testAlternativeMultiplicities1() throws Exception { AlternativeMultiplicities m = (AlternativeMultiplicities) getModel2("#5 abc kw2 kw3 fgh kw3 xxx kw4 ijk lmn opq"); validate(m).assertOK(); @@ -183,7 +184,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertOK(); } - public void testAssignedAction1() throws Exception { + @Test public void testAssignedAction1() throws Exception { AssignedAction m = (AssignedAction) getModel2("#6 id1 id2 id3"); validate(m).assertOK(); m.setVal1(null); @@ -192,7 +193,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(m).assertOK(); } - public void testAssignedAction2() throws Exception { + @Test public void testAssignedAction2() throws Exception { AssignedAction m = (AssignedAction) getModel2("#7 id1 kw1 id3"); validate(m).assertOK(); m.setVal1(null); @@ -201,21 +202,21 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(m).assertOK(); } - public void testUnassignedAction1() throws Exception { + @Test public void testUnassignedAction1() throws Exception { UnassignedAction1 m = (UnassignedAction1) getModel2("#8 id1"); validate(m).assertOK(); m.setVal1(null); validate(m).assertAll(err(p.getUnassignedAction1_Val1(), ERROR_VALUE_REQUIRED, 1, null, "")); } - public void testUnassignedAction2() throws Exception { + @Test public void testUnassignedAction2() throws Exception { UnassignedAction2Sub m = (UnassignedAction2Sub) getModel2("#9 id1"); validate(m).assertOK(); m.setVal1(null); validate(m).assertAll(err(p.getUnassignedAction2Sub_Val1(), ERROR_VALUE_REQUIRED, 1, 1, "")); } - public void testUnassignedAction3() throws Exception { + @Test public void testUnassignedAction3() throws Exception { UnassignedAction3 m = (UnassignedAction3) getModel2("#10 kw1 id1 id2"); validate(m).assertOK(); m.setVal1(null); @@ -226,7 +227,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(ua).assertAll(errorCode(ERROR_WRONG_TYPE)); } - public void testUnassignedRuleCall1() throws Exception { + @Test public void testUnassignedRuleCall1() throws Exception { UnassignedRuleCall1Sub m = (UnassignedRuleCall1Sub) getModel2("#11 id1 id2"); validate(m).assertOK(); @@ -237,7 +238,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(m1).assertAll(errorCode(ERROR_WRONG_TYPE)); } - public void testUnassignedRuleCall2() throws Exception { + @Test public void testUnassignedRuleCall2() throws Exception { UnassignedRuleCall2SubAction a = f.createUnassignedRuleCall2SubAction(); a.setVal2("foo"); validate(a).assertOK(); @@ -250,7 +251,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(c).assertAll(errorCode(ERROR_WRONG_TYPE)); } - public void testCombination1() throws Exception { + @Test public void testCombination1() throws Exception { Combination1 copy, m = (Combination1) getModel2("#13 id1 kw1 id2 kw2 id3"); validate(m).assertOK(); @@ -271,7 +272,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati err(p.getCombination1_Val4(), ERROR_VALUE_REQUIRED, 1, null, "(val2 (val3|val4))?")); } - public void testCombination2() throws Exception { + @Test public void testCombination2() throws Exception { Combination2 copy, m = (Combination2) getModel2("#14 id1 id31 id41 id32 id42"); validate(m).assertOK(); @@ -287,7 +288,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati err(p.getCombination2_Val4(), ERROR_LIST_TOO_MANY, null, 0, "(val2|(val3 val4)*)")); } - public void testCombination3() throws Exception { + @Test public void testCombination3() throws Exception { Combination3 copy, m = (Combination3) getModel2("#15 'string' id1 1234"); validate(m).assertOK(); @@ -301,7 +302,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertOK(); } - public void testCombination4() throws Exception { + @Test public void testCombination4() throws Exception { Combination4 copy, m = (Combination4) getModel2("#16 group id11 id12 id13 group id21 id22 id23"); validate(m).assertOK(); @@ -315,7 +316,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati err(p.getCombination4_Val3(), ERROR_LIST_TOO_MANY, null, 1, "(val1 val2 val3)+")); } - public void testList1() throws Exception { + @Test public void testList1() throws Exception { List1 copy, m = (List1) getModel2("#17 id1, id2, id2"); validate(m).assertOK(); @@ -329,7 +330,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertAll(err(p.getList1_Val1(), ERROR_LIST_TOO_FEW, 1, null, "")); } - public void testList2() throws Exception { + @Test public void testList2() throws Exception { List2 copy, m = (List2) getModel2("#18 id1, id2, id2"); validate(m).assertOK(); @@ -343,7 +344,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertOK(); } - public void testList3() throws Exception { + @Test public void testList3() throws Exception { List3 copy, m = (List3) getModel2("#19 id1, id2, id2"); validate(m).assertOK(); @@ -363,7 +364,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertOK(); } - public void testList4() throws Exception { + @Test public void testList4() throws Exception { List4 copy, m = (List4) getModel2("#20 id11, id12, id13 kw3 id2"); validate(m).assertOK(); @@ -381,7 +382,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertAll(err(p.getList4_Val2(), ERROR_VALUE_REQUIRED, 1, null, "")); } - public void testList5() throws Exception { + @Test public void testList5() throws Exception { List5 copy, m = (List5) getModel2("#21 id11, id12, id13 kw3 id2"); validate(m).assertOK(); @@ -411,7 +412,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati err(p.getList5_Val3(), ERROR_VALUE_PROHIBITED, null, 0, "((val1+ val2)|val3)")); } - public void testAltList1() throws Exception { + @Test public void testAltList1() throws Exception { AltList1 copy, m = (AltList1) getModel2("#22 id1 id2"); validate(m).assertOK(); @@ -430,7 +431,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertOK(); } - public void testAltList2() throws Exception { + @Test public void testAltList2() throws Exception { AltList2 copy, m = (AltList2) getModel2("#23 id1 id2"); validate(m).assertOK(); @@ -447,7 +448,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(copy).assertOK(); } - public void testTransientObject() { + @Test public void testTransientObject() { TransientObject to = new TransientObjectImpl() { @Override public boolean eIsSet(int featureID) { @@ -476,7 +477,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(to).assertOK(); } - public void testTransientSerializeables1() throws Exception { + @Test public void testTransientSerializeables1() throws Exception { TransientSerializeables1 m = f.createTransientSerializeables1(); validate(m).assertOK(); @@ -511,7 +512,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati err(p.getTransientSerializeables1_Val2(), ERROR_VALUE_REQUIRED, 1, null, "(val2 int1)?")); } - public void testStaticSimplification() { + @Test public void testStaticSimplification() { StaticSimplification m = f.createStaticSimplification(); validate(m).assertOK(); @@ -551,7 +552,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati validate(m).assertOK(); } - public void testTwoVersion() { + @Test public void testTwoVersion() { TwoVersion m = f.createTwoVersion(); validate(m).assertAll( err(p.getTwoVersion_Shared2(), ERROR_VALUE_REQUIRED, null, null, @@ -648,7 +649,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati // return result; // } // - // public void testHeuristic1() { + // @Test public void testHeuristic1() { // Heuristic1 m = f.createHeuristic1(); // m.getA().addAll(Lists.newArrayList("foo", "foo", "foo")); // m.getB().addAll(Lists.newArrayList("foo", "foo", "foo")); @@ -682,7 +683,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati // // } // - // public void testHeuristic1Large1() { + // @Test public void testHeuristic1Large1() { // Heuristic1 m = f.createHeuristic1(); // m.getA().addAll(strings(42)); // m.getB().addAll(strings(42)); @@ -693,7 +694,7 @@ public class ConcreteSyntaxValidationTest extends AbstractConcreteSyntaxValidati // validate(m).assertOK(); // } // - // public void testHeuristic1Large2() { + // @Test public void testHeuristic1Large2() { // Heuristic1 m = f.createHeuristic1(); // m.getA().addAll(strings(42)); // m.getB().addAll(strings(42)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java index d6813246d..5f5e919b3 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcurrentValidationTest.java @@ -7,12 +7,11 @@ *******************************************************************************/ package org.eclipse.xtext.validation; -import junit.framework.AssertionFailedError; - import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.validation.ValidationTestHelper.TestChain; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -22,18 +21,18 @@ public class ConcurrentValidationTest extends AbstractXtextTests { private ValidationTestHelper helper; @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { helper = null; super.tearDown(); } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); helper = new ValidationTestHelper(); } - public void testConcurrentValidation() { + @Test public void testConcurrentValidation() { AbstractDeclarativeValidator validator = new ValidationTestHelper.TestValidator() { @Override protected void foo(EStructuralFeature x) { @@ -77,7 +76,7 @@ public class ConcurrentValidationTest extends AbstractXtextTests { private final AbstractDeclarativeValidator validator; private IllegalStateException lastEx; - private AssertionFailedError lastError; + private AssertionError lastError; private PoorMansValidationJob(AbstractDeclarativeValidator validator) { this.validator = validator; @@ -90,7 +89,7 @@ public class ConcurrentValidationTest extends AbstractXtextTests { helper.assertMatch(diagnostics, EcorePackage.Literals.ENAMED_ELEMENT__NAME, EcorePackage.Literals.ECLASS__ABSTRACT); } catch(IllegalStateException e) { lastEx = e; - } catch(AssertionFailedError error) { + } catch(AssertionError error) { lastError = error; } } 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 e6276bcc7..bc6dd79a1 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 @@ -11,36 +11,35 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; -import junit.framework.TestCase; - import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.validation.ValidationTestHelper.TestChain; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API * @author Michael Clay */ -public class DeclarativeValidatorTest extends TestCase { +public class DeclarativeValidatorTest extends Assert { private ValidationTestHelper helper; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { this.helper = new ValidationTestHelper(); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { this.helper = null; - super.tearDown(); } - public void testSimpleDispatch() throws Exception { + @Test public void testSimpleDispatch() throws Exception { AbstractDeclarativeValidator test = helper.validator(); TestChain chain = helper.chain(); test.validate(EcorePackage.eINSTANCE.getEClass(), chain, null); @@ -49,7 +48,7 @@ public class DeclarativeValidatorTest extends TestCase { EcorePackage.Literals.ECLASS__ABSTRACT); } - public void testDeeperHierarchyWithOverwrittenJavaMethods() throws Exception { + @Test public void testDeeperHierarchyWithOverwrittenJavaMethods() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { @Override @Check @@ -65,7 +64,7 @@ public class DeclarativeValidatorTest extends TestCase { } @SuppressWarnings("serial") - public void testSkipExpensive() throws Exception { + @Test public void testSkipExpensive() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { @SuppressWarnings("unused") @Check(CheckType.EXPENSIVE) @@ -102,7 +101,7 @@ public class DeclarativeValidatorTest extends TestCase { EcorePackage.Literals.ECLASS__EALL_ATTRIBUTES); } - public void testGuard() throws Exception { + @Test public void testGuard() throws Exception { AbstractDeclarativeValidator validator = new AbstractDeclarativeValidator() { @SuppressWarnings("unused") @Check @@ -117,7 +116,7 @@ public class DeclarativeValidatorTest extends TestCase { } @SuppressWarnings("serial") - public void testCheckModeSettedProperly() throws Exception { + @Test public void testCheckModeSettedProperly() throws Exception { AbstractDeclarativeValidator test = helper.validator(); TestChain chain = helper.chain(); try { @@ -133,7 +132,7 @@ public class DeclarativeValidatorTest extends TestCase { fail("CheckMode with wrong type, should throw an IllegalArgumentException"); } - public void testAssertThreadLocalState() throws Exception { + @Test public void testAssertThreadLocalState() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { @Override @Check @@ -150,7 +149,7 @@ public class DeclarativeValidatorTest extends TestCase { test.validate(EcorePackage.eINSTANCE.getEClass(), chain, Collections.emptyMap()); } - public void testCurrentObjectAndMethod() throws Exception { + @Test public void testCurrentObjectAndMethod() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { @Override @Check @@ -167,7 +166,7 @@ public class DeclarativeValidatorTest extends TestCase { test.validate(EcorePackage.eINSTANCE.getEClass(), chain, Collections.emptyMap()); } - public void testContext() throws Exception { + @Test public void testContext() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { @Override @Check @@ -181,7 +180,7 @@ public class DeclarativeValidatorTest extends TestCase { test.validate(EcorePackage.eINSTANCE.getEClass(), chain, singletonMap); } - public void testCheckMode() throws Exception { + @Test public void testCheckMode() throws Exception { AbstractDeclarativeValidator test = new ValidationTestHelper.TestValidator() { @Override @Check @@ -194,7 +193,7 @@ public class DeclarativeValidatorTest extends TestCase { test.validate(EcorePackage.eINSTANCE.getEClass(), chain, singletonMap); } - public void testError() { + @Test public void testError() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check @SuppressWarnings("unused") @@ -212,7 +211,7 @@ public class DeclarativeValidatorTest extends TestCase { assertEquals(Diagnostic.ERROR, diag.getSeverity()); } - public void testErrorWithSource() { + @Test public void testErrorWithSource() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check @SuppressWarnings("unused") @@ -234,7 +233,7 @@ public class DeclarativeValidatorTest extends TestCase { assertEquals(Diagnostic.ERROR, diag.getSeverity()); } - public void testErrorWithCode() { + @Test public void testErrorWithCode() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check @SuppressWarnings("unused") @@ -258,7 +257,7 @@ public class DeclarativeValidatorTest extends TestCase { assertEquals(Diagnostic.ERROR, diag.getSeverity()); } - public void testWarning() { + @Test public void testWarning() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check @SuppressWarnings("unused") @@ -276,7 +275,7 @@ public class DeclarativeValidatorTest extends TestCase { assertEquals(Diagnostic.WARNING, diag.getSeverity()); } - public void testWarningWithSource() { + @Test public void testWarningWithSource() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check @SuppressWarnings("unused") @@ -298,7 +297,7 @@ public class DeclarativeValidatorTest extends TestCase { assertEquals(Diagnostic.WARNING, diag.getSeverity()); } - public void testWarningWithCode() { + @Test public void testWarningWithCode() { AbstractDeclarativeValidator test = new AbstractDeclarativeValidator() { @Check @SuppressWarnings("unused") diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java index 9bec9fd2a..9fad97d9e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ImportUriValidatorTest.java @@ -14,10 +14,11 @@ import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.Diagnostician; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.ImportUriTestLanguageRuntimeModule; import org.eclipse.xtext.linking.ImportUriTestLanguageStandaloneSetup; import org.eclipse.xtext.linking.importedURI.ImportedURIPackage; +import org.junit.Test; import com.google.inject.Binder; import com.google.inject.Guice; @@ -29,19 +30,19 @@ import com.google.inject.Injector; public class ImportUriValidatorTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(createStandaloneSetup()); } - public void testValidURI() throws Exception { + @Test public void testValidURI() throws Exception { String model = "import 'classpath:/org/eclipse/xtext/linking/ImportUriTestLanguage.xtext'"; Resource resource = getResourceFromString(model); Diagnostic diagnostics = Diagnostician.INSTANCE.validate(resource.getContents().get(0)); assertEquals(Diagnostic.OK, diagnostics.getSeverity()); } - public void testInvalidURI() throws Exception { + @Test public void testInvalidURI() throws Exception { String model = "import 'classpath:/org/eclipse/xtext/linking/ImportUriTestLanguage.unknown'"; Resource resource = getResourceFromString(model); Diagnostic diagnostics = Diagnostician.INSTANCE.validate(resource.getContents().get(0)); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java index 191005aa0..5e30581b6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/InjectableValidatorTest.java @@ -21,12 +21,13 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.xmi.XMIResource; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguageFactory; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguagePackage; import org.eclipse.xtext.linking.langATestLanguage.Main; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -39,7 +40,7 @@ public class InjectableValidatorTest extends AbstractXtextTests { private Map context; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LangATestLanguageStandaloneSetup.class); languageSpecificValidator = get(LanguageSpecificValidator.class); @@ -48,7 +49,7 @@ public class InjectableValidatorTest extends AbstractXtextTests { context = newHashMap(); } - public void testCorrectResource() throws Exception { + @Test public void testCorrectResource() throws Exception { Main main = LangATestLanguageFactory.eINSTANCE.createMain(); xtextResource.getContents().add(main); assertFalse(languageSpecificValidator.validate(main, new BasicDiagnostic(), null)); @@ -61,7 +62,7 @@ public class InjectableValidatorTest extends AbstractXtextTests { assertNull(context.get(AbstractInjectableValidator.CURRENT_LANGUAGE_NAME)); } - public void testArbitraryEPackage() throws Exception { + @Test public void testArbitraryEPackage() throws Exception { EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); xtextResource.getContents().add(ePackage); assertFalse(languageSpecificValidator.validate(ePackage, new BasicDiagnostic(), null)); @@ -74,7 +75,7 @@ public class InjectableValidatorTest extends AbstractXtextTests { assertNull(context.get(AbstractInjectableValidator.CURRENT_LANGUAGE_NAME)); } - public void testWrongResource() throws Exception { + @Test public void testWrongResource() throws Exception { Main main = LangATestLanguageFactory.eINSTANCE.createMain(); XMIResource xmiResource = new XMIResourceImpl(); xmiResource.getContents().add(main); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java index f049ab89b..6e86080bd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidationHelperTest.java @@ -24,6 +24,7 @@ import org.eclipse.xtext.resource.EObjectDescription; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.Scopes; import org.eclipse.xtext.util.CancelIndicator; +import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -41,7 +42,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag private int created; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); helper = new NamesAreUniqueValidationHelper() { @Override @@ -55,7 +56,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag expected = Lists.newArrayList(); } - public void testCancel_01() { + @Test public void testCancel_01() { maxCallCount = 1; helper.checkUniqueNames( Scopes.scopedElementsFor(ImmutableList.of( @@ -66,7 +67,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals(maxCallCount, callCount); } - public void testCancel_02() { + @Test public void testCancel_02() { maxCallCount = 0; helper.checkUniqueNames( Scopes.scopedElementsFor(ImmutableList.of( @@ -77,7 +78,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals(2, callCount); } - public void testCancel_03() { + @Test public void testCancel_03() { maxCallCount = 0; helper.checkUniqueNames( Scopes.scopedElementsFor(ImmutableList.of( @@ -88,7 +89,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals(0, callCount); } - public void testCreatedErrors_01() { + @Test public void testCreatedErrors_01() { maxCallCount = 0; ImmutableList classes = ImmutableList.of( createEClass(), @@ -105,7 +106,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertTrue(expected.isEmpty()); } - public void testCreatedErrors_02() { + @Test public void testCreatedErrors_02() { maxCallCount = 0; ImmutableList classifiers = ImmutableList.of( createEClass(), @@ -122,7 +123,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertTrue(expected.isEmpty()); } - public void testCreatedErrors_03() { + @Test public void testCreatedErrors_03() { maxCallCount = 0; ImmutableList elements = ImmutableList.of( createEClass(), @@ -140,7 +141,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertTrue(expected.isEmpty()); } - public void testCreatedErrors_04() { + @Test public void testCreatedErrors_04() { maxCallCount = 0; ImmutableList elements = ImmutableList.of( createEClass(), @@ -159,7 +160,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertTrue(expected.isEmpty()); } - public void testCreatedErrors_05() { + @Test public void testCreatedErrors_05() { maxCallCount = 0; ImmutableList elements = ImmutableList.of( createEPackage(), @@ -178,7 +179,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertTrue(expected.isEmpty()); } - public void testCreatedErrors_06() { + @Test public void testCreatedErrors_06() { maxCallCount = 1; ImmutableList elements = ImmutableList.of( createEPackage(), @@ -194,7 +195,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals(1, callCount); } - public void testCreatedErrors_07() { + @Test public void testCreatedErrors_07() { maxCallCount = 0; ImmutableList elements = ImmutableList.of( createEPackage(), @@ -213,7 +214,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertTrue(expected.isEmpty()); } - public void testErrorMessage_01() { + @Test public void testErrorMessage_01() { EClass eClass = createEClass(); eClass.setName("EClassName"); IEObjectDescription description = EObjectDescription.create(QualifiedName.create(eClass.getName()), eClass); @@ -221,7 +222,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals("Duplicate EClassifier 'EClassName'", errorMessage); } - public void testErrorMessage_02() { + @Test public void testErrorMessage_02() { EClass eClass = createEClass(); eClass.setName("EClassName"); IEObjectDescription description = EObjectDescription.create(QualifiedName.create(eClass.getName()), eClass); @@ -229,7 +230,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals("Duplicate EClass 'EClassName'", errorMessage); } - public void testErrorMessage_03() { + @Test public void testErrorMessage_03() { EClass eClass = createEClass(); eClass.setName("EClassName"); EAttribute attribute = EcoreFactory.eINSTANCE.createEAttribute(); @@ -240,7 +241,7 @@ public class NamesAreUniqueValidationHelperTest extends AbstractValidationMessag assertEquals("Duplicate EAttribute 'Attribute' in EClass 'EClassName'", errorMessage); } - public void testErrorMessage_04() { + @Test public void testErrorMessage_04() { EClass eClass = createEClass(); eClass.setName("EClassName"); EAttribute attribute = EcoreFactory.eINSTANCE.createEAttribute(); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java index faf700ce2..297fc1e9e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/NamesAreUniqueValidatorTest.java @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.resource.ContentHandler; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceImpl; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; @@ -29,6 +29,7 @@ import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy; import org.eclipse.xtext.resource.impl.DefaultResourceServiceProvider; import org.eclipse.xtext.util.CancelIndicator; import org.eclipse.xtext.util.SimpleAttributeResolver; +import org.junit.Test; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -45,7 +46,7 @@ public class NamesAreUniqueValidatorTest extends AbstractXtextTests implements I private Resource resource; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); context = Maps.newHashMap(); validator = new NamesAreUniqueValidator() { @@ -80,7 +81,7 @@ public class NamesAreUniqueValidatorTest extends AbstractXtextTests implements I } } - public void testOnlyOnesPerResource() { + @Test public void testOnlyOnesPerResource() { validator.checkUniqueNamesInResourceOf(resource.getContents().get(0)); validator.checkUniqueNamesInResourceOf(resource.getContents().get(1)); assertEquals(1, callCount); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java index 5369a32a6..32b768124 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ResourceValidatorImplTest.java @@ -18,12 +18,13 @@ import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EValidator; import org.eclipse.xtext.diagnostics.Severity; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; import org.eclipse.xtext.linking.langATestLanguage.LangATestLanguagePackage; import org.eclipse.xtext.linking.langATestLanguage.Type; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -31,7 +32,7 @@ import org.eclipse.xtext.util.StringInputStream; public class ResourceValidatorImplTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new LangATestLanguageStandaloneSetup()); EValidator.Registry.INSTANCE.put(LangATestLanguagePackage.eINSTANCE, new EValidator(){ @@ -58,21 +59,21 @@ public class ResourceValidatorImplTest extends AbstractXtextTests { }}); } - public void testSyntaxError() throws Exception { + @Test public void testSyntaxError() throws Exception { XtextResource resource = getResourceAndExpect(new StringInputStream("type foo."), 1); List list = getValidator().validate(resource, CheckMode.NORMAL_AND_FAST, null); assertEquals(1,list.size()); assertTrue(list.get(0).isSyntaxError()); } - public void testLinkingError() throws Exception { + @Test public void testLinkingError() throws Exception { XtextResource resource = getResourceAndExpect(new StringInputStream("type foo extends Bar"), 1); List list = getValidator().validate(resource, CheckMode.NORMAL_AND_FAST, null); assertEquals(1,list.size()); assertTrue(list.get(0).isSyntaxError()); } - public void testSemanticError() throws Exception { + @Test public void testSemanticError() throws Exception { XtextResource resource = getResourceAndExpect(new StringInputStream("type Foo"), 0); List list = getValidator().validate(resource, CheckMode.NORMAL_AND_FAST, null); assertEquals(1,list.size()); @@ -80,7 +81,7 @@ public class ResourceValidatorImplTest extends AbstractXtextTests { assertEquals(Severity.ERROR, list.get(0).getSeverity()); } - public void testSemanticWarning() throws Exception { + @Test public void testSemanticWarning() throws Exception { XtextResource resource = getResourceAndExpect(new StringInputStream("type Bar"), 0); List list = getValidator().validate(resource, CheckMode.NORMAL_AND_FAST, null); assertEquals(1,list.size()); 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 2f379b3f5..470346682 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 @@ -11,13 +11,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; - import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; +import org.junit.Assert; /** * @author Sebastian Zarnekow - Initial contribution and API diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java index 85ae36452..e0ae35023 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ValidatorTesterTest.java @@ -7,7 +7,7 @@ *******************************************************************************/ package org.eclipse.xtext.validation; -import static org.eclipse.xtext.junit.validation.AssertableDiagnostics.*; +import static org.eclipse.xtext.junit4.validation.AssertableDiagnostics.*; import java.util.Arrays; import java.util.List; @@ -18,8 +18,9 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.junit.validation.ValidatorTester; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.eclipse.xtext.junit4.validation.ValidatorTester; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API @@ -65,16 +66,16 @@ public class ValidatorTesterTest extends AbstractXtextTests { tester = new ValidatorTester(validator, getInjector()); } - public void testError() { + @Test public void testError() { tester.validator().someError(EcoreFactory.eINSTANCE.createEAnnotation()); tester.diagnose().assertError("101", "someError"); } - public void testError2() { + @Test public void testError2() { tester.validate(EcoreFactory.eINSTANCE.createEAnnotation()).assertError("101", "someError"); } - public void testError2Fail() { + @Test public void testError2Fail() { boolean caught = false; try { tester.validate(EcoreFactory.eINSTANCE.createEAnnotation()).assertError("234242"); @@ -85,12 +86,12 @@ public class ValidatorTesterTest extends AbstractXtextTests { assertTrue(caught); } - public void testTwoErrors() { + @Test public void testTwoErrors() { tester.validator().manyMessages(EcorePackage.eINSTANCE.getEClass()); tester.diagnose().assertAll(warning("105", "WarningOne"), error("104", "ErrorTwo"), error("103", "ErrorOne")); } - public void testFail() { + @Test public void testFail() { tester.validator().someError(EcoreFactory.eINSTANCE.createEAnnotation()); boolean caught = false; try { @@ -102,7 +103,7 @@ public class ValidatorTesterTest extends AbstractXtextTests { assertTrue(caught); } - public void testWarning() { + @Test public void testWarning() { tester.validator().someWarning(EcorePackage.eINSTANCE.getEClass()); tester.diagnose().assertWarning("102", "someWarning"); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java index c9f4c5d21..7ee59ea66 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/Bug250313Test.java @@ -10,16 +10,17 @@ package org.eclipse.xtext.valueconverter; import java.io.InputStream; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.conversion.ValueConverterException; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.parser.ParserTestHelper; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.valueconverter.Bug250313RuntimeModule.Converters; +import org.eclipse.xtext.valueconverter.bug250313.Model; +import org.junit.Test; import com.google.common.collect.Iterables; import com.google.inject.Binder; @@ -36,7 +37,7 @@ public class Bug250313Test extends AbstractXtextTests { private String string; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new Bug250313StandaloneSetup() { @Override @@ -48,7 +49,7 @@ public class Bug250313Test extends AbstractXtextTests { } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { string = null; node = null; lexerRule = null; @@ -113,9 +114,9 @@ public class Bug250313Test extends AbstractXtextTests { return helper.getResourceFromStream(in); } - public void testSTRINGConversion_01() throws Exception { - EObject model = getModel("1 'str'"); - assertWithXtend("'str'", "this.value", model); + @Test public void testSTRINGConversion_01() throws Exception { + Model model = (Model) getModel("1 'str'"); + assertEquals("str", model.getValue()); assertNotNull(lexerRule); assertEquals("STRING", lexerRule); assertTrue(node instanceof ILeafNode); @@ -123,27 +124,27 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testSTRINGConversion_02() throws Exception { - EObject model = getModel("'str'"); - assertWithXtend("'str'", "this.value", model); + @Test public void testSTRINGConversion_02() throws Exception { + Model model = (Model) getModel("'str'"); + assertEquals("str", model.getValue()); assertEquals("STRING", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("'str'", string); assertEquals(1, convertCallCount); } - public void testSTRINGConversion_03() throws Exception { - EObject model = getModel("2 'str'"); - assertWithXtend("'str'", "this.value", model); + @Test public void testSTRINGConversion_03() throws Exception { + Model model = (Model) getModel("2 'str'"); + assertEquals("str", model.getValue()); assertEquals("STRING", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("'str'", string); assertEquals(1, convertCallCount); } - public void testSTRINGConversion_04() throws Exception { - EObject model = getModel("1+ 'str'"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testSTRINGConversion_04() throws Exception { + Model model = (Model) getModel("1+ 'str'"); + assertEquals("[str]", model.getMultiValue().toString()); assertNotNull(lexerRule); assertEquals("STRING", lexerRule); assertTrue(node instanceof ILeafNode); @@ -151,72 +152,72 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testSTRINGConversion_05() throws Exception { - EObject model = getModel("2+ 'str'"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testSTRINGConversion_05() throws Exception { + Model model = (Model) getModel("2+ 'str'"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("STRING", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("'str'", string); assertEquals(1, convertCallCount); } - public void testIDConversion_01() throws Exception { - EObject model = getModel("1 str"); - assertWithXtend("'str'", "this.value", model); + @Test public void testIDConversion_01() throws Exception { + Model model = (Model) getModel("1 str"); + assertEquals("str", model.getValue()); assertEquals("ID", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("str", string); assertEquals(1, convertCallCount); } - public void testIDConversion_02() throws Exception { - EObject model = getModel("1 ^str"); - assertWithXtend("'str'", "this.value", model); + @Test public void testIDConversion_02() throws Exception { + Model model = (Model) getModel("1 ^str"); + assertEquals("str", model.getValue()); assertEquals("ID", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("^str", string); assertEquals(1, convertCallCount); } - public void testIDConversion_03() throws Exception { - EObject model = getModel("str"); - assertWithXtend("'str'", "this.value", model); + @Test public void testIDConversion_03() throws Exception { + Model model = (Model) getModel("str"); + assertEquals("str", model.getValue()); assertEquals("ID", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("str", string); assertEquals(1, convertCallCount); } - public void testIDConversion_04() throws Exception { - EObject model = getModel("^str"); - assertWithXtend("'str'", "this.value", model); + @Test public void testIDConversion_04() throws Exception { + Model model = (Model) getModel("^str"); + assertEquals("str", model.getValue()); assertEquals("ID", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("^str", string); assertEquals(1, convertCallCount); } - public void testIDConversion_05() throws Exception { - EObject model = getModel("1+ str"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testIDConversion_05() throws Exception { + Model model = (Model) getModel("1+ str"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("ID", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("str", string); assertEquals(1, convertCallCount); } - public void testIDConversion_06() throws Exception { - EObject model = getModel("1+ ^str"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testIDConversion_06() throws Exception { + Model model = (Model) getModel("1+ ^str"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("ID", lexerRule); assertTrue(node instanceof ILeafNode); assertEquals("^str", string); assertEquals(1, convertCallCount); } - public void testDatatypeConversion_01() throws Exception { - EObject model = getModel("1 foo - bar"); - assertWithXtend("'str'", "this.value", model); + @Test public void testDatatypeConversion_01() throws Exception { + Model model = (Model) getModel("1 foo - bar"); + assertEquals("str", model.getValue()); assertEquals("Datatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(6, Iterables.size(((ICompositeNode)node).getChildren())); @@ -224,9 +225,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testDatatypeConversion_02() throws Exception { - EObject model = getModel("foo - bar"); - assertWithXtend("'str'", "this.value", model); + @Test public void testDatatypeConversion_02() throws Exception { + Model model = (Model) getModel("foo - bar"); + assertEquals("str", model.getValue()); assertEquals("Datatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(5, Iterables.size(((ICompositeNode)node).getChildren())); @@ -234,9 +235,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testDatatypeConversion_03() throws Exception { - EObject model = getModel("3 foo - bar"); - assertWithXtend("'str'", "this.value", model); + @Test public void testDatatypeConversion_03() throws Exception { + Model model = (Model) getModel("3 foo - bar"); + assertEquals("str", model.getValue()); assertEquals("Datatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(6, Iterables.size(((ICompositeNode)node).getChildren())); @@ -244,9 +245,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testDatatypeConversion_04() throws Exception { - EObject model = getModel("1+ foo - bar"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testDatatypeConversion_04() throws Exception { + Model model = (Model) getModel("1+ foo - bar"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("Datatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(6, Iterables.size(((ICompositeNode)node).getChildren())); @@ -254,9 +255,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testDatatypeConversion_05() throws Exception { - EObject model = getModel("3+ foo - bar"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testDatatypeConversion_05() throws Exception { + Model model = (Model) getModel("3+ foo - bar"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("Datatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(6, Iterables.size(((ICompositeNode)node).getChildren())); @@ -264,9 +265,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_01() throws Exception { - EObject model = getModel("1 zonk + foo - bar"); - assertWithXtend("'str'", "this.value", model); + @Test public void testNestedDatatypeConversion_01() throws Exception { + Model model = (Model) getModel("1 zonk + foo - bar"); + assertEquals("str", model.getValue()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(5, Iterables.size(((ICompositeNode)node).getChildren())); @@ -274,9 +275,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_02() throws Exception { - EObject model = getModel("1 zonk +"); - assertWithXtend("'str'", "this.value", model); + @Test public void testNestedDatatypeConversion_02() throws Exception { + Model model = (Model) getModel("1 zonk +"); + assertEquals("str", model.getValue()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(4, Iterables.size(((ICompositeNode)node).getChildren())); @@ -284,9 +285,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_03() throws Exception { - EObject model = getModel("zonk + foo - bar"); - assertWithXtend("'str'", "this.value", model); + @Test public void testNestedDatatypeConversion_03() throws Exception { + Model model = (Model) getModel("zonk + foo - bar"); + assertEquals("str", model.getValue()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(4, Iterables.size(((ICompositeNode)node).getChildren())); @@ -294,9 +295,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_04() throws Exception { - EObject model = getModel("zonk +"); - assertWithXtend("'str'", "this.value", model); + @Test public void testNestedDatatypeConversion_04() throws Exception { + Model model = (Model) getModel("zonk +"); + assertEquals("str", model.getValue()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(3, Iterables.size(((ICompositeNode)node).getChildren())); @@ -304,9 +305,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_05() throws Exception { - EObject model = getModel("4 zonk + foo - bar"); - assertWithXtend("'str'", "this.value", model); + @Test public void testNestedDatatypeConversion_05() throws Exception { + Model model = (Model) getModel("4 zonk + foo - bar"); + assertEquals("str", model.getValue()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(5, Iterables.size(((ICompositeNode)node).getChildren())); @@ -314,9 +315,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_06() throws Exception { - EObject model = getModel("4 zonk +"); - assertWithXtend("'str'", "this.value", model); + @Test public void testNestedDatatypeConversion_06() throws Exception { + Model model = (Model) getModel("4 zonk +"); + assertEquals("str", model.getValue()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(4, Iterables.size(((ICompositeNode)node).getChildren())); @@ -324,9 +325,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_07() throws Exception { - EObject model = getModel("1+ zonk + foo - bar"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testNestedDatatypeConversion_07() throws Exception { + Model model = (Model) getModel("1+ zonk + foo - bar"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(5, Iterables.size(((ICompositeNode)node).getChildren())); @@ -334,9 +335,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_08() throws Exception { - EObject model = getModel("1+ zonk +"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testNestedDatatypeConversion_08() throws Exception { + Model model = (Model) getModel("1+ zonk +"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(4, Iterables.size(((ICompositeNode)node).getChildren())); @@ -344,9 +345,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_09() throws Exception { - EObject model = getModel("4+ zonk + foo - bar"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testNestedDatatypeConversion_09() throws Exception { + Model model = (Model) getModel("4+ zonk + foo - bar"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(5, Iterables.size(((ICompositeNode)node).getChildren())); @@ -354,9 +355,9 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testNestedDatatypeConversion_10() throws Exception { - EObject model = getModel("4+ zonk +"); - assertWithXtend("{'str'}", "this.multiValue", model); + @Test public void testNestedDatatypeConversion_10() throws Exception { + Model model = (Model) getModel("4+ zonk +"); + assertEquals("[str]", model.getMultiValue().toString()); assertEquals("NestedDatatype", lexerRule); assertTrue(node instanceof ICompositeNode); assertEquals(4, Iterables.size(((ICompositeNode)node).getChildren())); @@ -364,43 +365,39 @@ public class Bug250313Test extends AbstractXtextTests { assertEquals(1, convertCallCount); } - public void testKeywordConversion_01() throws Exception { - EObject model = getModel("1 mykeyword1"); - assertWithXtend("'mykeyword1'", "this.value", model); + @Test public void testKeywordConversion_01() throws Exception { + Model model = (Model) getModel("1 mykeyword1"); + assertEquals("mykeyword1", model.getValue()); // XXX value converter is not called for keywords? // if this is a bug, all assertions 'assertEquals(1, convertCallCount)' have to be increased assertEquals(lexerRule, 0, convertCallCount); } - public void testKeywordConversion_02() throws Exception { - EObject model = getModel("mykeyword1"); - assertWithXtend("'mykeyword1'", "this.value", model); + @Test public void testKeywordConversion_02() throws Exception { + Model model = (Model) getModel("mykeyword1"); + assertEquals("mykeyword1", model.getValue()); assertEquals(lexerRule, 0, convertCallCount); } - public void testKeywordConversion_03() throws Exception { - EObject model = getModel("1+ mykeyword1"); - assertWithXtend("{'mykeyword1'}", "this.multiValue", model); + @Test public void testKeywordConversion_03() throws Exception { + Model model = (Model) getModel("1+ mykeyword1"); + assertEquals("[mykeyword1]", model.getMultiValue().toString()); // XXX value converter is not called for keywords? // if this is a bug, all assertions 'assertEquals(1, convertCallCount)' have to be increased assertEquals(lexerRule, 0, convertCallCount); } - public void testChild1_01() throws Exception { + @Test public void testChild1_01() throws Exception { // tests only, if crossrefs in alternatives work - EObject model = getModel("content str ref 'str'"); - assertWithXtend("org::eclipse::xtext::valueconverter::bug250313::impl::Child1Impl", "this.ref.metaType", model); - assertWithXtend("org::eclipse::xtext::valueconverter::bug250313::impl::Child1Impl", "this.children.metaType", model); - assertWithXtend("'str'", "this.ref.name", model); + Model model = (Model) getModel("content str ref 'str'"); + assertEquals("str", model.getRef().getName()); assertEquals(lexerRule, 3, convertCallCount); } - public void testChild2_01() throws Exception { + @Test public void testChild2_01() throws Exception { // tests only, if crossrefs in alternatives work - EObject model = getModel("content 'str' ref str"); - assertWithXtend("org::eclipse::xtext::valueconverter::bug250313::impl::Child2Impl", "this.ref.metaType", model); - assertWithXtend("org::eclipse::xtext::valueconverter::bug250313::impl::Child2Impl", "this.children.metaType", model); - assertWithXtend("'str'", "this.ref.name", model); + Model model = (Model) getModel("content 'str' ref str"); + assertEquals("str", model.getRef().getName()); assertEquals(lexerRule, 3, convertCallCount); } } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java index fc8333b0d..947b4e644 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IDValueConverterTest.java @@ -11,7 +11,8 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.conversion.impl.IDValueConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API @@ -22,28 +23,28 @@ public class IDValueConverterTest extends AbstractXtextTests { private IDValueConverter idConverter; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); idConverter = get(IDValueConverter.class); idConverter.setRule(GrammarUtil.findRuleForName(getGrammarAccess().getGrammar(), "ID")); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String s = "abc"; String value = idConverter.toValue(s, null); assertEquals("abc", value); assertEquals(s, idConverter.toString(value)); } - public void testEscaped() throws Exception { + @Test public void testEscaped() throws Exception { String s = "grammar"; String value = idConverter.toString(s); assertEquals("^grammar", value); assertEquals(s, idConverter.toValue(value, null)); } - public void testNull() throws Exception { + @Test public void testNull() throws Exception { try { idConverter.toString(null); fail("Null value not detected."); @@ -53,7 +54,7 @@ public class IDValueConverterTest extends AbstractXtextTests { } } - public void testEmpty() throws Exception { + @Test public void testEmpty() throws Exception { try { idConverter.toString(""); fail("Empty value not detected."); @@ -63,7 +64,7 @@ public class IDValueConverterTest extends AbstractXtextTests { } } - public void testInvalidChar1() throws Exception { + @Test public void testInvalidChar1() throws Exception { try { idConverter.toString("^foo"); fail("invalid char not detected.."); @@ -73,7 +74,7 @@ public class IDValueConverterTest extends AbstractXtextTests { } } - public void testInvalidChar2() throws Exception { + @Test public void testInvalidChar2() throws Exception { try { idConverter.toString("foo%bar[]"); fail("Empty value not detected."); @@ -83,7 +84,7 @@ public class IDValueConverterTest extends AbstractXtextTests { } } - public void testInvalidChar3() throws Exception { + @Test public void testInvalidChar3() throws Exception { try { idConverter.toString("0foo"); fail("Empty value not detected."); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java index 7c50d0159..a127a9ef7 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/INTValueConverterTest.java @@ -11,7 +11,8 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.conversion.impl.INTValueConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,28 +22,28 @@ public class INTValueConverterTest extends AbstractXtextTests { private INTValueConverter valueConverter; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); valueConverter = get(INTValueConverter.class); valueConverter.setRule(GrammarUtil.findRuleForName(getGrammarAccess().getGrammar(), "INT")); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String s = "42"; Integer value = valueConverter.toValue(s, null); assertEquals(new Integer(42), value); assertEquals(s, valueConverter.toString(value)); } - public void testZero() throws Exception { + @Test public void testZero() throws Exception { String s = "0"; Integer value = valueConverter.toValue(s, null); assertEquals(new Integer(0), value); assertEquals(s, valueConverter.toString(value)); } - public void testNegative() throws Exception { + @Test public void testNegative() throws Exception { try { valueConverter.toString(-42); fail("Negative value not detected."); @@ -52,7 +53,7 @@ public class INTValueConverterTest extends AbstractXtextTests { } } - public void testNull() throws Exception { + @Test public void testNull() throws Exception { try { valueConverter.toString(null); fail("Negative value not detected."); @@ -62,7 +63,7 @@ public class INTValueConverterTest extends AbstractXtextTests { } } - public void testLargeInteger() throws Exception { + @Test public void testLargeInteger() throws Exception { String valueAsString = Integer.toString(Integer.MAX_VALUE) + "42"; try { valueConverter.toValue(valueAsString, null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java index e446bfa9f..91f64d55c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/IgnoreCaseIDValueConverterTest.java @@ -11,7 +11,8 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.conversion.impl.IgnoreCaseIDValueConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,35 +22,35 @@ public class IgnoreCaseIDValueConverterTest extends AbstractXtextTests { private IgnoreCaseIDValueConverter idConverter; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); idConverter = get(IgnoreCaseIDValueConverter.class); idConverter.setRule(GrammarUtil.findRuleForName(getGrammarAccess().getGrammar(), "ID")); } - public void testSimple() throws Exception { + @Test public void testSimple() throws Exception { String s = "abc"; String value = idConverter.toValue(s, null); assertEquals("abc", value); assertEquals(s, idConverter.toString(value)); } - public void testEscaped_01() throws Exception { + @Test public void testEscaped_01() throws Exception { String s = "grammar"; String value = idConverter.toString(s); assertEquals("^grammar", value); assertEquals(s, idConverter.toValue(value, null)); } - public void testEscaped_02() throws Exception { + @Test public void testEscaped_02() throws Exception { String s = "GRAMMAR"; String value = idConverter.toString(s); assertEquals("^GRAMMAR", value); assertEquals(s, idConverter.toValue(value, null)); } - public void testNull() throws Exception { + @Test public void testNull() throws Exception { try { idConverter.toString(null); fail("Null value not detected."); @@ -59,7 +60,7 @@ public class IgnoreCaseIDValueConverterTest extends AbstractXtextTests { } } - public void testEmpty() throws Exception { + @Test public void testEmpty() throws Exception { try { idConverter.toString(""); fail("Empty value not detected."); @@ -69,7 +70,7 @@ public class IgnoreCaseIDValueConverterTest extends AbstractXtextTests { } } - public void testInvalidChar1() throws Exception { + @Test public void testInvalidChar1() throws Exception { try { idConverter.toString("^foo"); fail("invalid char not detected.."); @@ -79,7 +80,7 @@ public class IgnoreCaseIDValueConverterTest extends AbstractXtextTests { } } - public void testInvalidChar2() throws Exception { + @Test public void testInvalidChar2() throws Exception { try { idConverter.toString("foo%bar[]"); fail("Empty value not detected."); @@ -89,7 +90,7 @@ public class IgnoreCaseIDValueConverterTest extends AbstractXtextTests { } } - public void testInvalidChar3() throws Exception { + @Test public void testInvalidChar3() throws Exception { try { idConverter.toString("0foo"); fail("Empty value not detected."); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java index 1fc29fa31..1e018fe49 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/QualifiedNameValueConverterTest.java @@ -8,10 +8,11 @@ package org.eclipse.xtext.valueconverter; import org.eclipse.xtext.conversion.impl.QualifiedNameValueConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.valueconverter.qualifiedName.Element; import org.eclipse.xtext.valueconverter.qualifiedName.QualifiedNameFactory; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -22,12 +23,12 @@ public class QualifiedNameValueConverterTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(QualifiedNameTestLanguageStandaloneSetup.class); } - public void testQualifiedNameValueConverter() throws Exception { + @Test public void testQualifiedNameValueConverter() throws Exception { checkBothDirections("keywrd", "keywrd"); checkBothDirections("nokeyword", "nokeyword"); checkBothDirections("^keyword.nokeyword", "keyword.nokeyword"); @@ -56,7 +57,7 @@ public class QualifiedNameValueConverterTest extends AbstractXtextTests { assertEquals(nameAsValue, element.getQualifiedName()); } - public void testBug367949() throws Exception { + @Test public void testBug367949() throws Exception { assertEquals("org.eclipse.create", get(QualifiedNameValueConverter.class).toValue("org.eclipse.^create", null)); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java index 4693f5a28..dc0273a36 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/valueconverter/STRINGConverterTest.java @@ -11,7 +11,8 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.conversion.impl.STRINGValueConverter; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,40 +22,40 @@ public class STRINGConverterTest extends AbstractXtextTests { private STRINGValueConverter valueConverter; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); valueConverter = get(STRINGValueConverter.class); valueConverter.setRule(GrammarUtil.findRuleForName(getGrammarAccess().getGrammar(), "STRING")); } - public void testEscapeChars() throws Exception { + @Test public void testEscapeChars() throws Exception { String s = "\"\\t\\n\\r\\f\\b\""; String value = valueConverter.toValue(s, null); assertEquals("\t\n\r\f\b", value); assertEquals(s, valueConverter.toString(value)); } - public void testUnicode() throws Exception { + @Test public void testUnicode() throws Exception { String legalString = "\"\\\\u0000\""; String value = valueConverter.toValue(legalString, null); assertEquals("\\u0000", value); assertEquals(legalString, valueConverter.toString(value)); } - public void testUnicode_01() throws Exception { + @Test public void testUnicode_01() throws Exception { String value = valueConverter.toValue("\"\\u0001\"", null); assertEquals("\u0001", value); assertEquals("\"\u0001\"", valueConverter.toString(value)); } - public void testUnicode_02() throws Exception { + @Test public void testUnicode_02() throws Exception { String value = "\u1234"; String string = valueConverter.toString(value); assertEquals(value, valueConverter.toValue(string, null)); } - public void testUnicodeSequenceLength() throws Exception { + @Test public void testUnicodeSequenceLength() throws Exception { try { valueConverter.toValue("'\\u123'", null); fail("Illegal short unicode sequence not detected"); @@ -64,11 +65,11 @@ public class STRINGConverterTest extends AbstractXtextTests { assertEquals("\u1234", valueConverter.toValue("'\\u1234'", null)); } - public void testEmpty() throws Exception { + @Test public void testEmpty() throws Exception { assertEquals("\"\"", valueConverter.toString("")); } - public void testNull() throws Exception { + @Test public void testNull() throws Exception { try { valueConverter.toString(null); fail("Null value not detected."); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java index a94ee5ce0..6ed3ecc10 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/AbstractXtextInspectorTest.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.Triple; import org.eclipse.xtext.util.Tuples; @@ -31,7 +31,7 @@ public abstract class AbstractXtextInspectorTest extends AbstractXtextTests impl protected List> infos; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); warnings = Lists.newArrayList(); @@ -40,7 +40,7 @@ public abstract class AbstractXtextInspectorTest extends AbstractXtextTests impl } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { infos = null; warnings = null; errors = null; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java index 712a8ea95..81d62b7d6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug285605Test.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.xtext; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.validation.AbstractValidationMessageAcceptingTestCase; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,12 +18,12 @@ import org.eclipse.xtext.validation.AbstractValidationMessageAcceptingTestCase; public class Bug285605Test extends AbstractValidationMessageAcceptingTestCase { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testBug285605() throws Exception { + @Test public void testBug285605() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java index 4f67a25d9..339c9a46e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/Bug290919Test.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.xtext; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.validation.AbstractValidationMessageAcceptingTestCase; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -17,12 +18,12 @@ import org.eclipse.xtext.validation.AbstractValidationMessageAcceptingTestCase; public class Bug290919Test extends AbstractValidationMessageAcceptingTestCase { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testBug2900919() throws Exception { + @Test public void testBug2900919() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java index 50e7082c4..8a7d638e0 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ExceptionTest.java @@ -10,7 +10,8 @@ package org.eclipse.xtext.xtext; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.diagnostics.ExceptionDiagnostic; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -20,12 +21,12 @@ import com.google.common.collect.Iterables; public class ExceptionTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testNoStackOverflow() throws Exception { + @Test public void testNoStackOverflow() throws Exception { String model = "grammar test with org.eclipse.xtext.common.Terminals\n" + "import 'http://www.eclipse.org/2008/Xtext' as xtext\n" + "generate test 'http://eclipse.org/xtext/tests/SimpleTest'\n" + @@ -38,7 +39,7 @@ public class ExceptionTest extends AbstractXtextTests { assertEquals(r.getErrors().toString(), 1, r.getErrors().size()); } - public void testGeneratedMetamodelWithoutURI() throws Exception { + @Test public void testGeneratedMetamodelWithoutURI() throws Exception { String model = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test \n" + @@ -49,7 +50,7 @@ public class ExceptionTest extends AbstractXtextTests { assertNoException(model, 3); } - public void testFirstAssignmentWithoutLeftSide() throws Exception { + @Test public void testFirstAssignmentWithoutLeftSide() throws Exception { String model = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test \"test\"\n" + @@ -57,7 +58,7 @@ public class ExceptionTest extends AbstractXtextTests { assertNoException(model, 1); } - public void testBug_270773() throws Exception { + @Test public void testBug_270773() throws Exception { String model = "grammar test with org.eclipse.xtext.common.Terminals\n" + "import \"http://www.eclipse.org/emf/2002/Ecore\" as ecore\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java index 816653ea4..f0fce2b86 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/KeywordInspectorTest.java @@ -15,6 +15,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; +import org.junit.Test; import com.google.common.collect.Iterators; @@ -47,7 +48,7 @@ public class KeywordInspectorTest extends AbstractXtextInspectorTest { inspector.inspectKeywordHidesTerminalRule(keywords.next()); } - public void testBug285146_01() throws Exception { + @Test public void testBug285146_01() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl7 with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "Type : 'type' '#' name=ID;\n" + @@ -58,7 +59,7 @@ public class KeywordInspectorTest extends AbstractXtextInspectorTest { assertEquals(errors.toString(), 1, errors.size()); } - public void testBug285146_02() throws Exception { + @Test public void testBug285146_02() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl7 with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "Type : 'type' '#' name=ID;\n" + @@ -69,7 +70,7 @@ public class KeywordInspectorTest extends AbstractXtextInspectorTest { assertEquals(errors.toString(), 0, errors.size()); } - public void testBug285146_03() throws Exception { + @Test public void testBug285146_03() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl7 with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "Type : 'type' '#' name=ID;\n" + @@ -80,7 +81,7 @@ public class KeywordInspectorTest extends AbstractXtextInspectorTest { assertEquals(errors.toString(), 1, errors.size()); } - public void testBug285146_04() throws Exception { + @Test public void testBug285146_04() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl7 with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "Type : 'type' '#' name=ID;\n" + @@ -91,7 +92,7 @@ public class KeywordInspectorTest extends AbstractXtextInspectorTest { assertEquals(errors.toString(), 0, errors.size()); } - public void testIgnoreTerminalRules() throws Exception { + @Test public void testIgnoreTerminalRules() throws Exception { String grammarAsString = "grammar org.xtext.example.MyDsl7 with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://www.xtext.org/example/MyDsl\"\n" + "Type : 'type' '#' name=ID;\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.java index af81e2f00..7c13dd6a9 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/OverriddenValueInspectorTest.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.xtext; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,7 +22,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest return new OverriddenValueInspector(this); } - public void testBug280011_01() throws Exception { + @Test public void testBug280011_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Q : 'x' a = ID | 'y' a = ID ;"; @@ -31,7 +32,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug280011_02() throws Exception { + @Test public void testBug280011_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Q : 'x' a = ID 'y' b = ID ;"; @@ -41,7 +42,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug280011_03() throws Exception { + @Test public void testBug280011_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Q : 'x' a = ID 'y' a = ID ;"; @@ -51,7 +52,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testBug280011_04() throws Exception { + @Test public void testBug280011_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Q : 'x' (a = ID)+;"; @@ -61,7 +62,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 1, warnings.size()); } - public void testAssignedAction_01() throws Exception { + @Test public void testAssignedAction_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second {First.second=current} second=Second;\n" + @@ -72,7 +73,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testAssignedAction_02() throws Exception { + @Test public void testAssignedAction_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second ({First.second=current} name=ID)*;\n" + @@ -83,7 +84,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignedAction_03() throws Exception { + @Test public void testAssignedAction_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second {First.second=current} name=ID;\n" + @@ -94,7 +95,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignedAction_04() throws Exception { + @Test public void testAssignedAction_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second {First.second+=current} second+=Second;\n" + @@ -105,7 +106,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnassignedRule_01() throws Exception { + @Test public void testUnassignedRule_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second name+=ID;\n" + @@ -116,7 +117,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnassignedRule_02() throws Exception { + @Test public void testUnassignedRule_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second name=ID;\n" + @@ -127,7 +128,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnassignedRule_03() throws Exception { + @Test public void testUnassignedRule_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second (name=ID)?;\n" + @@ -138,7 +139,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnassignedRule_04() throws Exception { + @Test public void testUnassignedRule_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second (name=ID)? id=INT;\n" + @@ -149,7 +150,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 4, warnings.size()); } - public void testAlternative_01() throws Exception { + @Test public void testAlternative_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second | name=ID;\n" + @@ -160,7 +161,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAlternative_02() throws Exception { + @Test public void testAlternative_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : (Second | multiName+=ID) multiName+=ID id=INT;\n" + @@ -171,7 +172,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testAlternative_03() throws Exception { + @Test public void testAlternative_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : (Second | multiName+=ID | id=INT) multiName+=ID id=INT;\n" + @@ -182,7 +183,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 3, warnings.size()); } - public void testAlternative_04() throws Exception { + @Test public void testAlternative_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : (Second | multiName+=ID | id=INT) multiName+=ID;\n" + @@ -193,7 +194,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testOptionalAction_01() throws Exception { + @Test public void testOptionalAction_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second ({First.second=current} id=INT)? name=ID;\n" + @@ -204,7 +205,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testOptionalAction_02() throws Exception { + @Test public void testOptionalAction_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second ({First.second=current} id=INT)* name=ID;\n" + @@ -215,7 +216,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testOptionalAction_03() throws Exception { + @Test public void testOptionalAction_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second ({First.second=current} id=INT)+ name=ID;\n" + @@ -226,7 +227,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testOptionalAction_04() throws Exception { + @Test public void testOptionalAction_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First : Second (isSecond='keyword' | {First.second=current} id=INT) name=ID;\n" + @@ -237,7 +238,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testRuleCall_01() throws Exception { + @Test public void testRuleCall_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First returns Object: (Third|Second) cardinality=('+'|'*')?;\n" + @@ -249,7 +250,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testNoMarkerForCalledRules_01() throws Exception { + @Test public void testNoMarkerForCalledRules_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "First returns Object: Second;\n" + @@ -263,7 +264,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnorderedGroup_01() throws Exception { + @Test public void testUnorderedGroup_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : 'x' a = ID & 'y' b = ID ;"; @@ -273,7 +274,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_02() throws Exception { + @Test public void testUnorderedGroup_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : 'x' a = ID & 'y' a = ID ;"; @@ -283,7 +284,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnorderedGroup_03() throws Exception { + @Test public void testUnorderedGroup_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : (a = ID & b = STRING)+;"; @@ -293,7 +294,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnorderedGroup_04() throws Exception { + @Test public void testUnorderedGroup_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : ('x' a = ID & 'y' b = ID) a = ID;"; @@ -303,7 +304,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnorderedGroup_05() throws Exception { + @Test public void testUnorderedGroup_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : a = ID (a = ID & b = STRING) ;"; @@ -313,7 +314,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testUnorderedGroup_06() throws Exception { + @Test public void testUnorderedGroup_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : a = ID b = STRING & a = ID;"; @@ -323,7 +324,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testBug306281_01() throws Exception { + @Test public void testBug306281_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -335,7 +336,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug306281_02() throws Exception { + @Test public void testBug306281_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -347,7 +348,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testBug306281_03() throws Exception { + @Test public void testBug306281_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -359,7 +360,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug306281_04() throws Exception { + @Test public void testBug306281_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -371,7 +372,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testBug306281_05() throws Exception { + @Test public void testBug306281_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -383,7 +384,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug306281_06() throws Exception { + @Test public void testBug306281_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -395,7 +396,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug306281_07() throws Exception { + @Test public void testBug306281_07() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -407,7 +408,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testBug306281_08() throws Exception { + @Test public void testBug306281_08() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -419,7 +420,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug306281_09() throws Exception { + @Test public void testBug306281_09() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -431,7 +432,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertEquals(warnings.toString(), 2, warnings.size()); } - public void testBug306281_10() throws Exception { + @Test public void testBug306281_10() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model : name=ID (" + @@ -443,7 +444,7 @@ public class OverriddenValueInspectorTest extends AbstractXtextRuleInspectorTest assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug306281_11() throws Exception { + @Test public void testBug306281_11() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model returns Model: SubModel " + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java index 55077cf4d..943e00a88 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/PartialParserTest.java @@ -10,8 +10,9 @@ package org.eclipse.xtext.xtext; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Jan Koehnlein - Initial contribution and API @@ -19,20 +20,20 @@ import org.eclipse.xtext.resource.XtextResource; public class PartialParserTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); } - public void testEditGroupWithCardinality_01() throws Exception { + @Test public void testEditGroupWithCardinality_01() throws Exception { performTest("'bar'"); } - public void testEditGroupWithCardinality_02() throws Exception { + @Test public void testEditGroupWithCardinality_02() throws Exception { performTest("{Test}"); } - public void testEditGroupWithCardinality_03() throws Exception { + @Test public void testEditGroupWithCardinality_03() throws Exception { performTest("'bar' "); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java index 50cdd2041..f412f1380 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ResourceLoadTest.java @@ -7,18 +7,32 @@ *******************************************************************************/ package org.eclipse.xtext.xtext; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Collection; import java.util.Iterator; - -import junit.framework.TestResult; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.diagnostics.ExceptionDiagnostic; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.resource.XtextResource; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import com.google.common.collect.Lists; /** * Really long running smoke tests for the xtext grammar. Uses all test grammars. @@ -26,44 +40,88 @@ import org.eclipse.xtext.resource.XtextResource; * @author Sebastian Zarnekow - Initial contribution and API * @author Jan Koehnlein */ +@RunWith(value = Parameterized.class) public class ResourceLoadTest extends AbstractXtextTests { private String grammarPath; private String model; private static boolean FIRST_ONLY = true; - - @Override - public int countTestCases() { - return super.countTestCases() * getAllTestGrammarPaths(FIRST_ONLY).size(); + + public ResourceLoadTest(String grammarPath) { + this.grammarPath = grammarPath; } - @Override - public String getName() { - return super.getName() + (grammarPath != null ? (" [" + grammarPath + "]") : ""); + @Parameters + public static Collection data() { + List result = Lists.newArrayList(); + try { + String mweFile = staticReadFileIntoString("org/eclipse/xtext/GenerateAllTestLanguages.mwe2"); + Pattern pattern = Pattern.compile("uri\\s*=\\s*\"([^\"]*)\""); + Matcher matcher = pattern.matcher(mweFile); + while (matcher.find()) { + String grammarURI = matcher.group(1); + String grammarPath = grammarURI.replaceFirst("classpath:/", ""); + result.add(new Object[] { grammarPath }); + if(FIRST_ONLY) + break; + } + } catch (Exception exc) { + // ignore + } + return result; } + + protected static String staticReadFileIntoString(String filePath) throws IOException { + ClassLoader classLoader = ResourceLoadTest.class.getClassLoader(); + URL url = classLoader.getResource(filePath); + if (url == null) { + fail("Could not read resource: '" + filePath + "'. Is your file system case sensitive?"); + } else { + if(!new File(url.getPath()).getCanonicalPath().endsWith(filePath)) + throw new RuntimeException(filePath + ":\n" + + "The file does not exist exactly as it was named.\n" + + "The test is likely to cause trouble on the build server.\n" + + "Is your filesystem case insensitive? Please verify the spelling."); - @Override - public void run(TestResult result) { - for (String testGrammarPath : getAllTestGrammarPaths(FIRST_ONLY)) { + InputStream resourceAsStream = classLoader.getResourceAsStream(filePath); try { - model = null; - grammarPath = testGrammarPath; - model = readFileIntoString(testGrammarPath); - super.run(result); - } catch (Exception exc) { - result.addError(this, exc); + if (resourceAsStream == null) { + fail("Could not read resource: '" + filePath + "'. Is your file system case sensitive?"); + } else { + byte[] buffer = new byte[2048]; + int bytesRead = 0; + StringBuffer b = new StringBuffer(); + do { + bytesRead = resourceAsStream.read(buffer); + if (bytesRead != -1) + b.append(new String(buffer, 0, bytesRead)); + } while (bytesRead != -1); + String model = b.toString(); + return model; + } + } finally { + if (resourceAsStream != null) + resourceAsStream.close(); } } + throw new IllegalStateException("May not happen, but helps to suppress false positives in eclipse' control flow analysis."); } - + @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); + model = readFileIntoString(grammarPath); + } + + @Override + public void tearDown() throws Exception { + model = null; + super.tearDown(); } - public void testNoExceptionDiagnostics_01() throws Exception { + @Test public void testNoExceptionDiagnostics_01() throws Exception { for (int i = 0; i < model.length(); i++) { String model = this.model.substring(0, i); Resource r = getResourceFromStringAndExpect(model, UNKNOWN_EXPECTATION); @@ -71,7 +129,7 @@ public class ResourceLoadTest extends AbstractXtextTests { } } - public void testNoExceptionDiagnostics_02() throws Exception { + @Test public void testNoExceptionDiagnostics_02() throws Exception { for (int i = 0; i < model.length(); i++) { String model = this.model.substring(i); Resource r = getResourceFromStringAndExpect(model, UNKNOWN_EXPECTATION); @@ -79,7 +137,7 @@ public class ResourceLoadTest extends AbstractXtextTests { } } - public void testNoExceptionDiagnostics_03() throws Exception { + @Test public void testNoExceptionDiagnostics_03() throws Exception { for (int i = 0; i < model.length() - 1; i++) { String model = this.model.substring(0, i) + this.model.substring(i + 1); // System.out.println(model); @@ -88,7 +146,7 @@ public class ResourceLoadTest extends AbstractXtextTests { } } - public void testNoExceptionDiagnostics_04() throws Exception { + @Test public void testNoExceptionDiagnostics_04() throws Exception { XtextResource r = getResourceFromString(this.model); assertTrue(r.getErrors().isEmpty()); ICompositeNode node = r.getParseResult().getRootNode(); @@ -109,7 +167,7 @@ public class ResourceLoadTest extends AbstractXtextTests { } } - public void testDummy() { + @Test public void testDummy() { assertNotNull(model); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java index 559f6101e..920629e11 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/RuleWithoutInstantiationInspectorTest.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.xtext; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -21,7 +22,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp return new RuleWithoutInstantiationInspector(this); } - public void testDatatypes() throws Exception { + @Test public void testDatatypes() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -32,7 +33,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_01() throws Exception { + @Test public void testAssignment_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -43,7 +44,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_02() throws Exception { + @Test public void testAssignment_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -54,7 +55,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_03() throws Exception { + @Test public void testAssignment_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -67,7 +68,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(message, message.contains("{X}")); } - public void testAssignment_04() throws Exception { + @Test public void testAssignment_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample' as x\n" + "Model returns x::Model: x=X;\n" + @@ -80,7 +81,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(message, message.contains("{x::X}")); } - public void testAssignment_05() throws Exception { + @Test public void testAssignment_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -91,7 +92,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_06() throws Exception { + @Test public void testAssignment_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -104,7 +105,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(message, message.contains("{X}")); } - public void testIgnoreFirstRule_01() throws Exception { + @Test public void testIgnoreFirstRule_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x+='x')*;"; @@ -114,7 +115,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testIgnoreFirstRule_02() throws Exception { + @Test public void testIgnoreFirstRule_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'keyword' (x+='x')*;"; @@ -124,7 +125,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAction_01() throws Exception { + @Test public void testAction_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -135,7 +136,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAction_02() throws Exception { + @Test public void testAction_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -146,7 +147,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertEquals(warnings.toString(), 1, warnings.size()); } - public void testRuleCall_01() throws Exception { + @Test public void testRuleCall_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -158,7 +159,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testRuleCall_02() throws Exception { + @Test public void testRuleCall_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -170,7 +171,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertEquals(warnings.toString(), 1, warnings.size()); } - public void testRuleCall_03() throws Exception { + @Test public void testRuleCall_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -181,7 +182,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_01() throws Exception { + @Test public void testUnorderedGroup_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -192,7 +193,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_02() throws Exception { + @Test public void testUnorderedGroup_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -203,7 +204,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertEquals(warnings.toString(), 0, warnings.size()); } - public void testUnorderedGroup_03() throws Exception { + @Test public void testUnorderedGroup_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -214,7 +215,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_04() throws Exception { + @Test public void testUnorderedGroup_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -225,7 +226,7 @@ public class RuleWithoutInstantiationInspectorTest extends AbstractXtextRuleInsp assertEquals(warnings.toString(), 0, warnings.size()); } - public void testBug_287735_01() throws Exception { + @Test public void testBug_287735_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java index 18df396a4..28db8d207 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ValidEntryRuleInspectorTest.java @@ -11,6 +11,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.util.Pair; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -22,7 +23,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< return new ValidEntryRuleInspector(this); } - public void testDatatypes() throws Exception { + @Test public void testDatatypes() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X: 'x';\n"; @@ -32,7 +33,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_01() throws Exception { + @Test public void testAssignment_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X: x=ID;\n"; @@ -42,7 +43,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_02() throws Exception { + @Test public void testAssignment_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x+='x')+;"; @@ -52,7 +53,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_03() throws Exception { + @Test public void testAssignment_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x+='x')*;"; @@ -62,7 +63,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_05() throws Exception { + @Test public void testAssignment_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ID (x+='x')+;"; @@ -72,7 +73,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAssignment_06() throws Exception { + @Test public void testAssignment_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ID (x+='x')*;"; @@ -84,7 +85,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(message, message.contains("{X}")); } - public void testIgnoreSecondRule_01() throws Exception { + @Test public void testIgnoreSecondRule_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "Model: x=X;\n" + @@ -95,7 +96,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAction_01() throws Exception { + @Test public void testAction_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : {X} ID?;"; @@ -105,7 +106,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAction_02() throws Exception { + @Test public void testAction_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : {X} | ID;"; @@ -115,7 +116,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testAction_03() throws Exception { + @Test public void testAction_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : {X} | ID?;"; @@ -125,7 +126,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testAction_04() throws Exception { + @Test public void testAction_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : {X} | (ID name=ID)?;"; @@ -135,7 +136,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testRuleCall_01() throws Exception { + @Test public void testRuleCall_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : Y;\n" + @@ -146,7 +147,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testRuleCall_02() throws Exception { + @Test public void testRuleCall_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : Y | name=ID;\n" + @@ -157,7 +158,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testRuleCall_03() throws Exception { + @Test public void testRuleCall_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : INT (ID? {X} ID?);\n"; @@ -167,7 +168,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testGroup_01() throws Exception { + @Test public void testGroup_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' x=ID 'x';\n"; @@ -177,7 +178,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testGroup_02() throws Exception { + @Test public void testGroup_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' x=ID? 'x';\n"; @@ -187,7 +188,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testGroup_03() throws Exception { + @Test public void testGroup_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ('x' x=ID? 'x')?;\n"; @@ -197,7 +198,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testGroup_04() throws Exception { + @Test public void testGroup_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ('x' x=ID 'x')?;\n"; @@ -207,7 +208,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testGroup_05() throws Exception { + @Test public void testGroup_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' ('x' x=ID 'x')?;\n"; @@ -217,7 +218,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testGroup_06() throws Exception { + @Test public void testGroup_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x'? ('x' x=ID 'x')?;\n"; @@ -227,7 +228,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testGroup_07() throws Exception { + @Test public void testGroup_07() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' ('x' x=ID 'x')+;\n"; @@ -237,7 +238,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testGroup_08() throws Exception { + @Test public void testGroup_08() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x'? ('x' x=ID 'x')+;\n"; @@ -247,7 +248,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testGroup_09() throws Exception { + @Test public void testGroup_09() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ID? x+=ID*;\n"; @@ -257,7 +258,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testAlternatives_01() throws Exception { + @Test public void testAlternatives_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : x=ID | y=INT;\n"; @@ -267,7 +268,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAlternatives_02() throws Exception { + @Test public void testAlternatives_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x=ID | y=INT)?;\n"; @@ -277,7 +278,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAlternatives_03() throws Exception { + @Test public void testAlternatives_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : x=ID? | y=INT*;\n"; @@ -287,7 +288,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAlternatives_05() throws Exception { + @Test public void testAlternatives_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' (x=ID | y=INT);\n"; @@ -297,7 +298,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAlternatives_06() throws Exception { + @Test public void testAlternatives_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x=ID* | y=INT)?;\n"; @@ -307,7 +308,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testAlternatives_07() throws Exception { + @Test public void testAlternatives_07() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : x=ID? | 'x';\n"; @@ -317,7 +318,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testAlternatives_08() throws Exception { + @Test public void testAlternatives_08() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : x=ID? | 'x' {X};\n"; @@ -327,7 +328,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_01() throws Exception { + @Test public void testUnorderedGroup_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' & x=ID & 'x';\n"; @@ -337,7 +338,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_02() throws Exception { + @Test public void testUnorderedGroup_02() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' & x=ID? & 'x';\n"; @@ -347,7 +348,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_03() throws Exception { + @Test public void testUnorderedGroup_03() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ('x' & x=ID? & 'x')?;\n"; @@ -357,7 +358,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_04() throws Exception { + @Test public void testUnorderedGroup_04() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : ('x' & x=ID & 'x')?;\n"; @@ -367,7 +368,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_05() throws Exception { + @Test public void testUnorderedGroup_05() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' ('x' & x=ID & 'x')?;\n"; @@ -377,7 +378,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_06() throws Exception { + @Test public void testUnorderedGroup_06() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x'? ('x' & x=ID & 'x')?;\n"; @@ -387,7 +388,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_07() throws Exception { + @Test public void testUnorderedGroup_07() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' ('x' & x=ID & 'x')+;\n"; @@ -397,7 +398,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_08() throws Exception { + @Test public void testUnorderedGroup_08() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x'? ('x' & x=ID & 'x')+;\n"; @@ -407,7 +408,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_09() throws Exception { + @Test public void testUnorderedGroup_09() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : STRING? & x+=ID*;\n"; @@ -417,7 +418,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_10() throws Exception { + @Test public void testUnorderedGroup_10() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : x=ID & y=INT;\n"; @@ -427,7 +428,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_11() throws Exception { + @Test public void testUnorderedGroup_11() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x=ID & y=INT);\n"; @@ -437,7 +438,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_12() throws Exception { + @Test public void testUnorderedGroup_12() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x=ID? & y=INT*);\n"; @@ -447,7 +448,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_13() throws Exception { + @Test public void testUnorderedGroup_13() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' (x=ID & y=INT);\n"; @@ -457,7 +458,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_14() throws Exception { + @Test public void testUnorderedGroup_14() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : (x=ID* & y=INT)?;\n"; @@ -467,7 +468,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testUnorderedGroup_15() throws Exception { + @Test public void testUnorderedGroup_15() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : x=ID? & 'x';\n"; @@ -477,7 +478,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertEquals(warnings.toString(), 1, warnings.size()); } - public void testUnorderedGroup_16() throws Exception { + @Test public void testUnorderedGroup_16() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : {X} (x=ID? & 'x');\n"; @@ -487,7 +488,7 @@ public class ValidEntryRuleInspectorTest extends AbstractXtextRuleInspectorTest< assertTrue(warnings.toString(), warnings.isEmpty()); } - public void testBug_287735_01() throws Exception { + @Test public void testBug_287735_01() throws Exception { String grammarAsString = "grammar org.foo with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'foo.sample'\n" + "X : 'x' Y;\n"; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java index a01d3f424..0d77c2093 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java @@ -16,11 +16,12 @@ import org.eclipse.emf.ecore.resource.ContentHandler; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.services.XtextGrammarAccess; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -33,7 +34,7 @@ public class XtextGrammarSerializationTest extends AbstractXtextTests { with(XtextStandaloneSetup.class); } - public void testSimpleSerialization() throws Exception { + @Test public void testSimpleSerialization() throws Exception { final String model = "grammar foo with org.eclipse.xtext.common.Terminals\n" + "generate mm \"http://bar\" as fooMM\n" + "StartRule returns fooMM::T: name=ID;"; final String expectedModel = "grammar foo with org.eclipse.xtext.common.Terminals\n\ngenerate " @@ -52,7 +53,7 @@ public class XtextGrammarSerializationTest extends AbstractXtextTests { assertEquals(expectedModel, serializedModel); } - public void testMetamodelRefSerialization() throws Exception { + @Test public void testMetamodelRefSerialization() throws Exception { final String model = "grammar foo with org.eclipse.xtext.common.Terminals\n" + "import \"http://www.eclipse.org/2008/Xtext\" as xtext\n" + "generate mm \"http://bar\" as fooMM\n" + "Foo returns fooMM::Foo: name=ID (nameRefs+=NameRef)*;\n" diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.java index b0502d08c..416b682bb 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextLinkerTest.java @@ -12,8 +12,9 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.AbstractMetamodelDeclaration; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.resource.XtextResource; +import org.junit.Test; /** * @author Sven Efftinge - Initial contribution and API @@ -23,19 +24,19 @@ public class XtextLinkerTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new XtextStandaloneSetup()); } - public void testGeneratedPackageRemovedProperly() throws Exception { + @Test public void testGeneratedPackageRemovedProperly() throws Exception { String testGrammar = "grammar foo.Bar generate foo 'bar' Model : name=ID;"; checkPackageRemovalAfterGrammarChange(true, testGrammar, testGrammar.indexOf("name"), 4, "foo"); checkPackageRemovalAfterGrammarChange(true, testGrammar, testGrammar.indexOf("generate foo") + 11, 1, "x"); checkPackageRemovalAfterGrammarChange(true, testGrammar, testGrammar.indexOf("foo.Bar"), 1, "x"); } - public void testImportedPackageRemovedProperly() throws Exception { + @Test public void testImportedPackageRemovedProperly() throws Exception { String testGrammar = "grammar foo.Bar import 'classpath:/org/eclipse/xtext/xtext/Foo.ecore' as foo Model returns foo::Model: name=ID;"; // package import not influenced by parser rule change checkPackageRemovalAfterGrammarChange(false, testGrammar, testGrammar.indexOf("name"), 4, "foo"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java index 24fb8aadc..5b6cac513 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextResourceDescriptionTest.java @@ -11,12 +11,13 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.IResourceDescription; import org.eclipse.xtext.resource.IResourceDescription.Manager; import org.eclipse.xtext.util.StringInputStream; +import org.junit.Test; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -26,12 +27,12 @@ import com.google.common.collect.Lists; */ public class XtextResourceDescriptionTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(new XtextStandaloneSetup()); } - public void testComputeEObjectDescriptionsForEmptyFile() throws Exception { + @Test public void testComputeEObjectDescriptionsForEmptyFile() throws Exception { Resource res = getResourceAndExpect(new StringInputStream(""),URI.createURI("foo.xtext"),1); Manager manager = get(IResourceDescription.Manager.class); IResourceDescription description = manager.getResourceDescription(res); @@ -39,7 +40,7 @@ public class XtextResourceDescriptionTest extends AbstractXtextTests { assertTrue(Lists.newArrayList(iterable).isEmpty()); } - public void testComputeEObjectDescriptionsForUnnamedGrammar() throws Exception { + @Test public void testComputeEObjectDescriptionsForUnnamedGrammar() throws Exception { Resource res = getResourceAndExpect(new StringInputStream("grammar "),URI.createURI("foo.xtext"),1); Manager manager = get(IResourceDescription.Manager.class); IResourceDescription description = manager.getResourceDescription(res); @@ -47,7 +48,7 @@ public class XtextResourceDescriptionTest extends AbstractXtextTests { assertTrue(Lists.newArrayList(iterable).isEmpty()); } - public void testGetExportedEObjectsErroneousResource() throws Exception { + @Test public void testGetExportedEObjectsErroneousResource() throws Exception { Resource res = getResourceAndExpect(new StringInputStream("grammar foo Start : 'main';"),URI.createURI("foo.xtext"),1); Manager manager = get(IResourceDescription.Manager.class); IResourceDescription description = manager.getResourceDescription(res); @@ -55,7 +56,7 @@ public class XtextResourceDescriptionTest extends AbstractXtextTests { assertTrue(Lists.newArrayList(iterable).size()==2); } - public void testGetExportedEObjects() throws Exception { + @Test public void testGetExportedEObjects() throws Exception { Resource res = getResource(new StringInputStream("grammar foo generate x \"someURI\" Start : 'main';"),URI.createURI("foo.xtext")); Manager manager = get(IResourceDescription.Manager.class); IResourceDescription description = manager.getResourceDescription(res); @@ -63,7 +64,7 @@ public class XtextResourceDescriptionTest extends AbstractXtextTests { assertTrue(Lists.newArrayList(iterable).size()==3); } - public void testBug350695() throws Exception { + @Test public void testBug350695() throws Exception { Resource res = getResource(new StringInputStream("grammar org.foo.Zonk generate x \"someURI\" Start : 'main';"), URI.createURI("foo.xtext")); Manager manager = get(IResourceDescription.Manager.class); IResourceDescription description = manager.getResourceDescription(res); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java index e79ccedb2..fcfa7e055 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextScopingTest.java @@ -1 +1 @@ -/******************************************************************************* * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ package org.eclipse.xtext.xtext; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.Assignment; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.Group; import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.junit.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.ICrossReferenceSerializer; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.services.XtextGrammarAccess; /** * @author Sebastian Zarnekow - Initial contribution and API */ public class XtextScopingTest extends AbstractXtextTests { private Grammar grammar; @Override protected void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setClasspathURIContext(getClass().getClassLoader()); Resource resource = resourceSet.getResource( URI.createURI("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext"), true); grammar = (Grammar) resource.getContents().get(0); } @Override protected void tearDown() throws Exception { grammar = null; super.tearDown(); } public void testSetup() { assertNotNull(grammar); } public void testScope_01() { ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(grammar, "AbstractCallOverridenParserRule"); assertNotNull(rule); Group group = (Group) rule.getAlternatives(); Assignment ass = (Assignment) group.getElements().get(1); assertNotNull(ass); RuleCall call = (RuleCall) ass.getTerminal(); AbstractRule calledRule = call.getRule(); assertNotNull(calledRule); XtextGrammarAccess ga = (XtextGrammarAccess) get(IGrammarAccess.class); String text = get(ICrossReferenceSerializer.class).serializeCrossRef(call, ga.getRuleCallAccess().getRuleAbstractRuleCrossReference_0(), calledRule, null); assertNotNull(text); assertEquals(calledRule.getName(), text); } } \ No newline at end of file +/******************************************************************************* * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ package org.eclipse.xtext.xtext; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.Assignment; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.Group; import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.ICrossReferenceSerializer; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.services.XtextGrammarAccess; import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ public class XtextScopingTest extends AbstractXtextTests { private Grammar grammar; @Override public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); XtextResourceSet resourceSet = get(XtextResourceSet.class); resourceSet.setClasspathURIContext(getClass().getClassLoader()); Resource resource = resourceSet.getResource( URI.createURI("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext"), true); grammar = (Grammar) resource.getContents().get(0); } @Override public void tearDown() throws Exception { grammar = null; super.tearDown(); } @Test public void testSetup() { assertNotNull(grammar); } @Test public void testScope_01() { ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(grammar, "AbstractCallOverridenParserRule"); assertNotNull(rule); Group group = (Group) rule.getAlternatives(); Assignment ass = (Assignment) group.getElements().get(1); assertNotNull(ass); RuleCall call = (RuleCall) ass.getTerminal(); AbstractRule calledRule = call.getRule(); assertNotNull(calledRule); XtextGrammarAccess ga = (XtextGrammarAccess) get(IGrammarAccess.class); String text = get(ICrossReferenceSerializer.class).serializeCrossRef(call, ga.getRuleCallAccess().getRuleAbstractRuleCrossReference_0(), calledRule, null); assertNotNull(text); assertEquals(calledRule.getName(), text); } } \ No newline at end of file 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 217478bb2..08a064646 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 @@ -42,6 +42,7 @@ import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.validation.AbstractValidationMessageAcceptingTestCase; import org.eclipse.xtext.validation.AbstractValidationMessageAcceptor; +import org.junit.Test; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -56,7 +57,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC private String lastMessage; @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(XtextStandaloneSetup.class); EValidator.Registry.INSTANCE.put(EcorePackage.eINSTANCE, EcoreValidator.INSTANCE); @@ -65,7 +66,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC /** * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=348052 */ - public void testGrammarHasNoNamespace() throws Exception { + @Test public void testGrammarHasNoNamespace() throws Exception { XtextResource resource = getResourceFromString( "grammar Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -79,7 +80,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testRulenamesAreNotEqualIgnoreCase() throws Exception { + @Test public void testRulenamesAreNotEqualIgnoreCase() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -94,7 +95,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } -// public void testBug322875_01() throws Exception { +// @Test public void testBug322875_01() throws Exception { // String testGrammar = "grammar foo.Bar with org.eclipse.xtext.common.Terminals\n " + // " import 'classpath:/org/eclipse/xtext/xtext/XtextValidationTest.ecore' " + // " import 'http://www.eclipse.org/2008/Xtext' as xtext\n" + @@ -107,7 +108,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC // assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); // } -// public void testBug322875_02() throws Exception { +// @Test public void testBug322875_02() throws Exception { // String testGrammar = "grammar foo.Bar with org.eclipse.xtext.common.Terminals\n " + // " import 'platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore' " + // "Model returns EClass: name=ID;"; @@ -118,7 +119,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC // assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); // } - public void testBug322875_03() throws Exception { + @Test public void testBug322875_03() throws Exception { String testGrammar = "grammar foo.Bar with org.eclipse.xtext.common.Terminals\n " + " import 'http://www.eclipse.org/emf/2002/Ecore' " + "Model returns EClass: name=ID;"; @@ -128,7 +129,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals(diag.toString(), 0, diag.getChildren().size()); } -// public void testBug322875_04() throws Exception { +// @Test public void testBug322875_04() throws Exception { // String testGrammarOk = "grammar foo.Bar with org.eclipse.xtext.common.Terminals\n " + // " import 'http://www.eclipse.org/emf/2002/Ecore' " + // "Model returns EClass: name=ID;"; @@ -147,7 +148,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC // assertEquals("diag.isError", diagError.getSeverity(), Diagnostic.ERROR); // } - public void testBug_282852_01() throws Exception { + @Test public void testBug_282852_01() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -162,7 +163,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testBug_282852_02() throws Exception { + @Test public void testBug_282852_02() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -177,7 +178,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testBug_282852_03() throws Exception { + @Test public void testBug_282852_03() throws Exception { Grammar base = XtextFactory.eINSTANCE.createGrammar(); Grammar child = XtextFactory.eINSTANCE.createGrammar(); child.getUsedGrammars().add(base); @@ -194,7 +195,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertNull(lastMessage); } - public void testBug_282852_04() throws Exception { + @Test public void testBug_282852_04() throws Exception { Grammar base = XtextFactory.eINSTANCE.createGrammar(); Grammar child = XtextFactory.eINSTANCE.createGrammar(); child.getUsedGrammars().add(base); @@ -211,7 +212,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("A rule's name has to be unique even case insensitive. A used grammar contains another rule 'Foo'.", lastMessage); } - public void testBug_282852_05() throws Exception { + @Test public void testBug_282852_05() throws Exception { Grammar base = XtextFactory.eINSTANCE.createGrammar(); AbstractRule ruleFoo = XtextFactory.eINSTANCE.createParserRule(); ruleFoo.setName("Foo"); @@ -226,7 +227,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("A rule's name has to be unique even case insensitive. This grammar contains another rule 'Foo'.", lastMessage); } - public void testBug_282852_06() throws Exception { + @Test public void testBug_282852_06() throws Exception { Grammar base = XtextFactory.eINSTANCE.createGrammar(); AbstractRule ruleFoo = XtextFactory.eINSTANCE.createParserRule(); ruleFoo.setName("Foo"); @@ -241,7 +242,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("A rule's name has to be unique.", lastMessage); } - public void testBug_282852_07() throws Exception { + @Test public void testBug_282852_07() throws Exception { Grammar base = XtextFactory.eINSTANCE.createGrammar(); AbstractRule ruleFoo = XtextFactory.eINSTANCE.createParserRule(); ruleFoo.setName("Foo"); @@ -262,7 +263,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("A rule's name has to be unique even case insensitive. The conflicting rules are 'FOO' and 'Foo'.", lastMessage); } - public void testBug_282852_08() throws Exception { + @Test public void testBug_282852_08() throws Exception { Grammar base = XtextFactory.eINSTANCE.createGrammar(); AbstractRule ruleFoo = XtextFactory.eINSTANCE.createParserRule(); ruleFoo.setName("Foo"); @@ -283,7 +284,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("A rule's name has to be unique even case insensitive. The conflicting rules are 'FOO', 'Foo' and 'fOO'.", lastMessage); } - public void testBug_283534_01() throws Exception { + @Test public void testBug_283534_01() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -297,7 +298,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isOk", diag.getSeverity(), Diagnostic.OK); } - public void testBug_283534_02() throws Exception { + @Test public void testBug_283534_02() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -312,7 +313,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testBug_283534_03() throws Exception { + @Test public void testBug_283534_03() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -327,7 +328,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testBug_283534_04() throws Exception { + @Test public void testBug_283534_04() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -342,7 +343,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testBug_283534_05() throws Exception { + @Test public void testBug_283534_05() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate metamodel 'myURI'\n" + @@ -356,7 +357,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isOk", diag.getSeverity(), Diagnostic.OK); } - public void testBug_283534_06() throws Exception { + @Test public void testBug_283534_06() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "terminal TERMINAL: ID;\n"); @@ -369,7 +370,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isOk", diag.getSeverity(), Diagnostic.OK); } - public void testBug_283534_07() throws Exception { + @Test public void testBug_283534_07() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "Model: ID;\n"); @@ -382,7 +383,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isOk", diag.getSeverity(), Diagnostic.OK); } - public void testDuplicateEnumLiterals() throws Exception { + @Test public void testDuplicateEnumLiterals() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -398,7 +399,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testDefinedLiteralTwice() throws Exception { + @Test public void testDefinedLiteralTwice() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/validation/literal/2'\n" + @@ -413,7 +414,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isWarning", diag.getSeverity(), Diagnostic.WARNING); } - public void testEnumWithEmptyLiteralGenerated() throws Exception { + @Test public void testEnumWithEmptyLiteralGenerated() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2009/tmf/xtext/validation/literal/2'\n" + @@ -428,7 +429,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testEnumWithEmptyLiteralImported() throws Exception { + @Test public void testEnumWithEmptyLiteralImported() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -444,7 +445,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testEnumRuleReturnsEClass() throws Exception { + @Test public void testEnumRuleReturnsEClass() throws Exception { XtextResource resource = getResourceFromStringAndExpect( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate testLanguage 'http://www.eclipse.org/2011/xtext/bug348749'\n" + @@ -459,7 +460,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isOk", diag.getSeverity(), Diagnostic.OK); } - public void testBug_280413_01() throws Exception { + @Test public void testBug_280413_01() throws Exception { XtextResource resource = getResourceFromStringAndExpect( "grammar org.foo.Bar with org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.ecore' as mm\n" + @@ -476,7 +477,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertNotNull(metamodel); } - public void testBug_280413_02() throws Exception { + @Test public void testBug_280413_02() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.Xtext\n" + "import 'http://www.eclipse.org/2008/Xtext' as xtext\n" + @@ -491,7 +492,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC } //TODO this one should yield a warning, because two different instances of a package might be referenced. -// public void testBug_280413_03() throws Exception { +// @Test public void testBug_280413_03() throws Exception { // XtextResource resource = getResourceFromString( // "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + // "import 'classpath:/org/eclipse/xtext/Xtext.ecore' as xtext\n" + @@ -505,7 +506,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC // assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); // } - public void testBug_281660() throws Exception { + @Test public void testBug_281660() throws Exception { XtextResource resource = getResourceFromStringAndExpect( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -520,7 +521,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); } - public void testLeftRecursion_Bug_285605_01() throws Exception { + @Test public void testLeftRecursion_Bug_285605_01() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -534,7 +535,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_02() throws Exception { + @Test public void testLeftRecursion_Bug_285605_02() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -549,7 +550,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_03() throws Exception { + @Test public void testLeftRecursion_Bug_285605_03() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -565,7 +566,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_04() throws Exception { + @Test public void testLeftRecursion_Bug_285605_04() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -581,7 +582,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_05() throws Exception { + @Test public void testLeftRecursion_Bug_285605_05() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -597,7 +598,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_06() throws Exception { + @Test public void testLeftRecursion_Bug_285605_06() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -613,7 +614,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_07() throws Exception { + @Test public void testLeftRecursion_Bug_285605_07() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -629,7 +630,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_08() throws Exception { + @Test public void testLeftRecursion_Bug_285605_08() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -645,7 +646,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); } - public void testLeftRecursion_Bug_285605_09() throws Exception { + @Test public void testLeftRecursion_Bug_285605_09() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -661,7 +662,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_10() throws Exception { + @Test public void testLeftRecursion_Bug_285605_10() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -676,7 +677,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); } - public void testLeftRecursion_Bug_285605_11() throws Exception { + @Test public void testLeftRecursion_Bug_285605_11() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -692,7 +693,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_12() throws Exception { + @Test public void testLeftRecursion_Bug_285605_12() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -708,7 +709,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_13() throws Exception { + @Test public void testLeftRecursion_Bug_285605_13() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -724,7 +725,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_14() throws Exception { + @Test public void testLeftRecursion_Bug_285605_14() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -740,7 +741,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_15() throws Exception { + @Test public void testLeftRecursion_Bug_285605_15() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -756,7 +757,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals("diag.isError", diag.getSeverity(), Diagnostic.ERROR); } - public void testLeftRecursion_Bug_285605_16() throws Exception { + @Test public void testLeftRecursion_Bug_285605_16() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -772,7 +773,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); } - public void testLeftRecursion_Bug_285605_17() throws Exception { + @Test public void testLeftRecursion_Bug_285605_17() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -788,7 +789,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); } - public void testLeftRecursion_Bug_285605_18() throws Exception { + @Test public void testLeftRecursion_Bug_285605_18() throws Exception { XtextResource resource = getResourceFromString( "grammar org.foo.Bar with org.eclipse.xtext.common.Terminals\n" + "generate foo 'http://foo/bar'\n" + @@ -804,7 +805,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(diag.getChildren().toString(), diag.getChildren().isEmpty()); } - public void testBug_286683() throws Exception { + @Test public void testBug_286683() throws Exception { XtextResource resource = getResourceFromString("grammar org.xtext.example.MyDsl with org.xtext.example.MyDsl\n"+ "generate myDsl 'http://www.xtext.org/example/MyDsl'\n"+ "Model : {Model} 'name';"); @@ -817,7 +818,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertEquals(diag.getChildren().toString(), 1, diag.getChildren().size()); } - public void testBug_293110() throws Exception { + @Test public void testBug_293110() throws Exception { XtextResource resource = doGetResource(new org.eclipse.xtext.util.StringInputStream("A: value=B; B: name=ID;"),URI.createURI("testBug_293110")); Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0)); Collection runtimeExceptions = Collections2.filter(diagnostic.getChildren(), new Predicate(){ @@ -827,7 +828,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC assertTrue(runtimeExceptions.isEmpty()); } - public void testCheckCrossReferenceTerminal_01() throws Exception { + @Test public void testCheckCrossReferenceTerminal_01() throws Exception { XtextValidator validator = get(XtextValidator.class); CrossReference reference = XtextFactory.eINSTANCE.createCrossReference(); RuleCall call = XtextFactory.eINSTANCE.createRuleCall(); @@ -843,7 +844,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckCrossReferenceTerminal_02() throws Exception { + @Test public void testCheckCrossReferenceTerminal_02() throws Exception { XtextValidator validator = get(XtextValidator.class); CrossReference reference = XtextFactory.eINSTANCE.createCrossReference(); RuleCall call = XtextFactory.eINSTANCE.createRuleCall(); @@ -859,7 +860,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckCrossReferenceTerminal_05() throws Exception { + @Test public void testCheckCrossReferenceTerminal_05() throws Exception { XtextValidator validator = get(XtextValidator.class); CrossReference reference = XtextFactory.eINSTANCE.createCrossReference(); Keyword keyword = XtextFactory.eINSTANCE.createKeyword(); @@ -870,7 +871,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckActionInUnorderedGroup_01() throws Exception { + @Test public void testCheckActionInUnorderedGroup_01() throws Exception { XtextValidator validator = get(XtextValidator.class); UnorderedGroup unorderedGroup = XtextFactory.eINSTANCE.createUnorderedGroup(); Action action = XtextFactory.eINSTANCE.createAction(); @@ -881,7 +882,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckRuleCallInUnorderedGroup_01() throws Exception { + @Test public void testCheckRuleCallInUnorderedGroup_01() throws Exception { XtextValidator validator = get(XtextValidator.class); UnorderedGroup unorderedGroup = XtextFactory.eINSTANCE.createUnorderedGroup(); RuleCall ruleCall = XtextFactory.eINSTANCE.createRuleCall(); @@ -897,7 +898,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckRuleCallInUnorderedGroup_02() throws Exception { + @Test public void testCheckRuleCallInUnorderedGroup_02() throws Exception { XtextValidator validator = get(XtextValidator.class); UnorderedGroup unorderedGroup = XtextFactory.eINSTANCE.createUnorderedGroup(); RuleCall ruleCall = XtextFactory.eINSTANCE.createRuleCall(); @@ -913,7 +914,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckRuleCallInUnorderedGroup_03() throws Exception { + @Test public void testCheckRuleCallInUnorderedGroup_03() throws Exception { XtextValidator validator = get(XtextValidator.class); UnorderedGroup unorderedGroup = XtextFactory.eINSTANCE.createUnorderedGroup(); RuleCall ruleCall = XtextFactory.eINSTANCE.createRuleCall(); @@ -926,7 +927,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckRuleCallInUnorderedGroup_04() throws Exception { + @Test public void testCheckRuleCallInUnorderedGroup_04() throws Exception { XtextValidator validator = get(XtextValidator.class); UnorderedGroup unorderedGroup = XtextFactory.eINSTANCE.createUnorderedGroup(); RuleCall ruleCall = XtextFactory.eINSTANCE.createRuleCall(); @@ -939,7 +940,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCheckRuleCallInUnorderedGroup_05() throws Exception { + @Test public void testCheckRuleCallInUnorderedGroup_05() throws Exception { XtextValidator validator = get(XtextValidator.class); UnorderedGroup unorderedGroup = XtextFactory.eINSTANCE.createUnorderedGroup(); RuleCall ruleCall = XtextFactory.eINSTANCE.createRuleCall(); @@ -957,7 +958,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testBug318424_01() throws Exception { + @Test public void testBug318424_01() throws Exception { XtextValidator validator = get(XtextValidator.class); CrossReference reference = XtextFactory.eINSTANCE.createCrossReference(); TypeRef typeRef = XtextFactory.eINSTANCE.createTypeRef(); @@ -969,7 +970,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testBug318424_02() throws Exception { + @Test public void testBug318424_02() throws Exception { XtextValidator validator = get(XtextValidator.class); Action action = XtextFactory.eINSTANCE.createAction(); TypeRef typeRef = XtextFactory.eINSTANCE.createTypeRef(); @@ -981,7 +982,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testCycleInTypeHierarchy() throws Exception { + @Test public void testCycleInTypeHierarchy() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammarAsText += " RuleA: RuleB;"; @@ -1003,7 +1004,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testDuplicateFeatures_01() throws Exception { + @Test public void testDuplicateFeatures_01() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1033,7 +1034,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testDuplicateFeatures_02() throws Exception { + @Test public void testDuplicateFeatures_02() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1062,7 +1063,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testNameClash_01() throws Exception { + @Test public void testNameClash_01() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1083,7 +1084,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testNameClash_02() throws Exception { + @Test public void testNameClash_02() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1104,7 +1105,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testNameClash_03() throws Exception { + @Test public void testNameClash_03() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1126,7 +1127,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testGeneratedPackageNotEmpty() throws Exception { + @Test public void testGeneratedPackageNotEmpty() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1142,7 +1143,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testHiddenTokenIsATerminal_01() throws Exception { + @Test public void testHiddenTokenIsATerminal_01() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals hidden(Model)\n" + "generate test 'http://test'\n" + @@ -1156,7 +1157,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testHiddenTokenIsATerminal_02() throws Exception { + @Test public void testHiddenTokenIsATerminal_02() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1172,7 +1173,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testHiddenTokenIsATerminal_03() throws Exception { + @Test public void testHiddenTokenIsATerminal_03() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals hidden(Fragment)\n" + "generate test 'http://test'\n" + @@ -1187,7 +1188,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testHiddenTokenIsATerminal_04() throws Exception { + @Test public void testHiddenTokenIsATerminal_04() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1203,7 +1204,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testHiddenTokenIsATerminal_05() throws Exception { + @Test public void testHiddenTokenIsATerminal_05() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals hidden(WS)\n" + "generate test 'http://test'\n" + @@ -1217,7 +1218,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testHiddenTokenIsATerminal_06() throws Exception { + @Test public void testHiddenTokenIsATerminal_06() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1232,7 +1233,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_01() throws Exception { + @Test public void testRuleCallAllowed_01() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1251,7 +1252,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_02() throws Exception { + @Test public void testRuleCallAllowed_02() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1270,7 +1271,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_03() throws Exception { + @Test public void testRuleCallAllowed_03() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1289,7 +1290,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_04() throws Exception { + @Test public void testRuleCallAllowed_04() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1307,7 +1308,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_05() throws Exception { + @Test public void testRuleCallAllowed_05() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1325,7 +1326,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_06() throws Exception { + @Test public void testRuleCallAllowed_06() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1344,7 +1345,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_07() throws Exception { + @Test public void testRuleCallAllowed_07() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1362,7 +1363,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_08_335692() throws Exception { + @Test public void testRuleCallAllowed_08_335692() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1381,7 +1382,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testRuleCallAllowed_09_335692() throws Exception { + @Test public void testRuleCallAllowed_09_335692() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1400,7 +1401,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testPredicatedUnorderedGroup_01() throws Exception { + @Test public void testPredicatedUnorderedGroup_01() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1417,7 +1418,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testPredicatedUnorderedGroup_02() throws Exception { + @Test public void testPredicatedUnorderedGroup_02() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1437,7 +1438,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testPredicatedUnorderedGroup_03() throws Exception { + @Test public void testPredicatedUnorderedGroup_03() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1458,7 +1459,7 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC messageAcceptor.validate(); } - public void testPredicatedUnorderedGroup_04() throws Exception { + @Test public void testPredicatedUnorderedGroup_04() throws Exception { String grammarAsText = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java index 1467c5edd..80307f7af 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/EClassInfoTest.java @@ -12,15 +12,15 @@ import java.util.Collections; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.xtext.ecoreInference.EClassifierInfo.EClassInfo; - -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API */ -public class EClassInfoTest extends TestCase { +public class EClassInfoTest extends Assert { - public void testContainsCompatibleFeature_01() throws Exception { + @Test public void testContainsCompatibleFeature_01() throws Exception { EcorePackage pack = EcorePackage.eINSTANCE; EClass eClass = pack.getEClass(); EClassInfo objectUnderTest = new EClassifierInfo.EClassInfo(eClass, false, Collections.emptySet(), null); @@ -37,7 +37,7 @@ public class EClassInfoTest extends TestCase { assertEquals(false,objectUnderTest.containsCompatibleFeature("eStructuralFeatures", true, true, pack.getEAnnotation(), new StringBuilder())); } - public void testContainsCompatibleFeature_02() throws Exception { + @Test public void testContainsCompatibleFeature_02() throws Exception { EcorePackage pack = EcorePackage.eINSTANCE; EClass attribute = pack.getEAttribute(); EClassInfo objectUnderTest = new EClassifierInfo.EClassInfo(attribute, false, Collections.emptySet(), null); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java index 7688fb715..e1f70be79 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTest.java @@ -13,8 +13,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.MultiValueFeatureTestLanguagePackage; +import org.junit.Test; /** * @author Sebastian Zarnekow - Initial contribution and API @@ -22,12 +23,12 @@ import org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.Mult public class MultiValueFeatureTest extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(MultiValueFeatureTestLanguageStandaloneSetup.class); } - public void testMetamodel() { + @Test public void testMetamodel() { EPackage generated = MultiValueFeatureTestLanguagePackage.eINSTANCE; assertEquals("multiValueFeatureTestLanguage", generated.getName()); EClass clazz = (EClass) generated.getEClassifier("Start"); @@ -39,7 +40,7 @@ public class MultiValueFeatureTest extends AbstractXtextTests { } @SuppressWarnings("unchecked") - public void testModel() throws Exception { + @Test public void testModel() throws Exception { String model = "idA idB idA"; EObject parsedModel = getModel(model); List values = (List) parsedModel.eGet(parsedModel.eClass().getEStructuralFeature("featureA")); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java index 0ecadaedf..8c58975e6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/ResourceTests.java @@ -8,8 +8,10 @@ package org.eclipse.xtext.xtext.ecoreInference; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; +import org.eclipse.xtext.linking.langATestLanguage.Main; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API @@ -17,14 +19,14 @@ import org.eclipse.xtext.linking.LangATestLanguageStandaloneSetup; public class ResourceTests extends AbstractXtextTests { @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(LangATestLanguageStandaloneSetup.class); } - public void testFragmentsWorkInBothDirections() throws Exception { - EObject model = getModel("type A extends B type B extends A"); - EObject typeA1 = (EObject) invokeWithXtend("types.first()", model); + @Test public void testFragmentsWorkInBothDirections() throws Exception { + Main model = (Main) getModel("type A extends B type B extends A"); + EObject typeA1 = model.getTypes().get(0); EObject typeA2 = model.eResource().getEObject(model.eResource().getURIFragment(typeA1)); assertEquals(typeA1, typeA2); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java index 1cd329a94..f2057c67b 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TransformationDiagnosticTest.java @@ -7,22 +7,22 @@ *******************************************************************************/ package org.eclipse.xtext.xtext.ecoreInference; -import junit.framework.TestCase; - import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.impl.LeafNode; +import org.junit.Assert; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API */ -public class TransformationDiagnosticTest extends TestCase { +public class TransformationDiagnosticTest extends Assert { - public void testEnumCode() throws Exception { + @Test public void testEnumCode() throws Exception { String expected = "org.eclipse.xtext.xtext.ecoreInference.TransformationErrorCode.AliasForMetamodelAlreadyExists"; assertEquals(expected, TransformationErrorCode.AliasForMetamodelAlreadyExists.getFullyQualifiedCode()); } - public void testDiagnostic() throws Exception { + @Test public void testDiagnostic() throws Exception { INode node = new LeafNode(); TransformationDiagnostic diagnostic = new TransformationDiagnostic(node, "message", TransformationErrorCode.FeatureWithDifferentConfigurationAlreadyExists); String expected = "org.eclipse.xtext.xtext.ecoreInference.TransformationErrorCode.FeatureWithDifferentConfigurationAlreadyExists"; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java index a2b577a0d..aef35e170 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/TypeHierarchyHelperTest.java @@ -12,8 +12,6 @@ import static org.easymock.EasyMock.*; import java.util.Collections; -import junit.framework.TestCase; - import org.easymock.EasyMock; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -26,12 +24,15 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.XtextFactory; import org.eclipse.xtext.xtext.ecoreInference.EClassifierInfo.EClassInfo; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Heiko Behrens - Initial contribution and API * */ -public class TypeHierarchyHelperTest extends TestCase { +public class TypeHierarchyHelperTest extends Assert { private TypeHierarchyHelper helper; private EClassifierInfos infos; @@ -40,9 +41,8 @@ public class TypeHierarchyHelperTest extends TestCase { private ErrorAcceptor errorAcceptorMock; private GeneratedMetamodel metamodel; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { errorAcceptorMock = createMock(ErrorAcceptor.class); metamodel = XtextFactory.eINSTANCE.createGeneratedMetamodel(); Grammar grammar = XtextFactory.eINSTANCE.createGrammar(); @@ -95,7 +95,7 @@ public class TypeHierarchyHelperTest extends TestCase { return feature; } - public void testSimpeCase01() throws Exception { + @Test public void testSimpeCase01() throws Exception { EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); EClassInfo c = addClass("c"); @@ -115,7 +115,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertEquals(0, c.getEClass().getEStructuralFeatures().size()); } - public void testSimpeCase02() throws Exception { + @Test public void testSimpeCase02() throws Exception { // no uplift for less than two children EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); @@ -131,7 +131,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertEquals(1, b.getEClass().getEStructuralFeatures().size()); } - public void testRecursiveUplift01() throws Exception { + @Test public void testRecursiveUplift01() throws Exception { // no uplift for less than two children EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); @@ -162,7 +162,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertEquals(0, e.getEClass().getEStructuralFeatures().size()); } - public void testNikolaus() throws Exception { + @Test public void testNikolaus() throws Exception { // no uplift for less than two children EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); @@ -196,7 +196,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertEquals(1, e.getEClass().getEStructuralFeatures().size()); } - public void testImcompatipleFeatures() throws Exception { + @Test public void testImcompatipleFeatures() throws Exception { EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); EClassInfo c = addClass("c"); @@ -216,7 +216,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertEquals(1, c.getEClass().getEStructuralFeatures().size()); } - public void testReferences() throws Exception { + @Test public void testReferences() throws Exception { EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); EClassInfo c = addClass("c"); @@ -237,7 +237,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertEquals(0, c.getEClass().getEStructuralFeatures().size()); } - public void testConfigurationOfLiftedReference() throws Exception { + @Test public void testConfigurationOfLiftedReference() throws Exception { EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); EClassInfo c = addClass("c"); @@ -263,7 +263,7 @@ public class TypeHierarchyHelperTest extends TestCase { assertTrue(refA.isContainment()); } - public void testDublicateDerivedFeature() throws Exception { + @Test public void testDublicateDerivedFeature() throws Exception { EClassInfo a = addClass("a"); EClassInfo b = addClass("b"); EClassInfo c = addClass("c"); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java index 77c85f665..08032d7cd 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java @@ -7,12 +7,13 @@ *******************************************************************************/ package org.eclipse.xtext.xtext.ecoreInference; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.nodemodel.ICompositeNode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model; import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures; +import org.junit.Test; import com.google.common.collect.Iterables; @@ -27,12 +28,12 @@ public class UnassignedRuleCallTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); with(UnassignedRuleCallTestLanguageStandaloneSetup.class); } - public void testParseModel_01() throws Exception { + @Test public void testParseModel_01() throws Exception { String modelAsText = "model 7 feature Zonk 1 keyword 1;"; Model model = (Model) getModel(modelAsText); assertNotNull(model); @@ -40,7 +41,7 @@ public class UnassignedRuleCallTest extends AbstractXtextTests { assertEquals("Zonk", model.getModelFeatures().getName()); } - public void testParseModel_02() throws Exception { + @Test public void testParseModel_02() throws Exception { String modelAsText = "model 7 13 feature Foo 1 keyword 1 'bar';"; Model model = (Model) getModel(modelAsText); assertNotNull(model); @@ -48,19 +49,19 @@ public class UnassignedRuleCallTest extends AbstractXtextTests { assertEquals("Foo", model.getModelFeatures().getName()); } - public void testParseModel_03() throws Exception { + @Test public void testParseModel_03() throws Exception { String modelAsText = "model 7 feature Zonk 1 keyword 1;"; XtextResource resource = getResourceFromString(modelAsText); assertTrue(resource.getErrors().isEmpty()); } - public void testParseModel_04() throws Exception { + @Test public void testParseModel_04() throws Exception { String modelAsText = "model 7 13 137 feature Foo 1 keyword 1 'bar';"; XtextResource resource = getResourceFromString(modelAsText); assertTrue(resource.getErrors().isEmpty()); } - public void testNodeModel_01() throws Exception { + @Test public void testNodeModel_01() throws Exception { String modelAsText = "model 7 feature Zonk 1 keyword 1;"; Model model = (Model) getModel(modelAsText); ICompositeNode node = NodeModelUtils.getNode(model); @@ -73,7 +74,7 @@ public class UnassignedRuleCallTest extends AbstractXtextTests { assertEquals(6, Iterables.size(dataTypeNode.getChildren())); } - public void testNodeModel_02() throws Exception { + @Test public void testNodeModel_02() throws Exception { String modelAsText = "model 7 13 137 feature Foo 1 keyword 1 'bar';"; Model model = (Model) getModel(modelAsText); ICompositeNode node = NodeModelUtils.getNode(model); diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java index c562fd1f0..52e25fd18 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java @@ -34,7 +34,7 @@ import org.eclipse.xtext.XtextStandaloneSetup; import org.eclipse.xtext.diagnostics.ExceptionDiagnostic; import org.eclipse.xtext.diagnostics.IDiagnosticConsumer; import org.eclipse.xtext.ecore.EcoreSupportStandaloneSetup; -import org.eclipse.xtext.junit.AbstractXtextTests; +import org.eclipse.xtext.junit4.AbstractXtextTests; import org.eclipse.xtext.linking.impl.Linker; import org.eclipse.xtext.linking.impl.LinkingDiagnosticMessageProvider; import org.eclipse.xtext.resource.XtextResource; @@ -42,6 +42,7 @@ import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.util.OnChangeEvictingCache; import org.eclipse.xtext.xtext.XtextLinker; import org.eclipse.xtext.xtext.XtextLinker.PackageRemover; +import org.junit.Test; import com.google.common.base.Joiner; @@ -72,14 +73,14 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { } @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); errorAcceptorMock = createMock(ErrorAcceptor.class); with(XtextStandaloneSetup.class); } @Override - protected void tearDown() throws Exception { + public void tearDown() throws Exception { errorAcceptorMock = null; super.tearDown(); } @@ -162,7 +163,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { return reference; } - public void testTypesOfImplicitSuperGrammar() throws Exception { + @Test public void testTypesOfImplicitSuperGrammar() throws Exception { final String xtextGrammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' MyRule: myFeature=INT;"; Grammar grammar = (Grammar) getModel(xtextGrammar); @@ -185,7 +186,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertNotNull(parentInfos.getInfo(referenced, "EInt")); } - public void testRuleWithoutExplicitReturnType() throws Exception { + @Test public void testRuleWithoutExplicitReturnType() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' MyRule: myFeature=INT;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -195,7 +196,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals("MyRule", implicitlyDefinedMetatype.getName()); } - public void testRulesWithExplicitReturnType() throws Exception { + @Test public void testRulesWithExplicitReturnType() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA returns TypeA: featureA=INT; RuleB returns TypeB: featureB= INT;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -204,7 +205,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertNotNull(ePackage.getEClassifier("TypeB")); } - public void testSimpleHierarchy() throws Exception { + @Test public void testSimpleHierarchy() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: RuleB; RuleB: featureB= INT;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -219,7 +220,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(ruleA, superClass); } - public void testDiamondHierarchy() throws Exception { + @Test public void testDiamondHierarchy() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' " + "Model: name=ID value=SubNamed1 otherValue=SubNamed2 thirdValue=SubNamed3;" + @@ -282,7 +283,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals("concreteNamed3", 1, concreteNamed3.getEStructuralFeatures().size()); } - public void testSingleFeatures() throws Exception { + @Test public void testSingleFeatures() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: featureA=INT;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -293,7 +294,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleA, 0, "featureA", "EInt"); } - public void testCommonTerminalsFeatureTypes() throws Exception { + @Test public void testCommonTerminalsFeatureTypes() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: featureA=ID featureB=INT featureC=STRING;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -306,7 +307,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleA, 2, "featureC", "EString"); } - public void testCardinalityOfFeatures() throws Exception { + @Test public void testCardinalityOfFeatures() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: featureA?=ID featureB=INT featureC+=STRING;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -319,7 +320,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleA, 2, "featureC", "EString", 0, -1); } - public void testOptionalAssignmentsInGroup() throws Exception { + @Test public void testOptionalAssignmentsInGroup() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: (featureA?='abstract' featureB+=INT)?;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -331,7 +332,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleA, 1, "featureB", "EInt", 0, -1); } - public void testFeaturesAndInheritanceOptionalRuleCall() throws Exception { + @Test public void testFeaturesAndInheritanceOptionalRuleCall() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: RuleB? featureA=INT; RuleB: featureB=STRING;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -348,7 +349,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleB, 0, "featureB", "EString"); } - public void testFeaturesAndInheritanceMandatoryRuleCall() throws Exception { + @Test public void testFeaturesAndInheritanceMandatoryRuleCall() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: RuleB featureA=INT; RuleB: featureB=STRING;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -365,7 +366,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleB, 1, "featureB", "EString"); } - public void testFeaturesAndInheritanceOfMandatoryAlternativeRuleCalls() throws Exception { + @Test public void testFeaturesAndInheritanceOfMandatoryAlternativeRuleCalls() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: (RuleB|RuleC featureC1=ID) featureA=ID; RuleB: featureB=ID; RuleC: featureC2=ID;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -394,7 +395,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleC, 1, "featureC2", "EString"); } - public void testFeaturesAndInheritanceOfOptionalOptionalRuleCalls() throws Exception { + @Test public void testFeaturesAndInheritanceOfOptionalOptionalRuleCalls() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: (RuleB|RuleC featureC1=ID)? featureA=ID; RuleB: featureB=ID; RuleC: featureC2=ID;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -423,7 +424,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleC, 1, "featureC2", "EString"); } - public void testFeaturesAndInheritanceOfNestedRuleCalls() throws Exception { + @Test public void testFeaturesAndInheritanceOfNestedRuleCalls() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA: ((RuleB|RuleC featureC1=ID) featureBC=ID | (RuleC|RuleD featureD1=ID) featureCD=ID) featureA=ID;"; @@ -467,7 +468,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleD, 2, "featureD2", "EString"); } - public void testFeaturesAndInheritanceOfNestedRuleCalls_02() throws Exception { + @Test public void testFeaturesAndInheritanceOfNestedRuleCalls_02() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA: ((RuleB|RuleC featureC1=ID)? featureABC=ID | (RuleC|RuleD featureD1=ID) featureCD=ID) featureA=ID;"; @@ -509,7 +510,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleD, 2, "featureD2", "EString"); } - public void testFeaturesAndInheritanceOfActions01() throws Exception { + @Test public void testFeaturesAndInheritanceOfActions01() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: ({Add.a=current} '+'|{Sub.a=current} '-') featureAS=ID;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -541,7 +542,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(0, sub.getEReferences().size()); } - public void testFeaturesAndInheritanceOfActions02() throws Exception { + @Test public void testFeaturesAndInheritanceOfActions02() throws Exception { String grammar = ""; grammar += "grammar org.eclipse.xtext.testlanguages.ActionTestLanguage with org.eclipse.xtext.common.Terminals "; grammar += "generate ActionLang"; @@ -576,7 +577,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertSame(type, thing.getESuperTypes().get(0)); } - public void testAssignedRuleCall() throws Exception { + @Test public void testAssignedRuleCall() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: callA1=RuleB callA2+=RuleB simpleFeature=ID; RuleB: featureB=ID;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -595,7 +596,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleB, 0, "featureB", "EString"); } - public void testAssignedCrossReference() throws Exception { + @Test public void testAssignedCrossReference() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' " + "RuleA: refA1=[TypeB] refA2+=[TypeB|RuleB] simpleFeature=ID; " + @@ -616,7 +617,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(typeB, 0, "featureB", "EString"); } - public void testAssignedParenthesizedElement() throws Exception { + @Test public void testAssignedParenthesizedElement() throws Exception { String grammar = " grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA: featureA1?=(RuleB) refA1=(RuleB) refA2=(RuleB|RuleC) refA3+=(RuleB|RuleC|RuleD) refA4=(RuleB|RuleD) featureA2+=('a'|'b');"; @@ -648,7 +649,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertReferenceConfiguration(ruleA, 3, "refA4", "TypeB", true, 0, 1); } - public void testAssignedKeyword() throws Exception { + @Test public void testAssignedKeyword() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: featureA?=('+'|'-') featureB=('*'|'/');"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -660,13 +661,13 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(ruleA, 1, "featureB", "EString", 0, 1); } - public void testImportWithoutAlias() throws Exception { + @Test public void testImportWithoutAlias() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' import 'http://www.eclipse.org/emf/2002/Ecore' RuleA: feature=ID;"; getEPackageFromGrammar(grammar); } - public void testGenerateTwoModels() throws Exception { + @Test public void testGenerateTwoModels() throws Exception { String grammar = ""; grammar += " grammar test with org.eclipse.xtext.common.Terminals"; grammar += " generate t1 'http://t1'"; @@ -690,7 +691,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertNotNull(typeB); } - public void testUseSameModelAlias() throws Exception { + @Test public void testUseSameModelAlias() throws Exception { String grammar = ""; grammar += " grammar test with org.eclipse.xtext.common.Terminals"; grammar += " generate t1 'http://t1' as target"; @@ -706,7 +707,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(0, ePackages.size()); } - public void testModifyingSealedModel() throws Exception { + @Test public void testModifyingSealedModel() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "generate test 'http://test' " + "import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + @@ -716,7 +717,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(result.getEClassifiers().isEmpty()); } - public void testImportingUnknownModel() throws Exception { + @Test public void testImportingUnknownModel() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "generate test 'http://test' " + "import 'unknown-scheme://www.unknownModel' as unknownModel " + @@ -724,7 +725,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getEPackageFromGrammar(grammar, 1); } - public void testMoreThanOneRuleCall() throws Exception { + @Test public void testMoreThanOneRuleCall() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: RuleB RuleC; RuleB: featureB=ID; RuleC: featureC=ID;"; errorAcceptorMock.acceptError(same(TransformationErrorCode.MoreThanOneTypeChangeInOneRule), (String) anyObject(), @@ -732,13 +733,13 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getEPackageFromGrammar(grammar, 1); } - public void testRuleCallAndAction() throws Exception { + @Test public void testRuleCallAndAction() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: RuleB {TypeC.B = current}; RuleB: featureB=ID;"; getEPackageFromGrammar(grammar); } - public void testRuleCallActionAndRuleCall() throws Exception { + @Test public void testRuleCallActionAndRuleCall() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA: RuleB {TypeC.B = current} RuleB; RuleB: featureB=ID;"; errorAcceptorMock.acceptError(same(TransformationErrorCode.MoreThanOneTypeChangeInOneRule), (String) anyObject(), @@ -746,7 +747,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getEPackageFromGrammar(grammar, 1); } - public void testAddingFeatureTwice() throws Exception { + @Test public void testAddingFeatureTwice() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test' RuleA returns TypeA: featureA=ID; RuleB returns TypeA: featureA=STRING;"; EPackage ePackage = getEPackageFromGrammar(grammar); @@ -758,7 +759,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(typeA, 0, "featureA", "EString"); } - public void testAddingDifferentFeaturesWithSameName01() throws Exception { + @Test public void testAddingDifferentFeaturesWithSameName01() throws Exception { // simple datatypes do not have a common compatible type final String grammar = "" + " grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'" + " RuleA returns TypeA: featureA=ID;" @@ -775,7 +776,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertAttributeConfiguration(typeA, 0, "featureA", "EString"); } - public void testAddingDifferentFeaturesWithSameName02() throws Exception { + @Test public void testAddingDifferentFeaturesWithSameName02() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: featureA=RuleD;"; @@ -796,7 +797,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertReferenceConfiguration(typeA, 0, "featureA", "RuleC", true, 0, 1); } - public void testAddingDifferentFeaturesWithSameName03() throws Exception { + @Test public void testAddingDifferentFeaturesWithSameName03() throws Exception { // independent rules are combined as EObject String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; @@ -823,7 +824,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertReferenceConfiguration(typeA, 1, "featureA3", "RuleC", true, 0, 1); } - public void testUplift01() throws Exception { + @Test public void testUplift01() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA: (RuleB|RuleC) featureA=ID;"; @@ -848,7 +849,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(0, ruleC.getEAttributes().size()); } - public void testCallOfUndeclaredRule() throws Exception { + @Test public void testCallOfUndeclaredRule() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA: CallOfUndeclaredRule featureA=ID;"; @@ -859,7 +860,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals("RuleA", ePackage.getEClassifiers().get(0).getName()); } - public void testExpressionLikeLangauge() throws Exception { + @Test public void testExpressionLikeLangauge() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " Ex : Atom ({ChainExpression.left+=current} operator=('+'|'-'|'*'|'/') right=Atom )*;" + @@ -871,7 +872,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(0,classifier.getEStructuralFeatures().size()); } - public void testClassNameEString() throws Exception { + @Test public void testClassNameEString() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += "Start returns EString: id=ID;"; @@ -885,7 +886,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(EcorePackage.Literals.ESTRING, feature.getEType()); } - public void testNoException_01() throws Exception { + @Test public void testNoException_01() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + "generate test 'http://test'\n" + @@ -901,7 +902,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { } } - public void testNoException_02() throws Exception { + @Test public void testNoException_02() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'\n" + "Model: (children+=Element)*;\n" + @@ -913,7 +914,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { } } - public void testNoException_03() throws Exception { + @Test public void testNoException_03() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + "generate test 'http://test'\n" + @@ -928,7 +929,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266440 */ - public void testBug_266440() throws Exception { + @Test public void testBug_266440() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + " generate bugreport 'http://bugreport/266440'\n" + @@ -949,7 +950,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266807 */ - public void testBug_266807() throws Exception { + @Test public void testBug_266807() throws Exception { with(new XtextStandaloneSetup()); XtextResourceSet rs = get(XtextResourceSet.class); rs.setClasspathURIContext(getClass()); @@ -965,7 +966,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566 */ - public void testBug_272566_1() throws Exception { + @Test public void testBug_272566_1() throws Exception { with(new XtextStandaloneSetup()); String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -983,7 +984,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566 */ - public void testBug_272566_2() throws Exception { + @Test public void testBug_272566_2() throws Exception { with(new XtextStandaloneSetup()); String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1004,7 +1005,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566 */ - public void testBug_272566_3() throws Exception { + @Test public void testBug_272566_3() throws Exception { with(new XtextStandaloneSetup()); String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1025,7 +1026,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { } } - public void testInheritFromEObject_01() throws Exception { + @Test public void testInheritFromEObject_01() throws Exception { String grammar = " grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + @@ -1037,7 +1038,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().isEmpty()); } - public void testInheritFromEObject_02() throws Exception { + @Test public void testInheritFromEObject_02() throws Exception { String grammar = " grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + @@ -1046,7 +1047,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testInheritFromEObject_03() throws Exception { + @Test public void testInheritFromEObject_03() throws Exception { String grammar = " grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + @@ -1055,7 +1056,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().isEmpty()); } - public void testPostProcessorHook() throws Exception { + @Test public void testPostProcessorHook() throws Exception { final String xtextGrammar = "grammar test with org.eclipse.xtext.common.Terminals" + " import 'http://www.eclipse.org/emf/2002/Ecore' as ecore " + " generate test 'http://test' MyRule: myFeature=INT;"; @@ -1072,7 +1073,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { verify(postProcessor); } - public void testBug_280413_01() throws Exception { + @Test public void testBug_280413_01() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" + "import 'http://www.eclipse.org/emf/2002/Ecore' as ecore\n" + @@ -1081,7 +1082,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testBug_280413_02() throws Exception { + @Test public void testBug_280413_02() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate test 'http://test'\n" + @@ -1091,7 +1092,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testBug_280413_03() throws Exception { + @Test public void testBug_280413_03() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.Xtext\n" + "generate test 'http://test'\n" + @@ -1101,7 +1102,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty()); } - public void testBug_280413_04() throws Exception { + @Test public void testBug_280413_04() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguage\n" + "generate test 'http://test'\n" + @@ -1117,7 +1118,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { /** * https://bugs.eclipse.org/bugs/show_bug.cgi?id=280393 */ - public void testBug_280393() throws Exception { + @Test public void testBug_280393() throws Exception { final String grammar = "grammar foo.Bar with org.eclipse.xtext.common.Terminals\n" + "\n" + "import \"http://www.eclipse.org/emf/2002/Ecore\" as ecore\n" + @@ -1133,7 +1134,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testBug_285140_01() throws Exception { + @Test public void testBug_285140_01() throws Exception { final String grammar = "grammar org.sublang with org.eclipse.xtext.testlanguages.ActionTestLanguage\n" + "\n" + "import \"http://www.eclipse.org/2008/tmf/xtext/ActionLang\" as actionLang\n" + @@ -1146,7 +1147,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testBug_285140_02() throws Exception { + @Test public void testBug_285140_02() throws Exception { final String grammar = "grammar org.sublang with org.eclipse.xtext.xtext.ecoreInference.Bug285140TestLanguage\n" + "\n" + "import \"http://www.eclipse.org/2008/tmf/xtext/ActionLang\" as actionLang\n" + @@ -1158,7 +1159,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testBug_285140_03() throws Exception { + @Test public void testBug_285140_03() throws Exception { final String grammar = "grammar org.sublang with org.eclipse.xtext.xtext.ecoreInference.Bug285140TestLanguage\n" + "\n" + "import \"http://www.eclipse.org/2008/tmf/xtext/ActionLang\" as actionLang\n" + @@ -1170,7 +1171,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testBug_285140_04() throws Exception { + @Test public void testBug_285140_04() throws Exception { final String grammar = "grammar org.sublang with org.eclipse.xtext.xtext.ecoreInference.Bug285140TestLanguage\n" + "\n" + "import \"http://www.eclipse.org/2008/tmf/xtext/ActionLang\" as actionLang\n" + @@ -1181,7 +1182,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testBug_286285_01() throws Exception { + @Test public void testBug_286285_01() throws Exception { final String grammar = "grammar language with org.eclipse.xtext.common.Terminals\n" + "generate lang \"http://www.language.org\"\n" + "Model:\n" + @@ -1191,7 +1192,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testBug_287550_01() throws Exception { + @Test public void testBug_287550_01() throws Exception { String grammar = "grammar language with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://example.xtext.org/MyDsl\"\n" + "Model: Left | Right;\n" + @@ -1202,7 +1203,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testBug_287698_01() throws Exception { + @Test public void testBug_287698_01() throws Exception { String grammar = "grammar language with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://example.xtext.org/MyDsl\"\n" + "Model returns Namespace: {Model} elements+=NamespaceElement;\n" + @@ -1213,7 +1214,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testBug_287698_02() throws Exception { + @Test public void testBug_287698_02() throws Exception { String grammar = "grammar language with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://example.xtext.org/MyDsl\"\n" + "Model returns Namespace: {Model} elements+=(Namespace | Something); \n" + @@ -1228,7 +1229,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testContainmentVsReference_01() throws Exception { + @Test public void testContainmentVsReference_01() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' " + @@ -1237,7 +1238,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testContainmentVsReference_02() throws Exception { + @Test public void testContainmentVsReference_02() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' " + @@ -1246,7 +1247,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testContainmentVsReference_03() throws Exception { + @Test public void testContainmentVsReference_03() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' " + @@ -1255,7 +1256,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 0, resource.getErrors().size()); } - public void testContainmentVsReference_04() throws Exception { + @Test public void testContainmentVsReference_04() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' " + @@ -1265,7 +1266,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testContainmentVsReference_05() throws Exception { + @Test public void testContainmentVsReference_05() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' " + @@ -1274,7 +1275,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testContainmentVsReference_06() throws Exception { + @Test public void testContainmentVsReference_06() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals " + "import 'http://www.eclipse.org/emf/2002/Ecore' " + @@ -1284,7 +1285,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testBug296496_01() throws Exception { + @Test public void testBug296496_01() throws Exception { final String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" + "import \"classpath:/org/eclipse/xtext/enumrules/enums.ecore\"\n" + @@ -1296,7 +1297,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(resource.getErrors().toString(), 1, resource.getErrors().size()); } - public void testBug296496_02() throws Exception { + @Test public void testBug296496_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.common.Terminals\n" + "import \"classpath:/org/eclipse/xtext/enumrules/enums.ecore\"\n" + @@ -1314,7 +1315,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(createdType.getEStructuralFeature("enumFeature").getEType(), createdType.getEStructuralFeature("otherEnumFeature").getEType()); } - public void testBug310122() throws Exception { + @Test public void testBug310122() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.common.Terminals\n" + "generate myDsl \"http://example.xtext.org/MyDsl\"\n" + @@ -1332,84 +1333,84 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { } } - public void testOverrideTerminalFragment_01() throws Exception { + @Test public void testOverrideTerminalFragment_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "terminal fragment ESCAPED_CHAR: '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\\');"; getResourceFromString(grammarAsString); } - public void testOverrideTerminalFragment_02() throws Exception { + @Test public void testOverrideTerminalFragment_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "terminal ESCAPED_CHAR: '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\\');"; getResourceFromString(grammarAsString); } - public void testOverrideTerminalFragment_03() throws Exception { + @Test public void testOverrideTerminalFragment_03() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "ESCAPED_CHAR: '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\\');"; getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideTerminalFragment_04() throws Exception { + @Test public void testOverrideTerminalFragment_04() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "enum ESCAPED_CHAR: A | B;"; getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideTerminalRule_01() throws Exception { + @Test public void testOverrideTerminalRule_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "terminal fragment ID: 'a'..'z'+;"; getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideTerminalRule_02() throws Exception { + @Test public void testOverrideTerminalRule_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "terminal ID: 'a'..'z'+;"; getResourceFromString(grammarAsString); } - public void testOverrideTerminalRule_03() throws Exception { + @Test public void testOverrideTerminalRule_03() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "ID: 'a' | 'z';"; getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideTerminalRule_04() throws Exception { + @Test public void testOverrideTerminalRule_04() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage\n" + "enum ID: A | B;"; getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideDatatypeRule_01() throws Exception { + @Test public void testOverrideDatatypeRule_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage\n" + "terminal fragment ModelId: 'a'..'z'+;"; getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideDatatypeRule_02() throws Exception { + @Test public void testOverrideDatatypeRule_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage\n" + "terminal ModelId: 'a'..'z'+;"; getResourceFromString(grammarAsString); } - public void testOverrideDatatypeRule_03() throws Exception { + @Test public void testOverrideDatatypeRule_03() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage\n" + "ModelId: 'a' | 'z';"; getResourceFromString(grammarAsString); } - public void testOverrideDatatypeRule_04() throws Exception { + @Test public void testOverrideDatatypeRule_04() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.xtext.ecoreInference.DataTypeRuleWithEnumResultTestLanguage\n" + "import 'http://www.eclipse.org/2009/tmf/xtext/EnumRulesTest'\n" + @@ -1418,7 +1419,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getResourceFromString(grammarAsString); } - public void testOverrideEnumRule_01() throws Exception { + @Test public void testOverrideEnumRule_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -1426,7 +1427,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getResourceFromStringAndExpect(grammarAsString, 1); } - public void testOverrideEnumRule_02() throws Exception { + @Test public void testOverrideEnumRule_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -1434,7 +1435,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getResourceFromString(grammarAsString); } - public void testOverrideEnumRule_03() throws Exception { + @Test public void testOverrideEnumRule_03() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -1442,7 +1443,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getResourceFromString(grammarAsString); } - public void testOverrideEnumRule_04() throws Exception { + @Test public void testOverrideEnumRule_04() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'\n" + @@ -1450,7 +1451,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getResourceFromString(grammarAsString); } - public void testMultiInheritance_01() throws Exception { + @Test public void testMultiInheritance_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'http://www.eclipse.org/xtext/common/JavaVMTypes' as types\n" + @@ -1464,7 +1465,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals("JvmComponentType", array.getEStructuralFeature("componentType").getEType().getName()); } - public void testMultiInheritance_02() throws Exception { + @Test public void testMultiInheritance_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'http://www.eclipse.org/xtext/common/JavaVMTypes' as types\n" + @@ -1478,7 +1479,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals("JvmComponentType", array.getEStructuralFeature("componentType").getEType().getName()); } - public void testBug316610_01() throws Exception { + @Test public void testBug316610_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'http://www.eclipse.org/xtext/common/JavaVMTypes' as types\n" + @@ -1487,7 +1488,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().get(0).getMessage().contains("JvmTypeReference")); } - public void testBug316610_02() throws Exception { + @Test public void testBug316610_02() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'http://www.eclipse.org/xtext/common/JavaVMTypes' as types\n" + @@ -1496,7 +1497,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().get(0).getMessage().contains("JvmTypeReference")); } - public void testBug316610_03() throws Exception { + @Test public void testBug316610_03() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'http://www.eclipse.org/xtext/common/JavaVMTypes' as types\n" + @@ -1505,7 +1506,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().get(0).getMessage().contains("cardinality")); } - public void testBug316610_04() throws Exception { + @Test public void testBug316610_04() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.enumrules.EnumRulesTestLanguage\n" + "import 'http://www.eclipse.org/xtext/common/JavaVMTypes' as types\n" + @@ -1514,7 +1515,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertTrue(resource.getErrors().get(0).getMessage().contains("containment")); } - public void testBug346035_01() throws Exception { + @Test public void testBug346035_01() throws Exception { final String grammarAsString = "grammar test with org.eclipse.xtext.common.Terminals\n" + "import 'platform:/resource/org.eclipse.xtext.xbase/model/Xbase.ecore' as xbase\n" + @@ -1525,7 +1526,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { getResourceFromString(grammarAsString); } - public void testBug346685_a01() throws Exception { + @Test public void testBug346685_a01() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB ({TypeC.x=current} 'x' | {TypeD.x=current} 'y')? name+=STRING;"; @@ -1553,7 +1554,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a02() throws Exception { + @Test public void testBug346685_a02() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB ({TypeC.x=current} 'x' | {TypeD.x=current} 'y') name+=STRING;"; @@ -1582,7 +1583,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(2, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a03() throws Exception { + @Test public void testBug346685_a03() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB ({TypeC.x=current} 'x' | {TypeD.x=current} 'y')? name+=STRING;"; @@ -1610,7 +1611,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a04() throws Exception { + @Test public void testBug346685_a04() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB ({TypeC.x=current} 'x' | {TypeD.x=current} 'y') name+=STRING;"; @@ -1638,7 +1639,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a05() throws Exception { + @Test public void testBug346685_a05() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB? ({TypeC.x=current} 'x' | {TypeD.x=current} 'y')? name+=STRING;"; @@ -1666,7 +1667,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a06() throws Exception { + @Test public void testBug346685_a06() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB? ({TypeC.x=current} 'x' | {TypeD.x=current} 'y') name+=STRING;"; @@ -1695,7 +1696,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(2, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a07() throws Exception { + @Test public void testBug346685_a07() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB? ({TypeC.x=current} 'x' | {TypeD.x=current} 'y')? name+=STRING;"; @@ -1723,7 +1724,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a08() throws Exception { + @Test public void testBug346685_a08() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB? ({TypeC.x=current} 'x' | {TypeD.x=current} 'y') name+=STRING;"; @@ -1751,7 +1752,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a09() throws Exception { + @Test public void testBug346685_a09() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB ({TypeC.x=current} 'x' | {TypeD.x=current} 'y' | 'z')? name+=STRING;"; @@ -1779,7 +1780,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_a10() throws Exception { + @Test public void testBug346685_a10() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " RuleA returns TypeA: RuleB ({TypeC.x=current} 'x' | {TypeD.x=current} 'y' | 'z') name+=STRING;"; @@ -1807,7 +1808,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(1, typeD.getEStructuralFeatures().size()); } - public void testBug346685_b01() throws Exception { + @Test public void testBug346685_b01() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " Model: A ({D.a = current} b = B)? c=C? ;\n"; @@ -1844,7 +1845,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(2, typeD.getEStructuralFeatures().size()); } - public void testBug346685_b02() throws Exception { + @Test public void testBug346685_b02() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " Model: A ({D.a = current} b = B) c=C? ;\n"; @@ -1881,7 +1882,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(3, typeD.getEStructuralFeatures().size()); } - public void testBug346685_b03() throws Exception { + @Test public void testBug346685_b03() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " Model: A? ({D.a = current} b = B)? c=C? ;\n"; @@ -1918,7 +1919,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(2, typeD.getEStructuralFeatures().size()); } - public void testBug346685_b04() throws Exception { + @Test public void testBug346685_b04() throws Exception { String grammar = "grammar test with org.eclipse.xtext.common.Terminals" + " generate test 'http://test'"; grammar += " Model: A? ({D.a = current} b = B) c=C? ;\n"; @@ -1955,7 +1956,7 @@ public class Xtext2EcoreTransformerTest extends AbstractXtextTests { assertEquals(3, typeD.getEStructuralFeatures().size()); } - public void testEcoreReference_01() throws Exception { + @Test public void testEcoreReference_01() throws Exception { EcoreSupportStandaloneSetup.setup(); XtextResourceSet resourceSet = new XtextResourceSet(); resourceSet.setClasspathURIContext(getClass());