sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #34 from eclipse/cd/testWorkflows

Browse source 
#32 fixed bug in FragmentFakingEcoreResource
This commit is contained in:
Miro Spönemann 2016-07-12 08:46:55 +02:00 committed by GitHub
commit 7b6798c120
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/GrammarAccessTestLanguage.xtextbin
View file

Binary file not shown.

3
org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/ParserTest.java
View file

@ -17,7 +17,6 @@ import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.AModel;
import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.AsubpackagePackage;
import org.eclipse.xtext.generator.grammarAccess.ametamodel.asubpackage.emptyPackage.subsubpackage.SubsubpackagePackage;
import org.eclipse.xtext.tests.AbstractXtextTests;
import org.junit.Ignore;
import org.junit.Test;
/**
@ -33,8 +32,6 @@ public class ParserTest extends AbstractXtextTests {
with(GrammarAccessTestLanguageStandaloneSetup.class);
}
// TODO https://github.com/eclipse/xtext-core/issues/32
@Ignore
@Test public void testInstantiate() throws Exception {
String modelAsText = "foo bar";
AModel model = (AModel) getModel(modelAsText);

8
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/FragmentFakingEcoreResource.xtend
View file

@ -68,12 +68,16 @@ class FragmentFakingEcoreResource extends XMIResourceImpl {
if (!ePackage.EClassifiers.empty) {
if (result.length !== 0) {
result.append(ePackage.name).append('/')
return
} else {
result.append('//')
}
}
} else {
result.append('//')
}
} else {
result.append('//')
}
result.append('//')
}
@FinalFieldsConstructor

8
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/FragmentFakingEcoreResource.java
View file

@ -119,11 +119,15 @@ public class FragmentFakingEcoreResource extends XMIResourceImpl {
String _name = ePackage.getName();
StringBuilder _append = result.append(_name);
_append.append("/");
return;
} else {
result.append("//");
}
}
} else {
result.append("//");
}
} else {
result.append("//");
}
result.append("//");
}
}