diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-01-01 20:00:02 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-01-01 20:01:19 +0000 |
| commit | d5a4fb60e3b62f4dc1b67c83cd62c1a264bb4a12 (patch) | |
| tree | cc5e2dfaf6468370a841e41dd91285b76e6cfd2f /src/test/java/org/zwobble/couscous/tests/frontends | |
| parent | 4fd8b4132fd8f49b5368b86ebdbcdb84a0bdf7d0 (diff) | |
Generate variable IDs without Eclipse keys
Diffstat (limited to 'src/test/java/org/zwobble/couscous/tests/frontends')
| -rw-r--r-- | src/test/java/org/zwobble/couscous/tests/frontends/java/FreeVariablesTests.java | 7 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/FreeVariablesTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/FreeVariablesTests.java index bd860f7..afded63 100644 --- a/src/test/java/org/zwobble/couscous/tests/frontends/java/FreeVariablesTests.java +++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/FreeVariablesTests.java @@ -2,6 +2,7 @@ package org.zwobble.couscous.tests.frontends.java; import org.junit.Test; import org.zwobble.couscous.ast.VariableDeclaration; +import org.zwobble.couscous.tests.TestIds; import org.zwobble.couscous.values.StringValue; import java.util.List; @@ -19,14 +20,14 @@ import static org.zwobble.couscous.frontends.java.FreeVariables.findFreeVariable public class FreeVariablesTests { @Test public void referenceIsFreeIfThereIsNoAssociatedDeclaration() { - VariableDeclaration declaration = var("[id]", "[name]", StringValue.REF); + VariableDeclaration declaration = var(TestIds.ANY_ID, "[name]", StringValue.REF); List<VariableDeclaration> freeVariables = findFreeVariables(asList(reference(declaration))); assertEquals(asList(declaration), freeVariables); } @Test public void referenceIsNotFreeIfIsDeclaredAsArgument() { - VariableDeclaration declaration = var("[id]", "[name]", StringValue.REF); + VariableDeclaration declaration = var(TestIds.ANY_ID, "[name]", StringValue.REF); List<VariableDeclaration> freeVariables = findFreeVariables( asList(formalArg(declaration), reference(declaration))); assertEquals(emptyList(), freeVariables); @@ -34,7 +35,7 @@ public class FreeVariablesTests { @Test public void referenceIsNotFreeIfIsReferenceToLocalDefinedInBody() { - VariableDeclaration declaration = var("[id]", "[name]", StringValue.REF); + VariableDeclaration declaration = var(TestIds.ANY_ID, "[name]", StringValue.REF); List<VariableDeclaration> freeVariables = findFreeVariables( asList( localVariableDeclaration(declaration, literal("[value]")), diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java index 3aab776..15404a4 100644 --- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java +++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java @@ -186,7 +186,6 @@ public class JavaReaderTests { "java.util.function.Function<Integer, Integer> function = (Integer x) -> x;"))); } - @Ignore("This works except for making the IDs match up") @Test public void expressionMethodReferenceIsReadAsLambda() { assertEquals( |
