From c0fa8b66cd702650bb3940d56d6590a5e964f0ab Mon Sep 17 00:00:00 2001
From: Bailey Thompson <bkthomps@edu.uwaterloo.ca>
Date: Wed, 3 Jan 2018 01:00:25 -0500
Subject: [PATCH] Clean up code for test cases

---
 tst/deque.c        | 63 +++++++++++++++++++++-------------------------
 tst/forward_list.c | 43 ++++++++++++++-----------------
 tst/list.c         | 45 +++++++++++++++------------------
 tst/vector.c       | 47 ++++++++++++++++------------------
 4 files changed, 89 insertions(+), 109 deletions(-)

diff --git a/tst/deque.c b/tst/deque.c
index b7d06c3..9242eeb 100644
--- a/tst/deque.c
+++ b/tst/deque.c
@@ -25,11 +25,11 @@ void test_deque(void)
         assert(get_arr[i] == val[9 - i]);
     }
     int trimmed[5] = {0};
-    int stuff = 5;
+    int get = 5;
     deque_trim(me);
     for (int i = 0; i < 7; i++) {
-        deque_pop_back(&stuff, me);
-        assert(stuff == val[i]);
+        deque_pop_back(&get, me);
+        assert(get == val[i]);
     }
     deque_copy_to_array(trimmed, me);
     assert(deque_size(me) == 3);
@@ -43,38 +43,33 @@ void test_deque(void)
     add = -1;
     deque_push_back(me, &add);
     assert(deque_size(me) == 6);
-    int aa = 0xdeadbeef;
-    int a = 0xdeadbeef;
-    int b = 0xdeadbeef;
-    int c = 0xdeadbeef;
-    int d = 0xdeadbeef;
-    int e = 0xdeadbeef;
-    int f = 0xdeadbeef;
-    int ff = 0xdeadbeef;
-    deque_get_first(&aa, me);
-    assert(aa == 10);
-    deque_get_at(&a, me, 0);
-    assert(a == 10);
-    deque_get_at(&b, me, 1);
-    assert(b == 9);
-    deque_get_at(&c, me, 2);
-    assert(c == 8);
-    deque_get_at(&d, me, 3);
-    assert(d == 3);
-    deque_get_at(&e, me, 4);
-    assert(e == -2);
-    deque_get_at(&f, me, 5);
-    assert(f == -1);
-    deque_get_last(&ff, me);
-    assert(ff == -1);
-    deque_pop_front(&stuff, me);
-    assert(stuff == 10);
-    deque_pop_back(&stuff, me);
-    assert(stuff == -1);
-    deque_pop_back(&stuff, me);
-    assert(stuff == -2);
+    get = 0xdeadbeef;
+    deque_get_first(&get, me);
+    assert(get == 10);
+    get = 0xdeadbeef;
+    deque_get_at(&get, me, 0);
+    assert(get == 10);
+    deque_get_at(&get, me, 1);
+    assert(get == 9);
+    deque_get_at(&get, me, 2);
+    assert(get == 8);
+    deque_get_at(&get, me, 3);
+    assert(get == 3);
+    deque_get_at(&get, me, 4);
+    assert(get == -2);
+    deque_get_at(&get, me, 5);
+    assert(get == -1);
+    get = 0xdeadbeef;
+    deque_get_last(&get, me);
+    assert(get == -1);
+    deque_pop_front(&get, me);
+    assert(get == 10);
+    deque_pop_back(&get, me);
+    assert(get == -1);
+    deque_pop_back(&get, me);
+    assert(get == -2);
     assert(deque_size(me) == 3);
-    int get = 345;
+    get = 345;
     deque_get_first(&get, me);
     assert(get == 9);
     deque_get_at(&get, me, 1);
diff --git a/tst/forward_list.c b/tst/forward_list.c
index be30725..70ce8d4 100644
--- a/tst/forward_list.c
+++ b/tst/forward_list.c
@@ -41,30 +41,25 @@ void test_forward_list(void)
     add = -2;
     forward_list_add_last(me, &add);
     assert(forward_list_size(me) == 6);
-    int aa = 0xdeadbeef;
-    int a = 0xdeadbeef;
-    int b = 0xdeadbeef;
-    int c = 0xdeadbeef;
-    int d = 0xdeadbeef;
-    int e = 0xdeadbeef;
-    int f = 0xdeadbeef;
-    int ff = 0xdeadbeef;
-    forward_list_get_first(&aa, me);
-    assert(aa == 10);
-    forward_list_get_at(&a, me, 0);
-    assert(a == 10);
-    forward_list_get_at(&b, me, 1);
-    assert(b == -1);
-    forward_list_get_at(&c, me, 2);
-    assert(c == 9);
-    forward_list_get_at(&d, me, 3);
-    assert(d == 8);
-    forward_list_get_at(&e, me, 4);
-    assert(e == 3);
-    forward_list_get_at(&f, me, 5);
-    assert(f == -2);
-    forward_list_get_last(&ff, me);
-    assert(ff == -2);
+    int get = 0xdeadbeef;
+    forward_list_get_first(&get, me);
+    assert(get == 10);
+    get = 0xdeadbeef;
+    forward_list_get_at(&get, me, 0);
+    assert(get == 10);
+    forward_list_get_at(&get, me, 1);
+    assert(get == -1);
+    forward_list_get_at(&get, me, 2);
+    assert(get == 9);
+    forward_list_get_at(&get, me, 3);
+    assert(get == 8);
+    forward_list_get_at(&get, me, 4);
+    assert(get == 3);
+    forward_list_get_at(&get, me, 5);
+    assert(get == -2);
+    get = 0xdeadbeef;
+    forward_list_get_last(&get, me);
+    assert(get == -2);
     forward_list_remove_first(me);
     forward_list_remove_at(me, 2);
     forward_list_remove_last(me);
diff --git a/tst/list.c b/tst/list.c
index f3553be..b5ade50 100644
--- a/tst/list.c
+++ b/tst/list.c
@@ -41,35 +41,30 @@ void test_list(void)
     add = -2;
     list_add_last(me, &add);
     assert(list_size(me) == 6);
-    int aa = 0xdeadbeef;
-    int a = 0xdeadbeef;
-    int b = 0xdeadbeef;
-    int c = 0xdeadbeef;
-    int d = 0xdeadbeef;
-    int e = 0xdeadbeef;
-    int f = 0xdeadbeef;
-    int ff = 0xdeadbeef;
-    list_get_first(&aa, me);
-    assert(aa == 10);
-    list_get_at(&a, me, 0);
-    assert(a == 10);
-    list_get_at(&b, me, 1);
-    assert(b == -1);
-    list_get_at(&c, me, 2);
-    assert(c == 9);
-    list_get_at(&d, me, 3);
-    assert(d == 8);
-    list_get_at(&e, me, 4);
-    assert(e == 3);
-    list_get_at(&f, me, 5);
-    assert(f == -2);
-    list_get_last(&ff, me);
-    assert(ff == -2);
+    int get = 0xdeadbeef;
+    list_get_first(&get, me);
+    assert(get == 10);
+    get = 0xdeadbeef;
+    list_get_at(&get, me, 0);
+    assert(get == 10);
+    list_get_at(&get, me, 1);
+    assert(get == -1);
+    list_get_at(&get, me, 2);
+    assert(get == 9);
+    list_get_at(&get, me, 3);
+    assert(get == 8);
+    list_get_at(&get, me, 4);
+    assert(get == 3);
+    list_get_at(&get, me, 5);
+    assert(get == -2);
+    get = 0xdeadbeef;
+    list_get_last(&get, me);
+    assert(get == -2);
     list_remove_first(me);
     list_remove_at(me, 2);
     list_remove_last(me);
     assert(list_size(me) == 3);
-    int get = 345;
+    get = 345;
     list_get_first(&get, me);
     assert(get == -1);
     list_get_at(&get, me, 1);
diff --git a/tst/vector.c b/tst/vector.c
index 4ead4cf..3f31e84 100644
--- a/tst/vector.c
+++ b/tst/vector.c
@@ -54,7 +54,7 @@ void test_vector(void)
         assert(get == val[9 - i]);
         assert(get_arr[i] == val[9 - i]);
     }
-    int *data = vector_get_data(me);
+    int *const data = vector_get_data(me);
     for (int i = 0; i < 10; i++) {
         assert(data[i] == val[9 - i]);
     }
@@ -76,35 +76,30 @@ void test_vector(void)
     add = -2;
     vector_add_last(me, &add);
     assert(vector_size(me) == 6);
-    int aa = 0xdeadbeef;
-    int a = 0xdeadbeef;
-    int b = 0xdeadbeef;
-    int c = 0xdeadbeef;
-    int d = 0xdeadbeef;
-    int e = 0xdeadbeef;
-    int f = 0xdeadbeef;
-    int ff = 0xdeadbeef;
-    vector_get_first(&aa, me);
-    assert(aa == 10);
-    vector_get_at(&a, me, 0);
-    assert(a == 10);
-    vector_get_at(&b, me, 1);
-    assert(b == -1);
-    vector_get_at(&c, me, 2);
-    assert(c == 9);
-    vector_get_at(&d, me, 3);
-    assert(d == 8);
-    vector_get_at(&e, me, 4);
-    assert(e == 3);
-    vector_get_at(&f, me, 5);
-    assert(f == -2);
-    vector_get_last(&ff, me);
-    assert(ff == -2);
+    int get = 0xdeadbeef;
+    vector_get_first(&get, me);
+    assert(get == 10);
+    get = 0xdeadbeef;
+    vector_get_at(&get, me, 0);
+    assert(get == 10);
+    vector_get_at(&get, me, 1);
+    assert(get == -1);
+    vector_get_at(&get, me, 2);
+    assert(get == 9);
+    vector_get_at(&get, me, 3);
+    assert(get == 8);
+    vector_get_at(&get, me, 4);
+    assert(get == 3);
+    vector_get_at(&get, me, 5);
+    assert(get == -2);
+    get = 0xdeadbeef;
+    vector_get_last(&get, me);
+    assert(get == -2);
     vector_remove_first(me);
     vector_remove_at(me, 2);
     vector_remove_last(me);
     assert(vector_size(me) == 3);
-    int get = 345;
+    get = 345;
     vector_get_first(&get, me);
     assert(get == -1);
     vector_get_at(&get, me, 1);