diff --git a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/xtextgrammar/XtextGrammarTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/xtextgrammar/XtextGrammarTestLanguage.mwe2 index 404a84d2a..9a23587d2 100644 --- a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/xtextgrammar/XtextGrammarTestLanguage.mwe2 +++ b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/xtextgrammar/XtextGrammarTestLanguage.mwe2 @@ -62,7 +62,7 @@ XtextGeneratorLanguage { // provides a compare view fragment = ui.compare.CompareFragment2 auto-inject {} - fragment = junit.Junit4Fragment2 auto-inject { + fragment = junit.JUnitFragment auto-inject { skipXbaseTestingPackage = true } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 index fb3c266c7..92932d308 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 @@ -116,7 +116,7 @@ Workflow { } language = { grammarUri = "classpath:/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext" - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } fragment = @TestLanguagesFragments {} @@ -339,7 +339,7 @@ Workflow { fragment = @TestLanguagesFragments auto-inject { generateStub = true } - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } @@ -348,7 +348,7 @@ Workflow { fragment = @TestLanguagesFragments auto-inject { generateStub = true } - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } @@ -357,7 +357,7 @@ Workflow { fragment = @TestLanguagesFragments auto-inject { generateStub = true } - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } @@ -368,28 +368,28 @@ Workflow { language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } @@ -449,14 +449,14 @@ Workflow { language = { grammarUri = "classpath:/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } @@ -479,7 +479,7 @@ Workflow { language = { grammarUri = "classpath:/org/eclipse/xtext/serializer/SequencerTestLanguage.xtext" fragment = @TestLanguagesFragments {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 index 968c2352a..1693a6ac6 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 @@ -50,14 +50,14 @@ Workflow { language = { grammarUri = "classpath:/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext" fragment = @TestLanguagesFragments auto-inject {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 index 7ac166c0f..029d19497 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 @@ -104,7 +104,7 @@ Workflow { language = { grammarUri = "classpath:/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext" referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel" - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } fragment = @TestLanguagesFragments {} diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 index 4d1c5c104..39cba17ad 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 @@ -53,7 +53,7 @@ Workflow { fragment = @TestLanguagesFragments auto-inject { generateStub = true } - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } @@ -62,7 +62,7 @@ Workflow { fragment = @TestLanguagesFragments auto-inject { generateStub = true } - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 index f632abdc8..46d73ad63 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 @@ -52,7 +52,7 @@ Workflow { fragment = @TestLanguagesFragments auto-inject { generateStub = true } - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 index 18c013fe6..5f2707b64 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 @@ -50,28 +50,28 @@ Workflow { language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtext" fragment = @TestLanguagesFragments {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext" fragment = @TestLanguagesFragments {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext" fragment = @TestLanguagesFragments {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } } language = { grammarUri = "classpath:/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext" fragment = @TestLanguagesFragments {} - fragment = junit.Junit4Fragment2 { + fragment = junit.JUnitFragment { generateStub = false } }