IDE-2453: Add test discovery tests for N4JSX

Quang Tran · Quang Tran · commit 32a6fc60be1f · 2016-12-16T19:32:26.000+01:00
diff --git a/plugins/eu.numberfour.n4js.tester/src/eu/numberfour/n4js/tester/TestDiscoveryHelper.java b/plugins/eu.numberfour.n4js.tester/src/eu/numberfour/n4js/tester/TestDiscoveryHelper.java
@@ -18,7 +18,6 @@
 import static com.google.common.collect.Maps.newHashMap;
 import static com.google.common.collect.Sets.newHashSet;
 import static eu.numberfour.n4js.AnnotationDefinition.TEST_METHOD;
-import static eu.numberfour.n4js.N4JSGlobals.N4JS_FILE_EXTENSION;
 import static eu.numberfour.n4js.resource.N4JSResourceDescriptionStrategy.ABSTRACT_KEY;
 import static eu.numberfour.n4js.resource.N4JSResourceDescriptionStrategy.EXPORTED_CLASS_KEY;
 import static eu.numberfour.n4js.resource.N4JSResourceDescriptionStrategy.TEST_CLASS_KEY;
@@ -306,7 +305,10 @@ private TestTree collectTests(final ResourceSet resSet, final IResourceDescripti
 		if (locations.length > 0) {
 			final URI uri = locations[0];
 			name = valueOf(uri.trimFragment()).replaceFirst("platform:/resource/", "");
-			name = name.replace("." + N4JS_FILE_EXTENSION, "");
+			// name = name.replace("." + N4JS_FILE_EXTENSION, "");
+			if (name.lastIndexOf('.') > 0) {
+				name = name.substring(0, name.lastIndexOf('.'));
+			}
 			// Assuming one single test case.
 			if (uri.hasFragment() && !suites.isEmpty() && !suites.get(0).getTestCases().isEmpty()) {
 				name = name + "#" + suites.get(0).getTestCases().get(0).getDisplayName();
diff --git a/plugins/eu.numberfour.n4js.tester/src/eu/numberfour/n4js/tester/extension/TestFileExtensionsRegistry.java b/plugins/eu.numberfour.n4js.tester/src/eu/numberfour/n4js/tester/extension/TestFileExtensionsRegistry.java
@@ -77,4 +77,11 @@ private void initialize() {
 		}
 	}
 
+	/**
+	 * Reset the list of test file extensions to empty
+	 */
+	public void reset() {
+		isInitialized = false;
+		testFileExtensions.clear();
+	}
 }
diff --git a/plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/internal/N4JSRuntimeCore.java b/plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/internal/N4JSRuntimeCore.java
@@ -143,7 +143,11 @@ private void createAllResourcesWorkspace(ResourceSet resourceSet) {
 		}
 	}
 
-	private boolean isN4File(final URI uri) {
+	/**
+	 * Return true if the URI is a recognized N4 file. Sub-languages should override this method to provide additional
+	 * file extensions!
+	 */
+	protected boolean isN4File(final URI uri) {
 		final String ext = uri != null ? uri.fileExtension() : null;
 		return N4JSGlobals.ALL_N4_FILE_EXTENSIONS.contains(ext);
 	}
diff --git a/plugins/eu.numberfour.n4jsx/src/eu/numberfour/n4jsx/N4JSXGlobals.java b/plugins/eu.numberfour.n4jsx/src/eu/numberfour/n4jsx/N4JSXGlobals.java
@@ -10,6 +10,12 @@
  */
 package eu.numberfour.n4jsx;
 
+import static com.google.common.collect.Sets.newLinkedHashSet;
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableCollection;
+
+import java.util.Collection;
+
 /**
  * Globals for N4JSX sub-language
  */
@@ -25,6 +31,13 @@ public final class N4JSXGlobals {
 	 */
 	public static final String N4JSX_FILE_EXTENSION = "n4jsx";
 
+	/**
+	 * Unmodifiable list containing {@link #N4JSX_FILE_EXTENSION} and {@link #JSX_FILE_EXTENSION}.
+	 */
+	public static final Collection<String> ALL_JSX_FILE_EXTENSIONS = unmodifiableCollection(newLinkedHashSet(asList(
+			N4JSX_FILE_EXTENSION,
+			JSX_FILE_EXTENSION)));
+
 	private N4JSXGlobals() {
 		// private to prevent inheritance & instantiation.
 	}
diff --git a/plugins/eu.numberfour.n4jsx/src/eu/numberfour/n4jsx/internal/N4JSXRuntimeCore.java b/plugins/eu.numberfour.n4jsx/src/eu/numberfour/n4jsx/internal/N4JSXRuntimeCore.java
@@ -18,6 +18,7 @@
 import eu.numberfour.n4js.internal.FileBasedWorkspace;
 import eu.numberfour.n4js.internal.N4JSModel;
 import eu.numberfour.n4js.internal.N4JSRuntimeCore;
+import eu.numberfour.n4jsx.N4JSXGlobals;
 import eu.numberfour.n4jsx.validation.N4JSXResourceType;
 
 /**
@@ -51,4 +52,14 @@ protected boolean isJsFile(URI uri) {
 		}
 		return super.isJsFile(uri);
 	}
+
+	/**
+	 * Return true if the URI is a recognized N4 file. Provide .n4jsx and .jsx recognized file extensions file
+	 * extensions!
+	 */
+	@Override
+	protected boolean isN4File(final URI uri) {
+		final String ext = uri != null ? uri.fileExtension() : null;
+		return N4JSXGlobals.ALL_JSX_FILE_EXTENSIONS.contains(ext) || super.isN4File(uri);
+	}
 }
diff --git a/tests/eu.numberfour.n4js.tester.tests/META-INF/MANIFEST.MF b/tests/eu.numberfour.n4js.tester.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.numberfour.n4js.tester.tests.helper,
  com.google.guava,
  org.eclipse.xtend.lib,
- org.junit
+ org.junit,
+ eu.numberfour.n4jsx
 Import-Package: org.apache.log4j.varia;version="1.2.15"
diff --git a/tests/eu.numberfour.n4js.tester.tests/resources/test.discovery.example.project.n4jsx/manifest.n4mf b/tests/eu.numberfour.n4js.tester.tests/resources/test.discovery.example.project.n4jsx/manifest.n4mf
@@ -0,0 +1,11 @@
+ProjectId: test.discovery.example.project.n4jsx
+VendorId: eu.numberfour
+VendorName: "NumberFour AG"
+ProjectType: library
+ProjectVersion: 0.0.1-SNAPSHOT
+Output: "src-gen"
+Sources {
+	test { 
+		"src"
+	}
+}
diff --git a/tests/eu.numberfour.n4js.tester.tests/resources/test.discovery.example.project.n4jsx/src/path/to/the/source/TestClass_3.n4jsx b/tests/eu.numberfour.n4js.tester.tests/resources/test.discovery.example.project.n4jsx/src/path/to/the/source/TestClass_3.n4jsx
@@ -0,0 +1,21 @@
+export class D {
+	@Test
+	public foo(): void {
+	}
+
+	@Test
+	@Ignore
+	public bar(): void {
+	}
+}
+
+export class E {
+	@Test
+	public foo2(): void {
+	}
+
+	@Test
+	@Ignore
+	public bar2(): void {
+	}
+}
diff --git a/tests/eu.numberfour.n4js.tester.tests/resources/test.discovery.example.project.n4jsx/src/path/to/the/source/TestClass_4.n4js b/tests/eu.numberfour.n4js.tester.tests/resources/test.discovery.example.project.n4jsx/src/path/to/the/source/TestClass_4.n4js
@@ -0,0 +1,13 @@
+export class F {
+	@Test
+	public f1(): void {
+	}
+	
+	@Test
+	public f2(): void {
+	}
+	
+	@Test
+	public f3(): void {
+	}
+}
diff --git a/tests/eu.numberfour.n4js.tester.tests/src/eu/numberfour/n4js/tester/tests/discovery/HeadlessTestDiscoveryTest.java b/tests/eu.numberfour.n4js.tester.tests/src/eu/numberfour/n4js/tester/tests/discovery/HeadlessTestDiscoveryTest.java
@@ -36,15 +36,18 @@
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
-import eu.numberfour.n4js.N4JSStandaloneSetup;
+import eu.numberfour.n4js.N4JSGlobals;
 import eu.numberfour.n4js.internal.FileBasedWorkspace;
 import eu.numberfour.n4js.tester.TestDiscoveryHelper;
 import eu.numberfour.n4js.tester.TesterModule;
 import eu.numberfour.n4js.tester.domain.TestSuite;
 import eu.numberfour.n4js.tester.domain.TestTree;
+import eu.numberfour.n4js.tester.extension.TestFileExtensionsRegistry;
 import eu.numberfour.n4js.tester.tests.InjectedModules;
 import eu.numberfour.n4js.tester.tests.JUnitGuiceClassRunner;
 import eu.numberfour.n4js.tester.tests.WithParentInjector;
+import eu.numberfour.n4jsx.N4JSXGlobals;
+import eu.numberfour.n4jsx.N4JSXStandaloneSetup;
 
 /**
  * Class for testing the behavior of the {@link TestDiscoveryHelper} in headless mode.
@@ -69,15 +72,27 @@ public class HeadlessTestDiscoveryTest {
 	private static final File TEST_CLASS_FILE_IDEBUG_572 = new File(TEST_SRC_FOLDER_IDEBUG_572,
 			"/path/to/the/source/" + TEST_CLASS_2 + ".n4js");
 
+	// Test project with mxied N4JS and N4JSX
+	private static final String TEST_N4JSX_PROJECT_NAME = "test.discovery.example.project.n4jsx";
+	private static final File TEST_N4JSX_PROJECT = new File(RESOURCES_FOLDER + separator + TEST_N4JSX_PROJECT_NAME);
+
+	private static final String TEST_N4JSX_CLASS_3 = "TestClass_3";
+	private static final String TEST_N4JSX_CLASS_4 = "TestClass_4";
+	private static final File TEST_N4JSX_CLASS_FILE = new File(TEST_SRC_FOLDER,
+			"/path/to/the/source/" + TEST_N4JSX_CLASS_3 + ".n4jsx");
+
 	/***/
 	@WithParentInjector
 	public static Injector getParentInjector() {
-		return new N4JSStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new N4JSXStandaloneSetup().createInjectorAndDoEMFRegistration();
 	}
 
 	@Inject
 	private TestDiscoveryHelper helper;
 
+	@Inject
+	private TestFileExtensionsRegistry testFileExtensionsRegistry;
+
 	@Inject
 	private FileBasedWorkspace fbWorkspace;
 
@@ -86,6 +101,11 @@ public static Injector getParentInjector() {
 	public void prepareIN4JSCore() {
 		fbWorkspace.registerProject(URI.createFileURI(TEST_PROJECT.getAbsolutePath()));
 		fbWorkspace.registerProject(URI.createFileURI(TEST_PROJECT_IDEBUG_572.getAbsolutePath()));
+		fbWorkspace.registerProject(URI.createFileURI(TEST_N4JSX_PROJECT.getAbsolutePath()));
+		// Register test file extensions .n4js and .n4jsx
+		testFileExtensionsRegistry.reset();
+		testFileExtensionsRegistry.register(N4JSGlobals.N4JS_FILE_EXTENSION);
+		testFileExtensionsRegistry.register(N4JSXGlobals.N4JSX_FILE_EXTENSION);
 	}
 
 	/***/
@@ -218,6 +238,26 @@ public void testDiscoveryForExistingProjectFolderAndFile_WithExportFiltering() {
 		assertTestCaseCountForSuite(actual, TEST_SRC_STRUCTURE + "." + TEST_CLASS_1 + ".C", 1);
 	}
 
+	/** N4JSX test discovery tests */
+	@Test
+	public void testDiscoveryN4JSXExpectNonNullTestTree() {
+		assertNotNull(TEST_N4JSX_PROJECT + "", helper.collectTests(toURI(TEST_N4JSX_PROJECT)));
+	}
+
+	/***/
+	@Test
+	public void testDiscoveryN4JSXForSingleExistingProject() {
+		final TestTree actual = helper.collectTests(toURI(TEST_N4JSX_PROJECT));
+		assertTestSuiteCount(actual, 3);
+		assertTestSuiteNames(actual,
+				TEST_SRC_STRUCTURE + "." + TEST_N4JSX_CLASS_3 + ".D",
+				TEST_SRC_STRUCTURE + "." + TEST_N4JSX_CLASS_3 + ".E",
+				TEST_SRC_STRUCTURE + "." + TEST_N4JSX_CLASS_4 + ".F");
+		assertTestCaseCount(actual, 7);
+		assertTestCaseCountForSuite(actual, TEST_SRC_STRUCTURE + "." + TEST_N4JSX_CLASS_3 + ".D", 2);
+		assertTestCaseCountForSuite(actual, TEST_SRC_STRUCTURE + "." + TEST_N4JSX_CLASS_3 + ".E", 2);
+	}
+
 	private void assertTestSuiteCount(final TestTree actual, final int expected) {
 		assertNotNull(actual);
 		assertEquals(expected, actual.getSuites().size());

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,11 @@ private void initialize() {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ /**`
	`81`	`+ * Reset the list of test file extensions to empty`
	`82`	`+ */`
	`83`	`+ public void reset() {`
	`84`	`+ isInitialized = false;`
	`85`	`+ testFileExtensions.clear();`
	`86`	`+ }`
`80`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,11 @@ private void createAllResourcesWorkspace(ResourceSet resourceSet) {`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`		`- private boolean isN4File(final URI uri) {`
	`146`	`+ /**`
	`147`	`+ * Return true if the URI is a recognized N4 file. Sub-languages should override this method to provide additional`
	`148`	`+ * file extensions!`
	`149`	`+ */`
	`150`	`+ protected boolean isN4File(final URI uri) {`
`147`	`151`	`final String ext = uri != null ? uri.fileExtension() : null;`
`148`	`152`	`return N4JSGlobals.ALL_N4_FILE_EXTENSIONS.contains(ext);`
`149`	`153`	`}`