From 7332ed1e8f7bf3d7c9c68c12a9f7e4c930473f98 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Tue, 6 May 2014 23:03:22 -0400 Subject: [PATCH] queue: Move unit test up one directory And modify it a bit to match my recent work. Signed-off-by: Anna Schumaker --- tests/.gitignore | 1 + tests/Sconscript | 1 + tests/queue | 6 ------ tests/{src => }/queue.cpp | 11 +++-------- 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100755 tests/queue rename tests/{src => }/queue.cpp (86%) diff --git a/tests/.gitignore b/tests/.gitignore index 5f5223fc..e51c1ed3 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -5,3 +5,4 @@ index filter idle tags +queue diff --git a/tests/Sconscript b/tests/Sconscript index 02703643..8630b3db 100644 --- a/tests/Sconscript +++ b/tests/Sconscript @@ -16,6 +16,7 @@ tests = [ ("filter.cpp", True, []), ("idle.cpp", False, [ "idle.cpp" ]), ("tags.cpp", True, []), + ("queue.cpp", True, [ "callback.cpp" ]), ] diff --git a/tests/queue b/tests/queue deleted file mode 100755 index 791fe29c..00000000 --- a/tests/queue +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Copyright 2014 (c) Anna Schumaker. - -. $(dirname $0)/_functions - -./src/queue.run diff --git a/tests/src/queue.cpp b/tests/queue.cpp similarity index 86% rename from tests/src/queue.cpp rename to tests/queue.cpp index 545e5bbc..67426715 100644 --- a/tests/src/queue.cpp +++ b/tests/queue.cpp @@ -21,7 +21,6 @@ void test_default() { TestQueue q; - test :: new_test("Queue Default Constructor Test"); test :: equal(q.get_cur(), (unsigned)-1); test :: equal(q.get_flags(), (unsigned)0); test :: equal(q.get_length(), (unsigned)0); @@ -33,20 +32,17 @@ void test_constructor(unsigned int flags) { TestQueue q(flags | (1 << 30)); - test :: new_test("Queue Constructor Test"); test :: equal(q.get_cur(), (unsigned)-1); test :: equal(q.get_flags(), flags); test :: equal(q.get_length(), (unsigned)0); test :: equal(q.get_sorder().size(), (size_t)0); test :: equal(q.next(), (Track *)NULL); - test :: end(); } void test_flags() { TestQueue q(0); - test :: new_test("Queue Flag Test"); test :: equal(q.get_flags(), (unsigned)0); q.set_flag(Q_ENABLED); @@ -61,13 +57,12 @@ void test_flags() test :: equal(q.has_flag(Q_RANDOM), true); test :: equal(q.has_flag(Q_REPEAT), true); test :: equal(q.has_flag(Q_NO_SORT), false); - test ::end(); } int main(int argc, char **argv) { - test_default(); - test_constructor(Q_ENABLED | Q_RANDOM); - test_flags(); + run_test("Queue Default Constructor Test", test_default); + run_test("Queue Constructor Test", test_constructor, Q_ENABLED | Q_RANDOM); + run_test("Queue Flag Test", test_flags); return 0; }