From 4d0c6570d713ea06a61ee3526aba21fb20052436 Mon Sep 17 00:00:00 2001
From: jkohnlein <jkohnlein>
Date: Tue, 22 Jul 2008 09:24:48 +0000
Subject: [PATCH] Added test suite and reactivated test.xml

---
 .../customBuildCallbacks.xml                  |  2 +-
 .../src/org/eclipse/xtext/AllTests.java       | 28 +++++++++++++++++++
 .../test.xml                                  |  3 +-
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java

diff --git a/tests/org.eclipse.xtext.generator.tests/customBuildCallbacks.xml b/tests/org.eclipse.xtext.generator.tests/customBuildCallbacks.xml
index 06aea70a5..f0e05e511 100755
--- a/tests/org.eclipse.xtext.generator.tests/customBuildCallbacks.xml
+++ b/tests/org.eclipse.xtext.generator.tests/customBuildCallbacks.xml
@@ -16,7 +16,7 @@
 <!-- ===================================================================== -->
 <project name="Build specific targets and properties" default="regenerateAll">
 
-	<taskdef resource="net/sf/ant4eclipse/antlib.xml" />
+	<!--<taskdef resource="net/sf/ant4eclipse/antlib.xml" />-->
 	
 	<property name="targetPlatformLocation" value="${basedir}/../../eclipse"/>
 	
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
new file mode 100644
index 000000000..c2ce0958c
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * 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/test.xml b/tests/org.eclipse.xtext.generator.tests/test.xml
index 48005c860..e6ba74e46 100644
--- a/tests/org.eclipse.xtext.generator.tests/test.xml
+++ b/tests/org.eclipse.xtext.generator.tests/test.xml
@@ -36,7 +36,8 @@
 	<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}">
+		<ant target="java-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="timeout" value="100000"/>
 			<property name="data-dir" value="${test-folder}" />
 			<property name="plugin-name" value="${plugin-name}" />
 			<property name="classname" value="${classname}" />