From 5d0420f6c9f285d0639ea06a0874f9f5b5ed7d08 Mon Sep 17 00:00:00 2001
From: sbayless <sambayless@gmail.com>
Date: Sat, 18 Aug 2018 17:28:28 -0700
Subject: [PATCH] Fixing errors in test cases following recent Solver interface
 changes

---
 src/monosat/api/java/tests/monosat/BitVectorTest.java | 4 ++--
 src/monosat/api/java/tests/monosat/LitTest.java       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/monosat/api/java/tests/monosat/BitVectorTest.java b/src/monosat/api/java/tests/monosat/BitVectorTest.java
index d147f4a2..44e84f3c 100644
--- a/src/monosat/api/java/tests/monosat/BitVectorTest.java
+++ b/src/monosat/api/java/tests/monosat/BitVectorTest.java
@@ -717,7 +717,7 @@ public void testLoadingBVIterators() throws IOException {
     // The solver should (now) maintain integer mappings of literals after loading from disk
 
     {
-      Iterator<BitVector> it = s2.bitvectors();
+      Iterator<BitVector> it = s2.bitvectors().iterator();
       it.next();
       it.next();
       it.next();
@@ -733,7 +733,7 @@ public void testLoadingBVIterators() throws IOException {
       }
     }
     {
-      Iterator<BitVector> it = s2.namedBitVectors();
+      Iterator<BitVector> it = s2.namedBitVectors().iterator();
       assertEquals(it.next(), bv1);
       assertEquals(it.next(), bv2);
       assertEquals(it.next(), bv3);
diff --git a/src/monosat/api/java/tests/monosat/LitTest.java b/src/monosat/api/java/tests/monosat/LitTest.java
index 2a265af4..9aab4d92 100644
--- a/src/monosat/api/java/tests/monosat/LitTest.java
+++ b/src/monosat/api/java/tests/monosat/LitTest.java
@@ -464,7 +464,7 @@ public void testLitIterator() {
 
         assertEquals(6,s.nVars());
         {
-          Iterator<Lit> it = s.literals();
+          Iterator<Lit> it = s.literals().iterator();
           assertEquals(it.next(), Lit.True);
           assertEquals(it.next(), a);
           assertEquals(it.next(), b);
@@ -480,7 +480,7 @@ public void testLitIterator() {
           }
        }
         {
-          Iterator<Lit> it2 = s.namedLiterals();
+          Iterator<Lit> it2 = s.namedLiterals().iterator();
           assertEquals(it2.next(), Lit.True);
           assertEquals(it2.next(), c);
           assertEquals(it2.next(), e);
@@ -552,7 +552,7 @@ public void testLoadingLitsIterators() throws IOException {
         // The solver should (now) maintain integer mappings of literals after loading from disk
 
         {
-            Iterator<Lit> it = s2.literals();
+            Iterator<Lit> it = s2.literals().iterator();
             assertEquals(it.next(), Lit.True);
             assertEquals(it.next(), n2);
             it.next();
@@ -570,7 +570,7 @@ public void testLoadingLitsIterators() throws IOException {
 
         }
         {
-            Iterator<Lit> it2 = s2.namedLiterals();
+            Iterator<Lit> it2 = s2.namedLiterals().iterator();
             assertEquals(it2.next(), Lit.True);
             assertEquals(it2.next(), n2);
             assertEquals(it2.next(), c2);