From c5912bbc8eaa3d25a6413becf440a743aa6e5e23 Mon Sep 17 00:00:00 2001
From: jkohnlein <jkohnlein>
Date: Wed, 23 Jul 2008 13:17:01 +0000
Subject: [PATCH] Completed test suite
---
.../src/org/eclipse/xtext/generator/AutoTestSuite.java | 3 +++
...fBug_234135.java => CommentOnEofBug_234135_Test.java} | 2 +-
...fNodeBug_234132.java => LeafNodeBug_234132_Test.java} | 2 +-
.../{TestBootstrapModel.java => BootstrapModelTest.java} | 9 +--------
4 files changed, 6 insertions(+), 10 deletions(-)
rename tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/{CommentOnEofBug_234135.java => CommentOnEofBug_234135_Test.java} (94%)
rename tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/{LeafNodeBug_234132.java => LeafNodeBug_234132_Test.java} (96%)
rename tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/{TestBootstrapModel.java => BootstrapModelTest.java} (93%)
mode change 100644 => 100755
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
index ebb7f8e65..eb3c56255 100644
--- 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
@@ -38,8 +38,11 @@ public class AutoTestSuite {
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.reference.CommentOnEofBug_234135_Test.class);
+ suite.addTestSuite(org.eclipse.xtext.reference.LeafNodeBug_234132_Test.class);
suite.addTestSuite(org.eclipse.xtext.typeresolution.XtextUtilConstructionTest.class);
suite.addTestSuite(org.eclipse.xtext.xtext2ecore.ActionTest.class);
+ suite.addTestSuite(org.eclipse.xtext.xtext2ecore.BootstrapModelTest.class);
suite.addTestSuite(org.eclipse.xtext.xtext2ecore.MultiEPackagesTest.class);
return suite;
}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java
similarity index 94%
rename from tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135.java
rename to tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java
index 07b50af99..bf2dda5c1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/CommentOnEofBug_234135_Test.java
@@ -19,7 +19,7 @@ import org.eclipse.xtext.tests.AbstractGeneratorTest;
* @author Jan K�hnlein - Initial contribution and API
*
*/
-public class CommentOnEofBug_234135 extends AbstractGeneratorTest {
+public class CommentOnEofBug_234135_Test extends AbstractGeneratorTest {
public void testCommentOnEof() throws Exception {
with(ReferenceGrammarStandaloneSetup.class);
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java
similarity index 96%
rename from tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132.java
rename to tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java
index 90bd790c6..e8198f3f9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/reference/LeafNodeBug_234132_Test.java
@@ -19,7 +19,7 @@ import org.eclipse.xtext.tests.AbstractGeneratorTest;
* @author Jan K�hnlein - Initial contribution and API
*
*/
-public class LeafNodeBug_234132 extends AbstractGeneratorTest {
+public class LeafNodeBug_234132_Test extends AbstractGeneratorTest {
public void testLeafNodeBug() throws Exception {
with(ReferenceGrammarStandaloneSetup.class);
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/TestBootstrapModel.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/BootstrapModelTest.java
old mode 100644
new mode 100755
similarity index 93%
rename from tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/TestBootstrapModel.java
rename to tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/BootstrapModelTest.java
index 5dedac62b..a9bc5c4df
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/TestBootstrapModel.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/BootstrapModelTest.java
@@ -13,15 +13,8 @@ package org.eclipse.xtext.xtext2ecore;
import java.io.InputStream;
import java.util.List;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.m2t.type.emf.EmfRegistryMetaModel;
import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.XtextPackage;
import org.eclipse.xtext.XtextStandaloneSetup;
import org.eclipse.xtext.tests.AbstractGeneratorTest;
import org.eclipse.xtext.xtextutil.AbstractType;
@@ -36,7 +29,7 @@ import org.openarchitectureware.xtend.XtendFacade;
* @author Jan K�hnlein
*
*/
-public class TestBootstrapModel extends AbstractGeneratorTest {
+public class BootstrapModelTest extends AbstractGeneratorTest {
@Override
protected void setUp() throws Exception {