diff options
Diffstat (limited to 'src/test/java/bjc')
| -rw-r--r-- | src/test/java/bjc/test/TestUtils.java (renamed from src/test/java/bjc/TestUtils.java) | 2 | ||||
| -rw-r--r-- | src/test/java/bjc/test/data/ArrayIteratorTest.java (renamed from src/test/java/bjc/data/ArrayIteratorTest.java) | 4 | ||||
| -rw-r--r-- | src/test/java/bjc/test/data/BooleanToggleTest.java (renamed from src/test/java/bjc/data/BooleanToggleTest.java) | 4 | ||||
| -rw-r--r-- | src/test/java/bjc/test/data/CircularIteratorTest.java (renamed from src/test/java/bjc/data/CircularIteratorTest.java) | 6 | ||||
| -rw-r--r-- | src/test/java/bjc/test/data/EitherTest.java (renamed from src/test/java/bjc/data/EitherTest.java) | 5 | ||||
| -rw-r--r-- | src/test/java/bjc/test/data/QueuedIteratorTest.java (renamed from src/test/java/bjc/data/QueuedIteratorTest.java) | 6 | ||||
| -rw-r--r-- | src/test/java/bjc/test/esodata/AbbrevTreeTest.java | 46 | ||||
| -rw-r--r-- | src/test/java/bjc/test/esodata/MinMaxListTest.java (renamed from src/test/java/bjc/esodata/MinMaxListTest.java) | 4 | ||||
| -rw-r--r-- | src/test/java/bjc/test/esodata/NestListTest.java (renamed from src/test/java/bjc/esodata/NestListTest.java) | 3 | ||||
| -rw-r--r-- | src/test/java/bjc/test/esodata/StackTest.java (renamed from src/test/java/bjc/esodata/StackTest.java) | 7 | ||||
| -rw-r--r-- | src/test/java/bjc/test/esodata/ThresholdSetTest.java (renamed from src/test/java/bjc/esodata/ThresholdSetTest.java) | 16 | ||||
| -rw-r--r-- | src/test/java/bjc/test/funcdata/TestMapCreation.java (renamed from src/test/java/bjc/funcdata/TestMapCreation.java) | 4 | ||||
| -rw-r--r-- | src/test/java/bjc/test/funcdata/TestMapOperations.java (renamed from src/test/java/bjc/funcdata/TestMapOperations.java) | 4 | ||||
| -rw-r--r-- | src/test/java/bjc/test/functypes/IDTest.java (renamed from src/test/java/bjc/functypes/IDTest.java) | 4 |
14 files changed, 92 insertions, 23 deletions
diff --git a/src/test/java/bjc/TestUtils.java b/src/test/java/bjc/test/TestUtils.java index 312ebaf..d79157d 100644 --- a/src/test/java/bjc/TestUtils.java +++ b/src/test/java/bjc/test/TestUtils.java @@ -1,4 +1,4 @@ -package bjc; +package bjc.test; import java.util.*; diff --git a/src/test/java/bjc/data/ArrayIteratorTest.java b/src/test/java/bjc/test/data/ArrayIteratorTest.java index 223eea2..c446f53 100644 --- a/src/test/java/bjc/data/ArrayIteratorTest.java +++ b/src/test/java/bjc/test/data/ArrayIteratorTest.java @@ -1,12 +1,14 @@ /** * */ -package bjc.data; +package bjc.test.data; import static org.junit.Assert.*; import org.junit.*; +import bjc.data.ArrayIterator; + /** * Test ArrayIterator * @author Ben Culkin diff --git a/src/test/java/bjc/data/BooleanToggleTest.java b/src/test/java/bjc/test/data/BooleanToggleTest.java index 0b0937f..7577340 100644 --- a/src/test/java/bjc/data/BooleanToggleTest.java +++ b/src/test/java/bjc/test/data/BooleanToggleTest.java @@ -1,9 +1,11 @@ -package bjc.data; +package bjc.test.data; import static org.junit.Assert.*; import org.junit.Test; +import bjc.data.BooleanToggle; + /** * Test for boolean toggles. * diff --git a/src/test/java/bjc/data/CircularIteratorTest.java b/src/test/java/bjc/test/data/CircularIteratorTest.java index 8091e1c..9dd7637 100644 --- a/src/test/java/bjc/data/CircularIteratorTest.java +++ b/src/test/java/bjc/test/data/CircularIteratorTest.java @@ -1,10 +1,12 @@ -package bjc.data; +package bjc.test.data; -import static bjc.TestUtils.*; +import static bjc.test.TestUtils.*; import java.util.*; import org.junit.Test; +import bjc.data.CircularIterator; + /** * Test for circular iterators., * diff --git a/src/test/java/bjc/data/EitherTest.java b/src/test/java/bjc/test/data/EitherTest.java index ef2d12b..5e2613c 100644 --- a/src/test/java/bjc/data/EitherTest.java +++ b/src/test/java/bjc/test/data/EitherTest.java @@ -1,4 +1,4 @@ -package bjc.data; +package bjc.test.data; import static org.junit.Assert.*; @@ -6,7 +6,8 @@ import java.util.*; import org.junit.*; -@SuppressWarnings("javadoc") +import bjc.data.Either; + public class EitherTest { private Either<String, String> leftEither; diff --git a/src/test/java/bjc/data/QueuedIteratorTest.java b/src/test/java/bjc/test/data/QueuedIteratorTest.java index b880f97..a059e96 100644 --- a/src/test/java/bjc/data/QueuedIteratorTest.java +++ b/src/test/java/bjc/test/data/QueuedIteratorTest.java @@ -1,10 +1,12 @@ -package bjc.data; +package bjc.test.data; import static java.util.Arrays.asList; import org.junit.Test; -import static bjc.TestUtils.*; +import bjc.data.QueuedIterator; + +import static bjc.test.TestUtils.*; import static bjc.data.QueuedIterator.queued; /** diff --git a/src/test/java/bjc/test/esodata/AbbrevTreeTest.java b/src/test/java/bjc/test/esodata/AbbrevTreeTest.java new file mode 100644 index 0000000..1332b63 --- /dev/null +++ b/src/test/java/bjc/test/esodata/AbbrevTreeTest.java @@ -0,0 +1,46 @@ +package bjc.test.esodata; + +import static org.junit.Assert.*; +import static bjc.test.TestUtils.*; + +import org.junit.Test; + +import bjc.esodata.AbbrevTree; + +@SuppressWarnings("javadoc") +public class AbbrevTreeTest { + private static class StringTree extends AbbrevTree<String, String> { + // Alias type + public StringTree(AbbrevTree<String, String> parent, String label, String data) { + super(parent, label, data); + } + + public StringTree(String label, String data) { + super(label, data); + } + } + + @Test + public void testGet() { + StringTree root = new StringTree("root", "a"); + + StringTree leaf1 = new StringTree(root, "leaf", "b1"); + StringTree node1 = new StringTree(root, "node1", "b2"); + + StringTree node2 = new StringTree(node1, "node2", "c1"); + StringTree leaf2 = new StringTree(node1, "leaf", "c2"); + + var list1 = root.nodes("node2"); + assertEquals(1, list1.size()); + assertIteratorSet(false, list1.iterator(), node2); + + var list2 = root.nodes("leaf"); + assertEquals(2, list2.size()); + assertIteratorSet(false, list2.iterator(), leaf1, leaf2); + + var list3 = root.nodes("leaf", "node1"); + assertEquals(1, list3.size()); + assertIteratorSet(false, list3.iterator(), leaf2); + } + +}
\ No newline at end of file diff --git a/src/test/java/bjc/esodata/MinMaxListTest.java b/src/test/java/bjc/test/esodata/MinMaxListTest.java index 08901f0..0337ef7 100644 --- a/src/test/java/bjc/esodata/MinMaxListTest.java +++ b/src/test/java/bjc/test/esodata/MinMaxListTest.java @@ -1,4 +1,4 @@ -package bjc.esodata; +package bjc.test.esodata; import static org.junit.Assert.*; @@ -6,6 +6,8 @@ import java.util.*; import org.junit.*; +import bjc.esodata.MinMaxList; + @SuppressWarnings("javadoc") public class MinMaxListTest { private final static Comparator<Integer> intComparator = (lhs, rhs) -> lhs - rhs;; diff --git a/src/test/java/bjc/esodata/NestListTest.java b/src/test/java/bjc/test/esodata/NestListTest.java index ff3723e..15b2bab 100644 --- a/src/test/java/bjc/esodata/NestListTest.java +++ b/src/test/java/bjc/test/esodata/NestListTest.java @@ -1,4 +1,4 @@ -package bjc.esodata; +package bjc.test.esodata; import static org.junit.Assert.*; @@ -7,6 +7,7 @@ import java.util.*; import org.junit.*; import bjc.*; +import bjc.esodata.NestList; @SuppressWarnings("javadoc") public class NestListTest diff --git a/src/test/java/bjc/esodata/StackTest.java b/src/test/java/bjc/test/esodata/StackTest.java index b4b98cc..7f896a7 100644 --- a/src/test/java/bjc/esodata/StackTest.java +++ b/src/test/java/bjc/test/esodata/StackTest.java @@ -1,8 +1,11 @@ -package bjc.esodata; +package bjc.test.esodata; import org.junit.Test; -import static bjc.TestUtils.*; +import bjc.esodata.SimpleStack; +import bjc.esodata.Stack; + +import static bjc.test.TestUtils.*; import static org.junit.Assert.*; diff --git a/src/test/java/bjc/esodata/ThresholdSetTest.java b/src/test/java/bjc/test/esodata/ThresholdSetTest.java index c9403da..142a641 100644 --- a/src/test/java/bjc/esodata/ThresholdSetTest.java +++ b/src/test/java/bjc/test/esodata/ThresholdSetTest.java @@ -1,8 +1,10 @@ -package bjc.esodata; +package bjc.test.esodata; import org.junit.Test; -import static bjc.TestUtils.*; +import bjc.esodata.ThresholdSet; + +import static bjc.test.TestUtils.*; import static bjc.esodata.ThresholdSet.*; @@ -20,7 +22,7 @@ public class ThresholdSetTest { ThresholdSet<String> thst = TS("a", "b"); assertIteratorSet(false, thst.setView().iterator(), "a", "b"); - assertEquals(thst.setSize(), 2); + assertEquals(thst.setView().size(), 2); } @Test @@ -28,7 +30,7 @@ public class ThresholdSetTest { ThresholdSet<String> thst = TS("a", "b", "a"); assertIteratorSet(false, thst.setView().iterator(), "b"); - assertEquals(thst.setSize(), 1); + assertEquals(thst.setView().size(), 1); } @Test @@ -37,7 +39,7 @@ public class ThresholdSetTest { thst.add("a"); assertIteratorSet(false, thst.setView().iterator(), "b"); - assertEquals(thst.setSize(), 1); + assertEquals(thst.setView().size(), 1); } @Test @@ -57,12 +59,12 @@ public class ThresholdSetTest { thst.remove("a"); assertIteratorSet(false, thst.setView().iterator(), "a", "b"); - assertEquals(2, thst.setSize()); + assertEquals(2, thst.setView().size()); thst.remove("a"); assertIteratorSet(false, thst.setView().iterator(), "b"); - assertEquals(1, thst.setSize()); + assertEquals(1, thst.setView().size()); } @Test diff --git a/src/test/java/bjc/funcdata/TestMapCreation.java b/src/test/java/bjc/test/funcdata/TestMapCreation.java index eeea591..4a06aa0 100644 --- a/src/test/java/bjc/funcdata/TestMapCreation.java +++ b/src/test/java/bjc/test/funcdata/TestMapCreation.java @@ -1,9 +1,11 @@ -package bjc.funcdata; +package bjc.test.funcdata; import static org.junit.Assert.*; import org.junit.*; +import bjc.funcdata.MapEx; + @SuppressWarnings("javadoc") public class TestMapCreation { @Test diff --git a/src/test/java/bjc/funcdata/TestMapOperations.java b/src/test/java/bjc/test/funcdata/TestMapOperations.java index 7523d02..fa38a79 100644 --- a/src/test/java/bjc/funcdata/TestMapOperations.java +++ b/src/test/java/bjc/test/funcdata/TestMapOperations.java @@ -1,4 +1,4 @@ -package bjc.funcdata; +package bjc.test.funcdata; import static org.junit.Assert.*; @@ -6,6 +6,8 @@ import java.util.*; import org.junit.*; +import bjc.funcdata.MapEx; + @SuppressWarnings("javadoc") public class TestMapOperations { private MapEx<String, String> map; diff --git a/src/test/java/bjc/functypes/IDTest.java b/src/test/java/bjc/test/functypes/IDTest.java index 69c6133..4e31644 100644 --- a/src/test/java/bjc/functypes/IDTest.java +++ b/src/test/java/bjc/test/functypes/IDTest.java @@ -1,4 +1,4 @@ -package bjc.functypes; +package bjc.test.functypes; import static org.junit.Assert.*; @@ -6,6 +6,8 @@ import java.util.function.*; import org.junit.*; +import bjc.functypes.ID; + @SuppressWarnings("javadoc") public class IDTest { |
