[libgee] Replace old-style asserts in tests



commit 8a6a137fa900b11da2073f78bd873218e65f5534
Author: Maciej Piechotka <uzytkownik2 gmail com>
Date:   Mon Sep 28 01:50:02 2009 +0200

    Replace old-style asserts in tests

 gee/priorityqueue.vala       |    2 +-
 tests/testpriorityqueue.vala |   28 ++++++++++++++--------------
 tests/testqueue.vala         |    8 ++++----
 tests/testtreemap.vala       |   24 ++++++++++++------------
 4 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/gee/priorityqueue.vala b/gee/priorityqueue.vala
index 04f7029..2f07bdf 100644
--- a/gee/priorityqueue.vala
+++ b/gee/priorityqueue.vala
@@ -557,7 +557,7 @@ public class Gee.PriorityQueue<G> : Gee.AbstractQueue<G> {
 			_b[degree] = true;
 		} else {
 			// Else if there is an odd number of child of such degree
-			if (_b[degree] == true) {
+			if (_b[degree]) {
 				// Make a pair
 				NodePair<G> pair = new NodePair<G> (node, node.brothers_next);
 				node.brothers_next.pair = pair;
diff --git a/tests/testpriorityqueue.vala b/tests/testpriorityqueue.vala
index c68f011..c712a23 100644
--- a/tests/testpriorityqueue.vala
+++ b/tests/testpriorityqueue.vala
@@ -69,26 +69,26 @@ public class PriorityQueueTests : QueueTests {
 		assert (test_queue != null);
 
 		// Add two elements and remove the greatest
-		assert (test_queue.offer ("one") == true);
-		assert (test_queue.offer ("two") == true);
+		assert (test_queue.offer ("one"));
+		assert (test_queue.offer ("two"));
 		assert (test_queue.peek () == "one");
 		assert (test_queue.remove ("two"));
 		assert (test_queue.peek () == "one");
 		assert (test_queue.poll () == "one");
 
 		// Add twelve elements
-		assert (test_queue.offer ("one") == true);
-		assert (test_queue.offer ("two") == true);
-		assert (test_queue.offer ("three") == true);
-		assert (test_queue.offer ("four") == true);
-		assert (test_queue.offer ("five") == true);
-		assert (test_queue.offer ("six") == true);
-		assert (test_queue.offer ("seven") == true);
-		assert (test_queue.offer ("eight") == true);
-		assert (test_queue.offer ("nine") == true);
-		assert (test_queue.offer ("ten") == true);
-		assert (test_queue.offer ("eleven") == true);
-		assert (test_queue.offer ("twelve") == true);
+		assert (test_queue.offer ("one"));
+		assert (test_queue.offer ("two"));
+		assert (test_queue.offer ("three"));
+		assert (test_queue.offer ("four"));
+		assert (test_queue.offer ("five"));
+		assert (test_queue.offer ("six"));
+		assert (test_queue.offer ("seven"));
+		assert (test_queue.offer ("eight"));
+		assert (test_queue.offer ("nine"));
+		assert (test_queue.offer ("ten"));
+		assert (test_queue.offer ("eleven"));
+		assert (test_queue.offer ("twelve"));
 
 		assert (test_queue.peek () == "eight");
 		assert (test_queue.poll () == "eight");
diff --git a/tests/testqueue.vala b/tests/testqueue.vala
index c32f674..dd3c36d 100644
--- a/tests/testqueue.vala
+++ b/tests/testqueue.vala
@@ -49,7 +49,7 @@ public abstract class QueueTests : CollectionTests {
 			int capacity = test_queue.capacity;
 			for (int i = 1; i <= capacity; i++) {
 				assert (! test_queue.is_full);
-				assert (test_queue.offer ("one") == true);
+				assert (test_queue.offer ("one"));
 				assert (test_queue.remaining_capacity == capacity - i);
 			}
 			assert (test_queue.is_full);
@@ -72,7 +72,7 @@ public abstract class QueueTests : CollectionTests {
 		assert (test_queue != null);
 
 		// Check offer one element when there is none yet
-		assert (test_queue.offer ("one") == true);
+		assert (test_queue.offer ("one"));
 		assert (test_queue.peek () == "one");
 		assert (test_queue.size == 1);
 		assert (! test_queue.is_empty);
@@ -88,7 +88,7 @@ public abstract class QueueTests : CollectionTests {
 
 		// Check drain one element when there is one
 		recipient.clear ();
-		assert (test_queue.offer ("one") == true);
+		assert (test_queue.offer ("one"));
 		assert (test_queue.drain (recipient, 1) == 1);
 		assert (test_queue.size == 0);
 		assert (test_queue.is_empty);
@@ -104,7 +104,7 @@ public abstract class QueueTests : CollectionTests {
 
 		// Check drain all elements when there is one
 		recipient.clear ();
-		assert (test_queue.offer ("one") == true);
+		assert (test_queue.offer ("one"));
 		assert (test_queue.drain (recipient) == 1);
 		assert (test_queue.size == 0);
 		assert (test_queue.is_empty);
diff --git a/tests/testtreemap.vala b/tests/testtreemap.vala
index 3a91b62..82e1621 100644
--- a/tests/testtreemap.vala
+++ b/tests/testtreemap.vala
@@ -89,29 +89,29 @@ public class TreeMapTests : MapTests {
 		test_tree_map.set ("twelve", "twelve");
 
 		Iterator<string> iterator = test_tree_map.keys.iterator ();
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "eight");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "eleven");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "five");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "four");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "nine");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "one");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "seven");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "six");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "ten");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "three");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "twelve");
-		assert (iterator.next () == true);
+		assert (iterator.next ());
 		assert (iterator.get () == "two");
 		assert (iterator.next () == false);
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]