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

Mark test methods as deprecated that test deprecated code

Browse source
This commit is contained in:
Sebastian Zarnekow 2017-06-02 12:38:34 +02:00
parent beb7189a8b
commit 18c6233438
5 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/TypeReferenceTest.xtend
View file

@ -79,6 +79,7 @@ class TypeReferenceTest {
}
@Test
@Deprecated
def void testGuessTypeRef() {
val ref = TypeReference.guessTypeRef("java.util.Map.Entry")
assertEquals("java.util", ref.packageName)

7
org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/CrossRefTest.java
View file

@ -3,6 +3,7 @@ package org.eclipse.xtext.linking;
import java.util.List;
import org.apache.log4j.Level;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
@ -137,7 +138,8 @@ public class CrossRefTest extends AbstractXtextTests {
linkText = crossRefSerializer.serializeCrossRef(type, grammar.getTypeAccess().getExtendsTypeCrossReference_2_1_0(), superType, node);
assertEquals("^type", linkText);
type.eAdapters().remove(NodeModelUtils.getNode(type));
Adapter adapter = (Adapter) NodeModelUtils.getNode(type);
type.eAdapters().remove(adapter);
linkText = crossRefSerializer.serializeCrossRef(type, grammar.getTypeAccess().getExtendsTypeCrossReference_2_1_0(), superType, null);
assertNull(linkText);
}
@ -179,7 +181,8 @@ public class CrossRefTest extends AbstractXtextTests {
linkText = crossRefSerializer.serializeCrossRef(prop,g.getPropertyAccess().getTypeTypeCrossReference_0_0(), propType, null);
assertEquals("TypeB", linkText);
prop.eAdapters().remove(NodeModelUtils.getNode(prop));
Adapter adapter = (Adapter) NodeModelUtils.getNode(prop);
prop.eAdapters().remove(adapter);
propType = prop.getType().get(1);
assertTrue(propType.eIsProxy());
linkText = crossRefSerializer.serializeCrossRef(prop,g.getPropertyAccess().getTypeTypeCrossReference_0_0(), propType, null);

21
org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/HiddenTokenSequencerTest.java
View file

@ -21,14 +21,12 @@ import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
import org.eclipse.xtext.serializer.acceptor.ISyntacticSequenceAcceptor;
import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic;
import org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator;
import org.eclipse.xtext.serializer.sequencer.IHiddenTokenSequencer;
import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer;
import org.eclipse.xtext.serializer.sequencer.NodeModelSemanticSequencer;
import org.eclipse.xtext.testing.serializer.DebugSequenceAcceptor;
import org.eclipse.xtext.tests.AbstractXtextTests;
import org.junit.Ignore;
import org.junit.Test;
import com.google.common.base.Joiner;
@ -108,30 +106,17 @@ public class HiddenTokenSequencerTest extends AbstractXtextTests {
assertEquals(Joiner.on("\n").join(getNodeSequence(model)), Joiner.on("\n").join(actual.getColumn(4)));
}
@Test
@Ignore
public void testXtext() throws Exception {
// with(XtextStandaloneSetup.class);
// Grammar model = (Grammar) new XtextResourceSet()
// .getResource(URI.createURI("classpath:/org/eclipse/xtext/Xtext.xtext"), true).getContents().get(0);
// IRecursiveSequencer recSequencer = get(IRecursiveSequencer.class);
// DebugSequenceAcceptor actual = new NoEnterNodesDebugSequenceAcceptor(false);
// recSequencer.createSequence(/*syn, semSequencer,*/getGrammarAccess().getGrammar().getRules().get(0), model,
// actual, ISerializationDiagnostic.STDERR_ACCEPTOR);
// // System.out.println(actual);
// // System.out.println(NodeModelUtils.compactDump(NodeModelUtils.getNode(model), false));
// assertEquals(Joiner.on("\n").join(getNodeSequence(model)), Joiner.on("\n").join(actual.getColumn(4)));
}
@Test public void testMandatoryKeywords() throws Exception {
testSequence("#1 a kw1 b kw2 kw3 c kw4");
}
@SuppressWarnings("deprecation")
private List<String> getNodeSequence(EObject model) {
List<String> result = Lists.newArrayList();
GrammarElementTitleSwitch titleSwitch = new GrammarElementTitleSwitch().showAssignments();
// System.out.println(NodeModelUtils.compactDump(NodeModelUtils.findActualNodeFor(model), true));
EmitterNodeIterator ni = new EmitterNodeIterator(NodeModelUtils.findActualNodeFor(model), null, true, true);
org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator ni =
new org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator(NodeModelUtils.findActualNodeFor(model), null, true, true);
while (ni.hasNext()) {
INode next = ni.next();
if (next instanceof ILeafNode)

5
org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTest.java
View file

@ -26,7 +26,6 @@ import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
import org.eclipse.xtext.serializer.acceptor.ISequenceAcceptor;
import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic;
import org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator;
import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer;
import org.eclipse.xtext.serializer.sequencer.NodeModelSemanticSequencer;
@ -216,10 +215,12 @@ public class SyntacticSequencerTest extends AbstractXtextTests {
assertEquals(Joiner.on("\n").join(getNodeSequence(outObj)), Joiner.on("\n").join(actual.getResult()));
}
@SuppressWarnings("deprecation")
private List<String> getNodeSequence(EObject model) {
List<String> result = Lists.newArrayList();
GrammarElementTitleSwitch titleSwitch = new GrammarElementTitleSwitch().showAssignments();
EmitterNodeIterator ni = new EmitterNodeIterator(NodeModelUtils.findActualNodeFor(model));
org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator ni =
new org.eclipse.xtext.serializer.sequencer.EmitterNodeIterator(NodeModelUtils.findActualNodeFor(model));
while (ni.hasNext()) {
INode next = ni.next();
EObject ele = next.getGrammarElement() instanceof CrossReference ? ((CrossReference) next

1
org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/TypeReferenceTest.java
View file

@ -79,6 +79,7 @@ public class TypeReferenceTest {
}
@Test
@Deprecated
public void testGuessTypeRef() {
final TypeReference ref = TypeReference.guessTypeRef("java.util.Map.Entry");
Assert.assertEquals("java.util", ref.getPackageName());