Merge e5c40e8 into bcabc12

Makefile.am

@@ -164,6 +164,7 @@ CppUTestTests_SOURCES = \
 	tests/TestRegistryTest.cpp \
 	tests/TestResultTest.cpp \
 	tests/TestUTestMacro.cpp \
+	tests/TestUTestMacro2.cpp \
 	tests/UtestTest.cpp \
 	tests/UtestPlatformTest.cpp
 
@@ -347,7 +348,7 @@ check_examples:
 	$(MAKE) -C $(srcdir)/examples all clean
 
 	@echo "Compiling and running the examples. This will use the old Makefile"
-	make distclean; $(srcdir)/configure --disable-longlong; make; $(MAKE) -C $(srcdir)/examples all clean CPPUTEST_LIB_LINK_DIR="`pwd`/lib"
+	make distclean; $(srcdir)/configure; make; $(MAKE) -C $(srcdir)/examples all clean CPPUTEST_LIB_LINK_DIR="`pwd`/lib"
 
 check_all: check_basic check_special_situations check_coverage remove_coverage_output check_examples check_gtest
 	@echo "Last... one normal build and test"

include/CppUTest/CppUTestConfig.h

@@ -201,12 +201,21 @@
 #endif
 
 /*
- * Support for "long long" type
+ * Support for "long long" type.
+ *
+ * Not supported when CPUTEST_LONG_LONG_DISABLED is set.
+ * Can be overridden by using CPPUTEST_USE_LONG_LONG
+ *
+ * CPPUTEST_HAVE_LONG_LONG_INT is set by configure
+ * LLONG_MAX is set in limits.h. This is a crude attempt to detect long long support when no configure is used
+ *
  */
 
-#if defined(CPPUTEST_HAVE_LONG_LONG_INT) && !defined(CPPUTEST_LONG_LONG_DISABLED) && !defined(CPPUTEST_USE_LONG_LONG)
+#if !defined(CPPUTEST_LONG_LONG_DISABLED) && !defined(CPPUTEST_USE_LONG_LONG)
+#if defined(CPPUTEST_HAVE_LONG_LONG_INT) || defined(LLONG_MAX)
 #define CPPUTEST_USE_LONG_LONG 1
 #endif
+#endif
 
 #ifdef CPPUTEST_USE_LONG_LONG
 typedef long long cpputest_longlong;

include/CppUTest/TestTestingFixture.h

@@ -31,6 +31,8 @@
 #include "TestRegistry.h"
 #include "TestOutput.h"
 
+#define CHECK_TEST_FAILS_PROPER_WITH_TEXT(text) TestTestingFixture::CHECK_TEST_FAILS_PROPER_WITH_TEXT_LOCATION(text, fixture, __FILE__, __LINE__)
+
 class TestTestingFixture
 {
 public:
@@ -121,11 +123,40 @@ class TestTestingFixture
     	return result_->getRunCount();
     }
 
+    static void CHECK_TEST_FAILS_PROPER_WITH_TEXT_LOCATION(const char* text, TestTestingFixture& fixture, const char* file, int line)
+    {
+        if (fixture.getFailureCount() != 1)
+            FAIL_LOCATION(StringFromFormat("Expected one test failure, but got %d amount of test failures", fixture.getFailureCount()).asCharString(), file, line); // LCOV_EXCL_LINE
+
+        STRCMP_CONTAINS_LOCATION(text, fixture.output_->getOutput().asCharString(), "", file, line);
+
+        if (getLineOfCodeExecutedAfterCheck())
+            FAIL_LOCATION("The test should jump/throw on failure and not execute the next line. However, the next line was executed.", file, line); // LCOV_EXCL_LINE
+
+    }
+
+    static void setLineOfCodeExecutedAfterCheck(const bool executed)
+    {
+        lineOfCodeExecutedAfterCheck(&executed);
+    }
+
+    static bool getLineOfCodeExecutedAfterCheck()
+    {
+        return lineOfCodeExecutedAfterCheck();
+    }
 
     TestRegistry* registry_;
     ExecFunctionTestShell* genTest_;
     StringBufferTestOutput* output_;
     TestResult * result_;
+
+private:
+    static bool lineOfCodeExecutedAfterCheck(const bool* const value = 0)
+    {
+         static bool lineOfCodeExecutedAfterCheck;
+         if (value) lineOfCodeExecutedAfterCheck = *value;
+         return lineOfCodeExecutedAfterCheck;
+    }
 };
 
 class SetBooleanOnDestructorCall

platforms/Dos/sources.mk

@@ -72,6 +72,7 @@ CPPU3_OBJECTS := \
   $(CPPUTEST_HOME)/tests/TestInstallerTest.o \
   $(CPPUTEST_HOME)/tests/TestMemoryAllocatorTest.o \
   $(CPPUTEST_HOME)/tests/TestUTestMacro.o \
+  $(CPPUTEST_HOME)/tests/TestUTestMacro2.o \
   $(CPPUTEST_HOME)/tests/UtestPlatformTest.o \
   $(CPPUTEST_HOME)/tests/UtestTest.o \
 

tests/AllocLetTestFreeTest.cpp

@@ -1,5 +1,5 @@
 
-#include "CppUTest/StandardCLibrary.h"
+#include "CppUTest/TestHarness.h"
 
 extern "C"
 {

tests/CMakeLists.txt

@@ -27,6 +27,7 @@ set(CppUTestTests_src
     TestResultTest.cpp
     PreprocessorTest.cpp
     TestUTestMacro.cpp
+    TestUTestMacro2.cpp
     AllocationInCppFile.cpp
     UtestTest.cpp
     SimpleMutexTest.cpp