diff options
Diffstat (limited to 'src/test/scala/forge')
-rw-r--r-- | src/test/scala/forge/EvaluationTests.scala | 8 | ||||
-rw-r--r-- | src/test/scala/forge/GraphTests.scala | 20 | ||||
-rw-r--r-- | src/test/scala/forge/TestUtil.scala | 8 |
3 files changed, 15 insertions, 21 deletions
diff --git a/src/test/scala/forge/EvaluationTests.scala b/src/test/scala/forge/EvaluationTests.scala index 2ab6d31e..0ae5f62a 100644 --- a/src/test/scala/forge/EvaluationTests.scala +++ b/src/test/scala/forge/EvaluationTests.scala @@ -53,7 +53,7 @@ object EvaluationTests extends TestSuite{ check(down, expValue = 0, expEvaled = OSet(up, middle, down)) down.counter += 1 - check(down, expValue = 1, expEvaled = OSet(down)) + check(down, expValue = 1, expEvaled = OSet(middle, down)) up.counter += 1 check(down, expValue = 2, expEvaled = OSet(up, middle, down)) @@ -86,17 +86,17 @@ object EvaluationTests extends TestSuite{ check(down, expValue = 0, expEvaled = OSet(up, left, right, down)) down.counter += 1 - check(down, expValue = 1, expEvaled = OSet(down)) + check(down, expValue = 1, expEvaled = OSet(left, right, down)) up.counter += 1 // Increment by 2 because up is referenced twice: once by left once by right check(down, expValue = 3, expEvaled = OSet(up, left, right, down)) left.counter += 1 - check(down, expValue = 4, expEvaled = OSet(left, down)) + check(down, expValue = 4, expEvaled = OSet(left, right, down)) right.counter += 1 - check(down, expValue = 5, expEvaled = OSet(right, down)) + check(down, expValue = 5, expEvaled = OSet(left, right, down)) } // 'anonImpureDiamond - { // import AnonImpureDiamond._ diff --git a/src/test/scala/forge/GraphTests.scala b/src/test/scala/forge/GraphTests.scala index 648ad873..35430795 100644 --- a/src/test/scala/forge/GraphTests.scala +++ b/src/test/scala/forge/GraphTests.scala @@ -142,24 +142,18 @@ object GraphTests extends TestSuite{ anonDiamond.down, OSet( OSet("up"), - OSet("down2", "down1", "down") + OSet("down1", "down2", "down") ) ) 'bigSingleTerminal - check( bigSingleTerminal.j, OSet( - OSet("i1"), - OSet("e4"), - OSet("a1"), - OSet("a2"), - OSet("a"), - OSet("b1"), - OSet("b"), - OSet("e5", "e2", "e8", "e1", "e7", "e6", "e3", "e"), - OSet("i2", "i5", "i4", "i3", "i"), - OSet("f2"), - OSet("f3", "f1", "f"), - OSet("j3", "j2", "j1", "j") + OSet("a1", "a2", "a"), + OSet("b1", "b"), + OSet("e4", "e1", "e5", "e3", "e2", "e8", "e7", "e6", "e"), + OSet("i1", "i3", "i2", "i5", "i4", "i"), + OSet("f2", "f3", "f1", "f"), + OSet("j1", "j2", "j3", "j") ) ) } diff --git a/src/test/scala/forge/TestUtil.scala b/src/test/scala/forge/TestUtil.scala index d0dcd755..580f814a 100644 --- a/src/test/scala/forge/TestUtil.scala +++ b/src/test/scala/forge/TestUtil.scala @@ -41,17 +41,17 @@ object TestUtil { val down = T{ test(test(up), test(up)) } } - // x g-----o + // o g-----o // \ \ \ - // x o h-----I---o + // o o h-----I---o // \ / \ / \ / \ \ // A---c--o E o-o \ \ // / \ / \ / \ o---J - // x d o--o o / / + // o d o--o o / / // \ / \ / / // o o---F---o // / / - // x--B x + // o--B o object bigSingleTerminal{ val a = T{ test(test(), test()) } val b = T{ test(test()) } |