From f35feb69e0836522a1718806bd865a8369f757ca Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Fri, 25 Nov 2016 15:31:52 +0100 Subject: [PATCH] changed names of JUnit test cases So that they match what surefire expects by default Change-Id: I249e39e91c2d1f38fba56362ed2e9a0fad6dd4fe --- dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml | 8 -- ....xtend => EmfParsleyDslAbstractTest.xtend} | 41 +++++----- .../dsl/tests/EmfParsleyDslAllTests.java | 28 +++---- ...xtend => EmfParsleyDslFormatterTest.xtend} | 6 +- ...xtend => EmfParsleyDslGeneratorTest.xtend} | 8 +- ... => EmfParsleyDslGeneratorUtilsTest.xtend} | 2 +- ... EmfParsleyDslGuiceModuleHelperTest.xtend} | 10 +-- ...=> EmfParsleyDslNewProjectFilesTest.xtend} | 2 +- ...=> EmfParsleyDslOrganizeImportsTest.xtend} | 8 +- .../dsl/tests/EmfParsleyDslParsingTest.xtend | 2 +- ...EmfParsleyDslPluginXmlGeneratorTest.xtend} | 6 +- ...=> EmfParsleyDslPluginXmlLoaderTest.xtend} | 2 +- .../EmfParsleyDslProjectWizardAllTests.java | 8 +- ...s.xtend => EmfParsleyDslScopingTest.xtend} | 6 +- ...sts.xtend => EmfParsleyDslSmokeTest.xtend} | 74 +++++++++---------- ...xtend => EmfParsleyDslValidatorTest.xtend} | 8 +- ...arsleyProjectFilesGeneratorUtilTest.xtend} | 2 +- ...plateWizardConfigurationFactoryTest.xtend} | 4 +- ...sleyTemplateWizardConfigurationTest.xtend} | 2 +- 19 files changed, 109 insertions(+), 118 deletions(-) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslAbstractTests.xtend => EmfParsleyDslAbstractTest.xtend} (84%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslFormatterTests.xtend => EmfParsleyDslFormatterTest.xtend} (99%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslGeneratorTests.xtend => EmfParsleyDslGeneratorTest.xtend} (99%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslGeneratorUtilsTests.xtend => EmfParsleyDslGeneratorUtilsTest.xtend} (96%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslGuiceModuleHelperTests.xtend => EmfParsleyDslGuiceModuleHelperTest.xtend} (96%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslNewProjectFilesTests.xtend => EmfParsleyDslNewProjectFilesTest.xtend} (98%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslOrganizeImportsTests.xtend => EmfParsleyDslOrganizeImportsTest.xtend} (96%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslPluginXmlGeneratorTests.xtend => EmfParsleyDslPluginXmlGeneratorTest.xtend} (96%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslPluginXmlLoaderTests.xtend => EmfParsleyDslPluginXmlLoaderTest.xtend} (99%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslScopingTests.xtend => EmfParsleyDslScopingTest.xtend} (93%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslSmokeTests.xtend => EmfParsleyDslSmokeTest.xtend} (82%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyDslValidatorTests.xtend => EmfParsleyDslValidatorTest.xtend} (99%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyProjectFilesGeneratorUtilTests.xtend => EmfParsleyProjectFilesGeneratorUtilTest.xtend} (96%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyTemplateWizardConfigurationFactoryTests.xtend => EmfParsleyTemplateWizardConfigurationFactoryTest.xtend} (99%) rename dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/{EmfParsleyTemplateWizardConfigurationTests.xtend => EmfParsleyTemplateWizardConfigurationTest.xtend} (98%) diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml index 2ecbaa7d9..eea9b0546 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml @@ -40,14 +40,6 @@ ${tycho.testArgLine} ${memoryArgs} - - **/org/eclipse/emf/parsley/dsl/tests/*Tests.java - **/org/eclipse/emf/parsley/dsl/tests/*Test.java - - - **/org/eclipse/emf/parsley/dsl/tests/*AllTests.java - **/org/eclipse/emf/parsley/dsl/tests/*AbstractTests.java - test diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAbstractTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAbstractTest.xtend similarity index 84% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAbstractTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAbstractTest.xtend index 6b055bd3f..8901cb894 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAbstractTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAbstractTest.xtend @@ -24,48 +24,47 @@ import org.junit.runner.RunWith import static extension org.junit.Assert.* -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslAbstractTests { - +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +abstract class EmfParsleyDslAbstractTest { + @Inject protected TestInputs inputs - + @Inject protected TestInputsWithErrors inputsWithErrors - + @Inject extension ParseHelper - - @Inject extension ValidationTestHelper - - @BeforeClass + + @Inject extension ValidationTestHelper + + @BeforeClass def static void setCRLF() { System::setProperty("line.separator", "\n") } - - def parseAndAssertNoError(CharSequence s) { + + def parseAndAssertNoError(CharSequence s) { var ts = s.parse ts.assertNoErrors ts } - - def parseAndAssertError(CharSequence s, EClass objectType, String code, - String messagePart) { - s.parse.assertError(objectType, code, messagePart) + + def parseAndAssertError(CharSequence s, EClass objectType, String code, String messagePart) { + s.parse.assertError(objectType, code, messagePart) } - + def parseModel(CharSequence s) { s.parse } - + def parseAndAssertErrors(CharSequence s) { (s.parse.validate.size > 0).assertTrue } - + def module(CharSequence s) { s.parseAndAssertNoError.module } - + def assertEqualsStrings(Object expected, Object actual) { assertEquals("" + expected, "" + actual) } @@ -73,4 +72,4 @@ class EmfParsleyDslAbstractTests { def partSpecification(CharSequence s) { s.module.partsSpecifications.parts.head } -} \ No newline at end of file +} diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAllTests.java b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAllTests.java index 738d3bf5c..c97dc4d80 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAllTests.java +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslAllTests.java @@ -19,21 +19,21 @@ */ @RunWith(Suite.class) @Suite.SuiteClasses({ - EmfParsleyDslGeneratorUtilsTests.class, + EmfParsleyDslGeneratorUtilsTest.class, EmfParsleyDslParsingTest.class, - EmfParsleyDslGuiceModuleHelperTests.class, - EmfParsleyDslSmokeTests.class, - EmfParsleyDslScopingTests.class, - EmfParsleyDslValidatorTests.class, - EmfParsleyDslPluginXmlGeneratorTests.class, - EmfParsleyDslGeneratorTests.class, - EmfParsleyDslOrganizeImportsTests.class, - EmfParsleyDslNewProjectFilesTests.class, - EmfParsleyProjectFilesGeneratorUtilTests.class, - EmfParsleyTemplateWizardConfigurationTests.class, - EmfParsleyTemplateWizardConfigurationFactoryTests.class, - EmfParsleyDslFormatterTests.class, - EmfParsleyDslPluginXmlLoaderTests.class + EmfParsleyDslGuiceModuleHelperTest.class, + EmfParsleyDslSmokeTest.class, + EmfParsleyDslScopingTest.class, + EmfParsleyDslValidatorTest.class, + EmfParsleyDslPluginXmlGeneratorTest.class, + EmfParsleyDslGeneratorTest.class, + EmfParsleyDslOrganizeImportsTest.class, + EmfParsleyDslNewProjectFilesTest.class, + EmfParsleyProjectFilesGeneratorUtilTest.class, + EmfParsleyTemplateWizardConfigurationTest.class, + EmfParsleyTemplateWizardConfigurationFactoryTest.class, + EmfParsleyDslFormatterTest.class, + EmfParsleyDslPluginXmlLoaderTest.class }) public class EmfParsleyDslAllTests { diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTest.xtend similarity index 99% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTest.xtend index f68e036e5..4c0132734 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTest.xtend @@ -17,9 +17,9 @@ import org.eclipse.xtext.junit4.formatter.FormatterTester import org.junit.Test import org.junit.runner.RunWith -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslFormatterTests extends EmfParsleyDslAbstractTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslFormatterTest extends EmfParsleyDslAbstractTest { @Inject extension FormatterTester diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorTest.xtend similarity index 99% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorTest.xtend index 5ea94ae0a..bdb27d58d 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorTest.xtend @@ -26,13 +26,13 @@ import org.junit.runner.RunWith import static org.junit.Assert.* -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProviderCustom)) -class EmfParsleyDslGeneratorTests extends EmfParsleyDslAbstractTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProviderCustom) +class EmfParsleyDslGeneratorTest extends EmfParsleyDslAbstractTest { @Rule @Inject public TemporaryFolder temporaryFolder - + @Inject extension CompilationTestHelper @Test diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorUtilsTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorUtilsTest.xtend similarity index 96% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorUtilsTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorUtilsTest.xtend index 15e1d17ff..821752182 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorUtilsTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGeneratorUtilsTest.xtend @@ -15,7 +15,7 @@ import org.junit.Test import static extension org.junit.Assert.* import org.eclipse.emf.parsley.dsl.jvmmodel.EmfParsleyDslGeneratorUtils -class EmfParsleyDslGeneratorUtilsTests { +class EmfParsleyDslGeneratorUtilsTest { extension EmfParsleyDslGeneratorUtils utils = new EmfParsleyDslGeneratorUtils diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend similarity index 96% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend index c8746fa42..cdaf7c822 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend @@ -21,13 +21,13 @@ import org.junit.runner.RunWith import static extension org.junit.Assert.* -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslGuiceModuleHelperTests extends EmfParsleyDslAbstractTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslGuiceModuleHelperTest extends EmfParsleyDslAbstractTest { @Inject extension ParseHelper - @Inject extension EmfParsleyDslGuiceModuleHelper - + @Inject extension EmfParsleyDslGuiceModuleHelper + @Test def void testModuleWithNoNameInferredType() { ''' diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslNewProjectFilesTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslNewProjectFilesTest.xtend similarity index 98% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslNewProjectFilesTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslNewProjectFilesTest.xtend index 4df866e49..483f685ad 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslNewProjectFilesTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslNewProjectFilesTest.xtend @@ -8,7 +8,7 @@ import static extension org.junit.Assert.* /** * @author Lorenzo Bettini - Initial contribution and API */ -class EmfParsleyDslNewProjectFilesTests { +class EmfParsleyDslNewProjectFilesTest { val generator = new EmfParsleyDslNewProjectFiles diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslOrganizeImportsTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslOrganizeImportsTest.xtend similarity index 96% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslOrganizeImportsTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslOrganizeImportsTest.xtend index 59f287f8e..0321c30c5 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslOrganizeImportsTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslOrganizeImportsTest.xtend @@ -26,10 +26,10 @@ import static org.junit.Assert.* /** * @author Lorenzo Bettini - inspired by the Xtext Domainmodel example */ -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslOrganizeImportsTests { - +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslOrganizeImportsTest { + @Inject extension ParseHelper @Inject ImportOrganizer importOrganizer diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslParsingTest.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslParsingTest.xtend index 8e58f0937..93615d7a6 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslParsingTest.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslParsingTest.xtend @@ -14,7 +14,7 @@ import org.junit.runner.RunWith @RunWith(XtextRunner) @InjectWith(EmfParsleyDslInjectorProvider) -class EmfParsleyDslParsingTest extends EmfParsleyDslAbstractTests { +class EmfParsleyDslParsingTest extends EmfParsleyDslAbstractTest { @Inject extension ValidationTestHelper diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlGeneratorTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlGeneratorTest.xtend similarity index 96% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlGeneratorTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlGeneratorTest.xtend index e7886360a..380389517 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlGeneratorTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlGeneratorTest.xtend @@ -21,9 +21,9 @@ import org.eclipse.xtext.junit4.XtextRunner import org.junit.Test import org.junit.runner.RunWith -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslPluginXmlGeneratorTests extends EmfParsleyDslAbstractTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslPluginXmlGeneratorTest extends EmfParsleyDslAbstractTest { @Inject EmfParsleyDslPluginXmlGenerator pluginXmlGenerator diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlLoaderTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlLoaderTest.xtend similarity index 99% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlLoaderTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlLoaderTest.xtend index fd39589c3..d10d2ee70 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlLoaderTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslPluginXmlLoaderTest.xtend @@ -10,7 +10,7 @@ import static extension org.junit.Assert.* import org.eclipse.xtend2.lib.StringConcatenation import org.eclipse.emf.parsley.dsl.pluginxml.PluginXmlUtils -class EmfParsleyDslPluginXmlLoaderTests { +class EmfParsleyDslPluginXmlLoaderTest { new() { // to avoid missed code coverage for the protected constructor diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslProjectWizardAllTests.java b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslProjectWizardAllTests.java index d017e4033..58d5fb174 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslProjectWizardAllTests.java +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslProjectWizardAllTests.java @@ -19,10 +19,10 @@ */ @RunWith(Suite.class) @Suite.SuiteClasses({ - EmfParsleyDslNewProjectFilesTests.class, - EmfParsleyProjectFilesGeneratorUtilTests.class, - EmfParsleyTemplateWizardConfigurationTests.class, - EmfParsleyTemplateWizardConfigurationFactoryTests.class + EmfParsleyDslNewProjectFilesTest.class, + EmfParsleyProjectFilesGeneratorUtilTest.class, + EmfParsleyTemplateWizardConfigurationTest.class, + EmfParsleyTemplateWizardConfigurationFactoryTest.class }) public class EmfParsleyDslProjectWizardAllTests { diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslScopingTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslScopingTest.xtend similarity index 93% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslScopingTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslScopingTest.xtend index fbd227a27..edc4736ef 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslScopingTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslScopingTest.xtend @@ -22,9 +22,9 @@ import org.junit.runner.RunWith import static org.junit.Assert.* -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslScopingTests extends EmfParsleyDslAbstractTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslScopingTest extends EmfParsleyDslAbstractTest { @Inject extension IScopeProvider diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslSmokeTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslSmokeTest.xtend similarity index 82% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslSmokeTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslSmokeTest.xtend index 8c28e03ed..874422eee 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslSmokeTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslSmokeTest.xtend @@ -28,31 +28,31 @@ import org.junit.runner.RunWith import static org.junit.Assert.* -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslSmokeTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslSmokeTest { @Inject extension ParseHelper - @Inject extension ValidationTestHelper - - private final static Logger LOG = Logger.getLogger(JvmModelAssociator); + @Inject extension ValidationTestHelper + + private final static Logger LOG = Logger.getLogger(JvmModelAssociator); /** * JvmModelAssociator does not throw exceptions but logs possible * errors; we use this class to record possible error events */ static class LogListener extends ConsoleAppender { - + val public events = newArrayList() - + override doAppend(LoggingEvent event) { if (event.getLevel == Level.ERROR) { events += event } } - + } - + var LogListener logListener @Before @@ -70,80 +70,80 @@ class EmfParsleyDslSmokeTests { @Test def void testModuleWithNoName() { ''' - module + module '''.assertNoException } @Test def void testExtendsWithoutType() { ''' - module my.empty extends + module my.empty extends '''.assertNoException } @Test def void testTypeBindingWithNoType() { ''' - module my.empty { - bindings { - type + module my.empty { + bindings { + type + } } - } '''.assertNoException } @Test def void testProviderBindingWithNoType() { ''' - module my.empty { - bindings { - provide + module my.empty { + bindings { + provide + } } - } '''.assertNoException } @Test def void testValueBindingWithNoType() { ''' - module my.empty { - bindings { - value + module my.empty { + bindings { + value + } } - } '''.assertNoException } @Test def void testValueBindingWithUnknownType() { ''' - module my.empty { - bindings { - value Foo TableColumnWeights + module my.empty { + bindings { + value Foo TableColumnWeights + } } - } '''.assertNoException } @Test def void testResourceManagerInitializeWithNoBody() { ''' - module my.empty { - resourceManager { - initializeResource + module my.empty { + resourceManager { + initializeResource + } } - } '''.assertNoException } @Test def void testResourceManagerSaveWithNoBody() { ''' - module my.empty { - resourceManager { - saveSave + module my.empty { + resourceManager { + saveSave + } } - } '''.assertNoException } @@ -152,4 +152,4 @@ class EmfParsleyDslSmokeTests { // there must be no error in the log either assertTrue("Some error was reported in the LOG", logListener.events.empty) } -} \ No newline at end of file +} diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslValidatorTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslValidatorTest.xtend similarity index 99% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslValidatorTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslValidatorTest.xtend index e218153f8..702a3e8fe 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslValidatorTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslValidatorTest.xtend @@ -49,12 +49,12 @@ import static org.eclipse.emf.parsley.dsl.validation.EmfParsleyDslValidator.* import static extension org.junit.Assert.* -@RunWith(typeof(XtextRunner)) -@InjectWith(typeof(EmfParsleyDslInjectorProvider)) -class EmfParsleyDslValidatorTests extends EmfParsleyDslAbstractTests { +@RunWith(XtextRunner) +@InjectWith(EmfParsleyDslInjectorProvider) +class EmfParsleyDslValidatorTest extends EmfParsleyDslAbstractTest { @Inject extension ParseHelper - @Inject extension ValidationTestHelper + @Inject extension ValidationTestHelper @Test def void testViewSpecificationIsNotIViewPart() { diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyProjectFilesGeneratorUtilTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyProjectFilesGeneratorUtilTest.xtend similarity index 96% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyProjectFilesGeneratorUtilTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyProjectFilesGeneratorUtilTest.xtend index df9c9ee35..7cede018f 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyProjectFilesGeneratorUtilTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyProjectFilesGeneratorUtilTest.xtend @@ -8,7 +8,7 @@ import static extension org.junit.Assert.* /** * @author Lorenzo Bettini - Initial contribution and API */ -class EmfParsleyProjectFilesGeneratorUtilTests { +class EmfParsleyProjectFilesGeneratorUtilTest { new() { // to avoid missed code coverage for the protected constructor diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationFactoryTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationFactoryTest.xtend similarity index 99% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationFactoryTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationFactoryTest.xtend index bd4d86fb4..9b67c4f24 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationFactoryTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationFactoryTest.xtend @@ -10,10 +10,10 @@ import static extension org.junit.Assert.* /** * @author Lorenzo Bettini - Initial contribution and API */ -class EmfParsleyTemplateWizardConfigurationFactoryTests { +class EmfParsleyTemplateWizardConfigurationFactoryTest { var List configurations; - + new() { configurations = new TemplateWizardConfigurationsFactory().createTemplateWizardConfigurations } diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationTest.xtend similarity index 98% rename from dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationTests.xtend rename to dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationTest.xtend index 622954ab8..3350251d2 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationTests.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyTemplateWizardConfigurationTest.xtend @@ -9,7 +9,7 @@ import org.eclipse.emf.parsley.views.SaveableTreeView /** * @author Lorenzo Bettini - Initial contribution and API */ -class EmfParsleyTemplateWizardConfigurationTests { +class EmfParsleyTemplateWizardConfigurationTest { @Test def void testPartClassName() {