From 4e2e599f178f2e7d9b623acf31540fe182fce831 Mon Sep 17 00:00:00 2001
From: jkohnlein <jkohnlein>
Date: Tue, 22 Jul 2008 14:36:39 +0000
Subject: [PATCH] Added text.xml and auto test suites

---
 .../src/org/eclipse/xtext/AllTests.java       | 28 ---------
 .../xtext/generator/AutoTestSuite.java        | 41 ++++++++++++
 .../test.xml                                  |  2 +-
 .../src/org/eclipse/xtext/AutoTestSuite.java  | 13 ++++
 .../org/eclipse/xtext/resource/AllTests.java  | 28 ---------
 tests/org.eclipse.xtext.tests/test.xml        | 62 +++++++++++++++++++
 6 files changed, 117 insertions(+), 57 deletions(-)
 delete mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
 create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/AutoTestSuite.java
 create mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AutoTestSuite.java
 delete mode 100644 tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/AllTests.java
 create mode 100644 tests/org.eclipse.xtext.tests/test.xml

diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
deleted file mode 100644
index c2ce0958c..000000000
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
+++ /dev/null
@@ -1,28 +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;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Jan Köhnlein - Initial contribution and API
- *
- */
-public class AllTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.xtext");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(XtextGrammarTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/AutoTestSuite.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/AutoTestSuite.java
new file mode 100644
index 000000000..c39047e7c
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/AutoTestSuite.java
@@ -0,0 +1,41 @@
+package org.eclipse.xtext.generator;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AutoTestSuite {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("org.eclipse.xtext.generator.tests");
+		suite.addTestSuite(org.eclipse.xtext.XtextGrammarTest.class);
+		suite.addTestSuite(org.eclipse.xtext.generator.resource.ResourceTest.class);
+		suite.addTestSuite(org.eclipse.xtext.grammarinheritance.InheritanceTest.class);
+		suite.addTestSuite(org.eclipse.xtext.grammarinheritance.ToEcoreTrafoTest.class);
+		suite.addTestSuite(org.eclipse.xtext.lexer.LexerSLComment.class);
+		suite.addTestSuite(org.eclipse.xtext.lexer.LexerErrorTest.class);
+		suite.addTestSuite(org.eclipse.xtext.metamodelreferencing.tests.MultiGenMMTest.class);
+		suite.addTestSuite(org.eclipse.xtext.metamodelreferencing.tests.MetamodelRefTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parseerrorhandling.ParseErrorHandlingTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parser.PartialParserTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parser.PartialParsingPointerTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parser.XtextParserTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parser.PartialParsingPerformanceTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parser.PartialParserReplaceTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.HiddenTokensTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.CommentTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.ASTChangeTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.SerializeTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.NodeModelTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.NodeContentAdapterTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.LengthOffsetLineTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.InvalidTokenTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.EmptyModelTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.reconstr.ComplexReconstrTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.reconstr.SimpleReconstrTest.class);
+		suite.addTestSuite(org.eclipse.xtext.parsetree.reconstr.WhitespacePreservingCallbackTest.class);
+		suite.addTestSuite(org.eclipse.xtext.typeresolution.XtextUtilConstructionTest.class);
+		suite.addTestSuite(org.eclipse.xtext.xtext2ecore.ActionTest.class);
+		suite.addTestSuite(org.eclipse.xtext.xtext2ecore.MultiEPackagesTest.class);
+		return suite;
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/test.xml b/tests/org.eclipse.xtext.generator.tests/test.xml
index 48005c860..073d4ba15 100644
--- a/tests/org.eclipse.xtext.generator.tests/test.xml
+++ b/tests/org.eclipse.xtext.generator.tests/test.xml
@@ -23,7 +23,7 @@
 	<!-- all tests that are to be run. Initialization for individual tests -->
 	<!-- should be done within the body of the suite target. -->
 	<target name="init">
-		<property name="classname" value="org.eclipse.xtext.AllTests" />
+		<property name="classname" value="org.eclipse.xtext.generator.AutoTestSuite" />
 		<tstamp />
 		<delete>
 			<fileset dir="${eclipse-home}" includes="org*.xml" />
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AutoTestSuite.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AutoTestSuite.java
new file mode 100644
index 000000000..e529eb077
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/AutoTestSuite.java
@@ -0,0 +1,13 @@
+package org.eclipse.xtext;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AutoTestSuite {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("org.eclipse.xtext.tests");
+		suite.addTestSuite(org.eclipse.xtext.resource.ClassloaderClasspathUriResolverTests.class);
+		return suite;
+	}
+}
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/AllTests.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/AllTests.java
deleted file mode 100644
index b1c252252..000000000
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/AllTests.java
+++ /dev/null
@@ -1,28 +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.resource;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Jan Köhnlein - Initial contribution and API
- *
- */
-public class AllTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.xtext.resource");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(ClassloaderClasspathUriResolverTests.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}
diff --git a/tests/org.eclipse.xtext.tests/test.xml b/tests/org.eclipse.xtext.tests/test.xml
new file mode 100644
index 000000000..e0c03942d
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/test.xml
@@ -0,0 +1,62 @@
+<?xml version="1.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
+ *
+ *******************************************************************************
+-->
+	
+<project name="testsuite" default="run" basedir=".">
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}\..\.." />
+
+	<!-- sets the properties plugin-name, and library-file -->
+	<property name="plugin-name" value="org.eclipse.xtext.tests" />
+	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<property name="classname" value="org.eclipse.xtext.AutoTestSuite" />
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- Don't modify anything after this point -->
+	
+	<!-- This target defines the tests that need to be run. -->
+	<target name="suite">
+		<property name="test-folder" value="${eclipse-home}/test_folder" />
+		<delete dir="${test-folder}" quiet="true" />
+		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${test-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+</project>
\ No newline at end of file