diff --git a/tests/edu/caltech/cs2/datastructures/MinFourHeapTests.java b/tests/edu/caltech/cs2/datastructures/MinFourHeapTests.java
index 2e1ec7e24c9782ccad68d8b3b68d2ddc65c7d76a..62d3bd41f2163580011cc003f7a24a4f4c46dd64 100644
--- a/tests/edu/caltech/cs2/datastructures/MinFourHeapTests.java
+++ b/tests/edu/caltech/cs2/datastructures/MinFourHeapTests.java
@@ -158,12 +158,14 @@ public class MinFourHeapTests {
// enqueue values while examining internal state
for (int i = 0; i < values.size(); i++) {
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(values.get(i), values.get(i))));
- assertEquals(i + 1, heap.size());
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(values.get(i), values.get(i))),
+ "Enqueue unexpectedly returned false.");
+ assertEquals(i + 1, heap.size(), "Enqueue did not update size as appropriate.");
IPriorityQueue.PQElement<Integer>[] heapData = Reflection.getFieldValue(MinFourHeap.class, "data", heap);
for (int j = 0; j < heap.size(); j++) {
- assertEquals(step_by_step.get(i).toArray()[j], heapData[j].data);
+ assertEquals(step_by_step.get(i).toArray()[j], heapData[j].data,
+ "Heap structure after enqueue is incorrect.");
}
checkKeyToIndexMap(heap);
@@ -187,13 +189,14 @@ public class MinFourHeapTests {
PriorityQueue<Integer> reference = new PriorityQueue<>(c);
List<Integer> values = new ArrayList<>(Arrays.asList(9, -100, 19, 3, -2, 1, 7, -84, -4, 2, 70));
for (int value : values) {
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)));
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)),
+ "Enqueue unexpectedly returned false.");
reference.add(value);
}
for (int i = 0; i < reference.size(); i++) {
- assertEquals(reference.remove(), heap.dequeue().data);
+ assertEquals(reference.remove(), heap.dequeue().data, "Dequeuing returned the incorrect value.");
checkKeyToIndexMap(heap);
- assertEquals(reference.size(), heap.size());
+ assertEquals(reference.size(), heap.size(), "Dequeuing did not update size as appropriate.");
}
}
@@ -209,13 +212,14 @@ public class MinFourHeapTests {
MinFourHeap<Integer> heap = new MinFourHeap<>();
List<Integer> values = new ArrayList<>(Arrays.asList(9, -100, 19, 3, -2, 1, 7, -84, -4, 2, 70));
for (Integer value : values) {
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)));
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)),
+ "Enqueuing unexpectedly returned false.");
}
// Assert constructed heap is correct
Integer[] correctHeapData = {-100, -84, 2, 3, -2, 9, 7, 1, -4, 19, 70};
IPriorityQueue.PQElement<Integer>[] heapData = Reflection.getFieldValue(MinFourHeap.class, "data", heap);
for (int j = 0; j < heap.size(); j++) {
- assertEquals(correctHeapData[j], heapData[j].data);
+ assertEquals(correctHeapData[j], heapData[j].data, "Heap structure after enqueue is incorrect.");
}
// Increase the root's priority
heap.increaseKey(new IPriorityQueue.PQElement<>(-100, 100));
@@ -225,7 +229,8 @@ public class MinFourHeapTests {
heapData = Reflection.getFieldValue(MinFourHeap.class, "data", heap);
checkKeyToIndexMap(heap);
for (int i = 0; i < heap.size(); i++) {
- assertEquals(correctHeapPrioritiesAfterIncrease[i], heapData[i].priority);
+ assertEquals(correctHeapPrioritiesAfterIncrease[i], heapData[i].priority,
+ "Priorities or layout after increaseKey is incorrect.");
}
}
@@ -241,14 +246,15 @@ public class MinFourHeapTests {
MinFourHeap<Integer> heap = new MinFourHeap<>();
List<Integer> values = new ArrayList<>(Arrays.asList(9, -100, 19, 3, -2, 1, 7, -84, -4, 2, 70));
for (Integer value : values) {
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)));
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)),
+ "Enqueuing unexpectedly returned false.");
}
// Assert constructed heap is correct
Integer[] correctHeapData = {-100, -84, 2, 3, -2, 9, 7, 1, -4, 19, 70};
IPriorityQueue.PQElement<Integer>[] heapData = Reflection.getFieldValue(MinFourHeap.class, "data", heap);
for (int j = 0; j < heap.size(); j++) {
- assertEquals(correctHeapData[j], heapData[j].data);
+ assertEquals(correctHeapData[j], heapData[j].data, "Heap structure after enqueue is incorrect.");
}
// Decrease some node's priority
heap.decreaseKey(new IPriorityQueue.PQElement<>(7, -105));
@@ -258,7 +264,8 @@ public class MinFourHeapTests {
heapData = Reflection.getFieldValue(MinFourHeap.class, "data", heap);
checkKeyToIndexMap(heap);
for (int i = 0; i < heap.size(); i++) {
- assertEquals(correctHeapPrioritiesAfterDecrease[i], heapData[i].priority);
+ assertEquals(correctHeapPrioritiesAfterDecrease[i], heapData[i].priority,
+ "Priorities or layout after decreaseKey is incorrect.");
}
}
@@ -273,11 +280,13 @@ public class MinFourHeapTests {
MinFourHeap<Integer> heap = new MinFourHeap<>();
List<Integer> values = new ArrayList<>(Arrays.asList(1, 6, 7, 8, 2));
for (int value : values) {
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)));
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)),
+ "Enqueuing unexpectedly returned false.");
}
// Dequeueing 1 won't cause any further percolations, since 2 is in the right place.
// There's some edge cases around this for some reason, which is why the test is here...
- assertEquals(1, heap.dequeue().data);
+ assertEquals(1, heap.dequeue().data,
+ "Dequeuing unexpectedly rearranged the heap.");
checkKeyToIndexMap(heap);
}
@@ -295,11 +304,12 @@ public class MinFourHeapTests {
// 0 => [2 => [5, 6, 7, 8], 1 => [9], 3 => [], 4 => []]
List<Integer> values = new ArrayList<>(Arrays.asList(0, 2, 1, 3, 4, 5, 6, 7, 8, 9));
for (int value : values) {
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)));
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(value, value)),
+ "Enqueuing unexpectedly returned false.");
}
IPriorityQueue.PQElement<Integer>[] heapData = Reflection.getFieldValue(MinFourHeap.class, "data", heap);
// Make sure our heap data is still "good" for the test
- assertEquals(10, heapData.length, "Heap data array is not a default size of 10 or was resized prematurely");
+ assertEquals(10, heapData.length, "Heap data array is not a default size of 10 or was resized prematurely.");
// Increase the node at the root. The node gets swapped with 1, then compared against children.
// But, 9 is at the last index in the heap array and not the last child.
@@ -332,7 +342,7 @@ public class MinFourHeapTests {
}
reference.add(num);
heap.enqueue(new IPriorityQueue.PQElement<>(num, num));
- assertEquals(reference.size(), heap.size());
+ assertEquals(reference.size(), heap.size(), "Heap size after enqueue was incorrect.");
}
for (int j = 0; j < numToReplace; j++) {
@@ -350,11 +360,11 @@ public class MinFourHeapTests {
} else {
heap.increaseKey(new IPriorityQueue.PQElement<>(origKey, newPriority));
}
- assertEquals(reference.size(), heap.size());
+ assertEquals(reference.size(), heap.size(), "Heap size after adjusting priorities was incorrect.");
removed.add(origKey);
reference.remove(origKey);
reference.add(newPriority);
- assertEquals(reference.size(), heap.size());
+ assertEquals(reference.size(), heap.size(), "Heap size after adjusting priorities was incorrect.");
}
int i = 0;
while (!reference.isEmpty()) {
@@ -365,7 +375,7 @@ public class MinFourHeapTests {
System.err.println(reference.size());
System.err.println(heap.size());
}
- assertEquals((double) er, mr.priority);
+ assertEquals((double) er, mr.priority, "Priorities after adjusting them and dequeuing were incorrect.");
i++;
}
}
@@ -391,17 +401,18 @@ public class MinFourHeapTests {
num = r.nextInt();
}
reference.add(num);
- assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(num, num)));
+ assertTrue(heap.enqueue(new IPriorityQueue.PQElement<>(num, num)),
+ "Enqueuing unexpectedly returned false.");
// Check at intervals to save computation
if (i % 499 == 0) {
checkKeyToIndexMap(heap);
}
- assertEquals(reference.size(), heap.size());
+ assertEquals(reference.size(), heap.size(), "Heap size after enqueuing was incorrect.");
}
while (heap.size() != 0) {
- assertEquals(reference.remove(), heap.dequeue().data);
+ assertEquals(reference.remove(), heap.dequeue().data, "Dequeuing returned the wrong element.");
if (heap.size() % 499 == 0) {
checkKeyToIndexMap(heap);
diff --git a/tests/edu/caltech/cs2/project06/DSaturTests.java b/tests/edu/caltech/cs2/project06/DSaturTests.java
index b762057cee9857af09ec11fefc9ffd9cb376fbc9..8d51fe5b0e12ff9b86b93d0a90a92987d2de2b47 100644
--- a/tests/edu/caltech/cs2/project06/DSaturTests.java
+++ b/tests/edu/caltech/cs2/project06/DSaturTests.java
@@ -23,12 +23,14 @@ public class DSaturTests {
if (myColor > maxColor) {
maxColor = myColor;
}
- assertTrue(myColor > 0);
+ assertTrue(myColor > 0,
+ "All of the vertices in the graph must be colored when you're done.");
for (int neighbor : g.neighbors(i)) {
- assertTrue(myColor != g.getColor(neighbor));
+ assertTrue(myColor != g.getColor(neighbor),
+ "Invalid coloring: two adjacent vertices share the same color.");
}
}
- assertTrue(maxColor <= N, "" + maxColor + " is supposed to be <= " + N);
+ assertTrue(maxColor <= N, maxColor + " is supposed to be <= " + N);
}
private static record Pair<F, S>(F first, S second) {
diff --git a/tests/edu/caltech/cs2/project06/ProgramTests.java b/tests/edu/caltech/cs2/project06/ProgramTests.java
index 97c3b35ee6093b5d961f5fc73964e8a2f241f94e..3ace3fde17c08edc69436a2ee9168a7e4f3e0fd3 100644
--- a/tests/edu/caltech/cs2/project06/ProgramTests.java
+++ b/tests/edu/caltech/cs2/project06/ProgramTests.java
@@ -88,8 +88,11 @@ public class ProgramTests {
NodeGraph interference = program.constructInterferenceGraph();
DSatur.color(interference);
Program modified = program.color(interference.getColoring());
- assertTrue(modified.variables().size() <= maxColors);
- assertIterableEquals(interpret(program), interpret(modified));
+ assertTrue(modified.variables().size() <= maxColors,
+ "Interference graph coloring uses more colors than expected " +
+ "(ie: more variables were connected by edges than expected).");
+ assertIterableEquals(interpret(program), interpret(modified), "Interference graph does not validly "
+ + " reflect interferences (ie: the resulting program overwrites its own variables).");
}
@Test