| author | szarnekow | 2009-03-23 03:24:36 (EDT) |
|---|---|---|
| committer | sefftinge | 2009-03-23 03:24:36 (EDT) |
| commit | 60c7f9a6466a1c6daba09c58dfdda312e8da5a80 (patch) (side-by-side diff) | |
| tree | bd80c6774bf1848f34d14979d3da745e9f8e718d | |
| parent | 0258857c4a592ef13e7fc2de08c8f920b46a02fb (diff) | |
| download | org.eclipse.xtext-60c7f9a6466a1c6daba09c58dfdda312e8da5a80.zip org.eclipse.xtext-60c7f9a6466a1c6daba09c58dfdda312e8da5a80.tar.gz org.eclipse.xtext-60c7f9a6466a1c6daba09c58dfdda312e8da5a80.tar.bz2 | |
Ensure super.setUp is called before the injector is created
4 files changed, 5 insertions, 3 deletions
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/packrat/PerformanceTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/packrat/PerformanceTest.java index 2d0c311..f6c4a24 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/packrat/PerformanceTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/packrat/PerformanceTest.java @@ -30,6 +30,7 @@ public class PerformanceTest extends AbstractGeneratorTest { @Override protected void setUp() throws Exception { + super.setUp(); with(XtextTerminalsTestLanguageStandaloneSetup.class); this.generatedWithTerminals = get(XtextTerminalsTestLanguagePackratParser.class); StringBuilder modelBuilder = new StringBuilder("grammar a.bc.def.ghi with e.fh.ijk\n"); @@ -58,6 +59,7 @@ public class PerformanceTest extends AbstractGeneratorTest { System.out.println("usage after: " + (java.lang.Runtime.getRuntime().totalMemory() - java.lang.Runtime.getRuntime().freeMemory())); System.out.println("duration: " + (endTime - startTime) + " ms"); this.model = null; + super.tearDown(); } private void doTest(AbstractPackratParser parser) { diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java index c60a781..eb82a84 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java @@ -7,8 +7,8 @@ public class FormatterTest extends AbstractGeneratorTest { @Override protected void setUp() throws Exception { - with(FormatterTestLanguageStandaloneSetup.class); super.setUp(); + with(FormatterTestLanguageStandaloneSetup.class); } public void testLinewrap() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java index feadc66..0214d1f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java @@ -120,7 +120,7 @@ public class SimpleReconstrTest extends AbstractGeneratorTest { @Override protected void setUp() throws Exception { - with(SimpleReconstrTestLanguageStandaloneSetup.class); super.setUp(); + with(SimpleReconstrTestLanguageStandaloneSetup.class); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java index fd74258..46416e3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.java @@ -10,8 +10,8 @@ public class TransientValuesTest extends AbstractGeneratorTest { @Override protected void setUp() throws Exception { - with(TransientValuesTestStandaloneSetup.class); super.setUp(); + with(TransientValuesTestStandaloneSetup.class); } public void testRequired1() throws Exception { |