From b119cb228082946ea4cdf0f50f563d9ae1d51210 Mon Sep 17 00:00:00 2001 From: Niklas Hauser Date: Tue, 17 Nov 2015 10:31:06 +0000 Subject: [PATCH] Case: `timeout_ms` is unsigned, use 0 as do-not-use indicator. --- "frameworks\\utest/source/case.cpp" | 12 ++++++------ "frameworks\\utest/source/harness.cpp" | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git "a/frameworks\\utest/source/case.cpp" "b/frameworks\\utest/source/case.cpp" index 7d7aa526f4..2c391f6ab7 100644 --- "a/frameworks\\utest/source/case.cpp" +++ "b/frameworks\\utest/source/case.cpp" @@ -32,7 +32,7 @@ Case::Case(const char *description, setup_handler(setup_handler), teardown_handler(teardown_handler), failure_handler(failure_handler), - timeout_ms(-1) + timeout_ms(0) {} Case::Case(const char *description, @@ -45,7 +45,7 @@ Case::Case(const char *description, setup_handler(default_handler), teardown_handler(teardown_handler), failure_handler(failure_handler), - timeout_ms(-1) + timeout_ms(0) {} Case::Case(const char *description, @@ -57,7 +57,7 @@ Case::Case(const char *description, setup_handler(default_handler), teardown_handler(default_handler), failure_handler(failure_handler), - timeout_ms(-1) + timeout_ms(0) {} // control flow handler @@ -72,7 +72,7 @@ Case::Case(const char *description, setup_handler(setup_handler), teardown_handler(teardown_handler), failure_handler(failure_handler), - timeout_ms(-1) + timeout_ms(0) {} Case::Case(const char *description, @@ -84,7 +84,7 @@ Case::Case(const char *description, setup_handler(default_handler), teardown_handler(default_handler), failure_handler(failure_handler), - timeout_ms(-1) + timeout_ms(0) {} Case::Case(const char *description, @@ -97,7 +97,7 @@ Case::Case(const char *description, setup_handler(default_handler), teardown_handler(teardown_handler), failure_handler(failure_handler), - timeout_ms(-1) + timeout_ms(0) {} Case::Case(const char *description, diff --git "a/frameworks\\utest/source/harness.cpp" "b/frameworks\\utest/source/harness.cpp" index 20797f5dd9..0e2fdb6ce9 100644 --- "a/frameworks\\utest/source/harness.cpp" +++ "b/frameworks\\utest/source/harness.cpp" @@ -194,7 +194,7 @@ void Harness::run_next_case() case_repeat_count++; } - if (case_current->timeout_ms >= 0) { + if (case_current->timeout_ms > 0) { case_timeout_handle = minar::Scheduler::postCallback(handle_timeout) .delay(minar::milliseconds(case_current->timeout_ms)) .tolerance(0)