From 81fd0de7dc20737b294704911baa0130b3a2c21f Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Mon, 26 Sep 2016 14:44:51 +0200 Subject: [PATCH] [#118] Add validation that resource has no errors Signed-off-by: Karsten Thoms --- .../xtext/xtext/generator/junit/Junit4Fragment2.xtend | 9 ++++----- .../xtext/xtext/generator/junit/Junit4Fragment2.java | 10 ++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend index 25a419658..3a30fa306 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend @@ -82,19 +82,18 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment { return fileAccessFactory.createXtendFile(exampleRuntimeTest, ''' @«runWith»(«xtextRunner») @«injectWith»(«injectorProvider») - class «exampleRuntimeTest»{ - + class «exampleRuntimeTest» { @«Inject» «parseHelper»<«rootType»> parseHelper - - @«test» + + @«test» def void loadModel() { val result = parseHelper.parse(''«»' Hello Xtext! ''«»') «assert».assertNotNull(result) + «assert».assertTrue(result.eResource.errors.isEmpty) } - } ''') } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java index ccc86b891..bff5f7655 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java @@ -201,9 +201,8 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { _builder.append("class "); TypeReference _exampleRuntimeTest = Junit4Fragment2.this.exampleRuntimeTest(); _builder.append(_exampleRuntimeTest, ""); - _builder.append("{"); + _builder.append(" {"); _builder.newLineIfNotEmpty(); - _builder.newLine(); _builder.append("\t"); _builder.append("@"); _builder.append(Inject.class, "\t"); @@ -214,11 +213,11 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { _builder.append(rootType, "\t"); _builder.append("> parseHelper"); _builder.newLineIfNotEmpty(); + _builder.append("\t"); _builder.newLine(); _builder.append("\t"); _builder.append("@"); _builder.append(test, "\t"); - _builder.append(" "); _builder.newLineIfNotEmpty(); _builder.append("\t"); _builder.append("def void loadModel() {"); @@ -238,10 +237,13 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { _builder.append(assert_, "\t\t"); _builder.append(".assertNotNull(result)"); _builder.newLineIfNotEmpty(); + _builder.append("\t\t"); + _builder.append(assert_, "\t\t"); + _builder.append(".assertTrue(result.eResource.errors.isEmpty)"); + _builder.newLineIfNotEmpty(); _builder.append("\t"); _builder.append("}"); _builder.newLine(); - _builder.newLine(); _builder.append("}"); _builder.newLine(); }