/hg/icedtea-web: 2 new changesets
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Wed Nov 21 10:16:30 PST 2012
changeset dfc88a1018d9 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dfc88a1018d9
author: Adam Domurad <adomurad at redhat.com>
date: Wed Nov 21 12:37:38 2012 -0500
Add UnitTest++ source code into ITW, without integration.
changeset c7b7bd6fffb3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c7b7bd6fffb3
author: Adam Domurad <adomurad at redhat.com>
date: Wed Nov 21 13:09:54 2012 -0500
Unit test integration for UnitTest++ with icedtea-web
diffstat:
ChangeLog | 63 +++++++++
Makefile.am | 78 +++++++++++-
plugin/icedteanp/IcedTeaPluginUtils.h | 3 +-
plugin/icedteanp/IcedTeaRunnable.h | 3 +
tests/UnitTest++/COPYING | 20 +++
tests/UnitTest++/Makefile | 96 ++++++++++++++
tests/UnitTest++/README | 68 ++++++++++
tests/UnitTest++/src/AssertException.cpp | 34 +++++
tests/UnitTest++/src/AssertException.h | 28 ++++
tests/UnitTest++/src/CheckMacros.h | 122 ++++++++++++++++++
tests/UnitTest++/src/Checks.cpp | 50 +++++++
tests/UnitTest++/src/Checks.h | 158 ++++++++++++++++++++++++
tests/UnitTest++/src/Config.h | 31 ++++
tests/UnitTest++/src/CurrentTest.cpp | 18 ++
tests/UnitTest++/src/CurrentTest.h | 17 ++
tests/UnitTest++/src/DeferredTestReporter.cpp | 29 ++++
tests/UnitTest++/src/DeferredTestReporter.h | 28 ++++
tests/UnitTest++/src/DeferredTestResult.cpp | 25 +++
tests/UnitTest++/src/DeferredTestResult.h | 29 ++++
tests/UnitTest++/src/ExecuteTest.h | 46 ++++++
tests/UnitTest++/src/MemoryOutStream.cpp | 149 ++++++++++++++++++++++
tests/UnitTest++/src/MemoryOutStream.h | 67 ++++++++++
tests/UnitTest++/src/Posix/SignalTranslator.cpp | 46 ++++++
tests/UnitTest++/src/Posix/SignalTranslator.h | 42 ++++++
tests/UnitTest++/src/Posix/TimeHelpers.cpp | 33 +++++
tests/UnitTest++/src/Posix/TimeHelpers.h | 28 ++++
tests/UnitTest++/src/ReportAssert.cpp | 10 +
tests/UnitTest++/src/ReportAssert.h | 10 +
tests/UnitTest++/src/Test.cpp | 41 ++++++
tests/UnitTest++/src/Test.h | 34 +++++
tests/UnitTest++/src/TestDetails.cpp | 22 +++
tests/UnitTest++/src/TestDetails.h | 24 +++
tests/UnitTest++/src/TestList.cpp | 39 +++++
tests/UnitTest++/src/TestList.h | 32 ++++
tests/UnitTest++/src/TestMacros.h | 113 +++++++++++++++++
tests/UnitTest++/src/TestReporter.cpp | 10 +
tests/UnitTest++/src/TestReporter.h | 20 +++
tests/UnitTest++/src/TestReporterStdout.cpp | 41 ++++++
tests/UnitTest++/src/TestReporterStdout.h | 19 ++
tests/UnitTest++/src/TestResults.cpp | 60 +++++++++
tests/UnitTest++/src/TestResults.h | 36 +++++
tests/UnitTest++/src/TestRunner.cpp | 76 +++++++++++
tests/UnitTest++/src/TestRunner.h | 61 +++++++++
tests/UnitTest++/src/TestSuite.h | 14 ++
tests/UnitTest++/src/TimeConstraint.cpp | 29 ++++
tests/UnitTest++/src/TimeConstraint.h | 33 +++++
tests/UnitTest++/src/TimeHelpers.h | 7 +
tests/UnitTest++/src/UnitTest++.h | 18 ++
tests/UnitTest++/src/XmlTestReporter.cpp | 127 +++++++++++++++++++
tests/UnitTest++/src/XmlTestReporter.h | 34 +++++
tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 48 +++++++
tests/cpp-unit-tests/main.cc | 105 +++++++++++++++
52 files changed, 2371 insertions(+), 3 deletions(-)
diffs (truncated from 2631 to 500 lines):
diff -r b28386115aae -r c7b7bd6fffb3 ChangeLog
--- a/ChangeLog Wed Nov 21 10:54:55 2012 -0500
+++ b/ChangeLog Wed Nov 21 13:09:54 2012 -0500
@@ -1,3 +1,66 @@
+2012-11-21 Adam Domurad <adomurad at redhat.com>
+
+ Support for C++ unit testing with UnitTest++ for IcedTeaWeb.
+ * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: New, contains tests
+ for utility functions.
+ * tests/cpp-unit-tests/main.cc: New, contains unit test runner.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Remove incorrect circular
+ include dependency
+ * plugin/icedteanp/IcedTeaRunnable.h: Add includes necessary for
+ self-sustaining header.
+ * Makefile.am: Add targets for unit test compilation and running,
+ eg 'make run-cpp-unit-tests'.
+
+2012-11-21 Adam Domurad <adomurad at redhat.com>
+
+ Add the source code to UnitTest++ into the project.
+ * tests/UnitTest++/COPYING: Part of UnitTest++
+ * tests/UnitTest++/Makefile: Part of UnitTest++
+ * tests/UnitTest++/README: Part of UnitTest++
+ * tests/UnitTest++/src/AssertException.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/AssertException.h: Part of UnitTest++
+ * tests/UnitTest++/src/CheckMacros.h: Part of UnitTest++
+ * tests/UnitTest++/src/Checks.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/Checks.h: Part of UnitTest++
+ * tests/UnitTest++/src/Config.h: Part of UnitTest++
+ * tests/UnitTest++/src/CurrentTest.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/CurrentTest.h: Part of UnitTest++
+ * tests/UnitTest++/src/DeferredTestReporter.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/DeferredTestReporter.h: Part of UnitTest++
+ * tests/UnitTest++/src/DeferredTestResult.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/DeferredTestResult.h: Part of UnitTest++
+ * tests/UnitTest++/src/ExecuteTest.h: Part of UnitTest++
+ * tests/UnitTest++/src/MemoryOutStream.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/MemoryOutStream.h: Part of UnitTest++
+ * tests/UnitTest++/src/Posix/SignalTranslator.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/Posix/SignalTranslator.h: Part of UnitTest++
+ * tests/UnitTest++/src/Posix/TimeHelpers.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/Posix/TimeHelpers.h: Part of UnitTest++
+ * tests/UnitTest++/src/ReportAssert.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/ReportAssert.h: Part of UnitTest++
+ * tests/UnitTest++/src/Test.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/Test.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestDetails.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TestDetails.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestList.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TestList.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestMacros.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestReporter.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TestReporter.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestReporterStdout.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TestReporterStdout.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestResults.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TestResults.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestRunner.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TestRunner.h: Part of UnitTest++
+ * tests/UnitTest++/src/TestSuite.h: Part of UnitTest++
+ * tests/UnitTest++/src/TimeConstraint.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/TimeConstraint.h: Part of UnitTest++
+ * tests/UnitTest++/src/TimeHelpers.h: Part of UnitTest++
+ * tests/UnitTest++/src/UnitTest++.h: Part of UnitTest++
+ * tests/UnitTest++/src/XmlTestReporter.cpp: Part of UnitTest++
+ * tests/UnitTest++/src/XmlTestReporter.h: Part of UnitTest++
+
2012-11-21 Adam Domurad <adomurad at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
diff -r b28386115aae -r c7b7bd6fffb3 Makefile.am
--- a/Makefile.am Wed Nov 21 10:54:55 2012 -0500
+++ b/Makefile.am Wed Nov 21 13:09:54 2012 -0500
@@ -25,6 +25,9 @@
export TEST_EXTENSIONS_TESTS_SRCDIR=$(TESTS_SRCDIR)/test-extensions-tests
export REPRODUCERS_TESTS_SRCDIR=$(TESTS_SRCDIR)/reproducers
export TEST_EXTENSIONS_DIR=$(TESTS_DIR)/test-extensions
+export CPP_UNITTEST_FRAMEWORK_SRCDIR=$(TESTS_SRCDIR)/UnitTest++
+export CPP_UNITTEST_SRCDIR=$(TESTS_SRCDIR)/cpp-unit-tests
+export CPP_UNITTEST_DIR=$(TESTS_DIR)/cpp-unit-tests
export TEST_EXTENSIONS_COMPATIBILITY_SYMLINK=$(TESTS_DIR)/netx/jnlp_testsengine
export TEST_EXTENSIONS_TESTS_DIR=$(TESTS_DIR)/test-extensions-tests
export REPRODUCERS_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/reproducers_test_server_deploydir
@@ -61,6 +64,10 @@
export OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
export OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
export BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
+export CPP_UNITTEST_FRAMEWORK_BUILDDIR=$(CPP_UNITTEST_DIR)/UnitTest++
+export CPP_UNITTEST_FRAMEWORK_LIB_NAME=libUnitTest++.a
+export CPP_UNITTEST_FRAMEWORK_LIB=$(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/$(CPP_UNITTEST_FRAMEWORK_LIB_NAME)
+export CPP_UNITTEST_EXECUTABLE=$(CPP_UNITTEST_DIR)/IcedTeaPluginUnitTests
export MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
export MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
export OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
@@ -288,6 +295,75 @@
$(MOZILLA_LIBS) \
-shared -o $@
+# Start of CPP Unit test targets
+
+# Note that UnitTest++ has its own makefile, however this is avoided because it creates an in-source build.
+$(CPP_UNITTEST_FRAMEWORK_LIB): $(CPP_UNITTEST_FRAMEWORK_SRCDIR)
+ mkdir -p $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) && \
+ pushd $(CPP_UNITTEST_FRAMEWORK_SRCDIR) && \
+ for cppfile in $$(find $(CPP_UNITTEST_FRAMEWORK_SRCDIR) -name '*.cpp') ; \
+ do \
+ objfile="$(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/$$(basename $${cppfile%.cpp}).o" ; \
+ $(CXX) $(CXXFLAGS) -c $$cppfile -o $$objfile || exit 1 ; \
+ done ; \
+ ar cr $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o ; \
+ popd
+
+clean-unittest++:
+ rm $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o
+ rm $(CPP_UNITTEST_FRAMEWORK_LIB)
+ rmdir $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)
+ rmdir $(CPP_UNITTEST_DIR) &> /dev/null
+
+stamps/cpp-unit-tests-compile.stamp: $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_SRCDIR) $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+ mkdir -p $(CPP_UNITTEST_DIR) && \
+ pushd $(CPP_UNITTEST_SRCDIR) && \
+ for cppfile in $$(find $(CPP_UNITTEST_SRCDIR) -name '*.cc') ; \
+ do \
+ objfile="$(CPP_UNITTEST_DIR)/$$(basename $${cppfile%.cc}).o" ; \
+ echo "Compiling $$cppfile to $$objfile"; \
+ $(CXX) $(CXXFLAGS) \
+ $(DEFS) $(VERSION_DEFS) \
+ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
+ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
+ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
+ -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
+ -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
+ -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
+ -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(MOZILLA_CFLAGS) \
+ "-I$(CPP_UNITTEST_FRAMEWORK_SRCDIR)/src" \
+ "-I$(PLUGIN_SRCDIR)" \
+ -o $$objfile -c $$cppfile || exit 1 ; \
+ done ; \
+ popd ; \
+ mkdir -p stamps ; \
+ touch $@
+
+$(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp
+ cd $(CPP_UNITTEST_DIR) && \
+ $(CXX) $(CXXFLAGS) \
+ $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \
+ $(CPP_UNITTEST_DIR)/*.o \
+ $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(MOZILLA_LIBS) \
+ $(CPP_UNITTEST_FRAMEWORK_LIB)\
+ $(BUILT_CPP_UNIT_TEST_FRAMEWORK) -o $@
+
+clean-cpp-unit-tests:
+ rm stamps/cpp-unit-tests-compile.stamp &> /dev/null
+ rm $(CPP_UNITTEST_EXECUTABLE)
+ rm $(CPP_UNITTEST_DIR)/*.o
+ rmdir $(CPP_UNITTEST_DIR) &> /dev/null
+
+run-cpp-unit-tests: $(CPP_UNITTEST_EXECUTABLE)
+ $(CPP_UNITTEST_EXECUTABLE)
+
+# End of CPP Unit test targets
+
clean-IcedTeaPlugin:
rm -f $(PLUGIN_DIR)/*.o
rm -f $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY)
@@ -494,7 +570,7 @@
# check
# ==========================
-clean-tests: clean-netx-tests
+clean-tests: clean-netx-tests clean-cpp-unit-tests clean-unittest++
if [ -e $(TESTS_DIR) ]; then \
rmdir $(TESTS_DIR) ; \
fi
diff -r b28386115aae -r c7b7bd6fffb3 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h Wed Nov 21 10:54:55 2012 -0500
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h Wed Nov 21 13:09:54 2012 -0500
@@ -56,6 +56,7 @@
#include <vector>
#include <npapi.h>
+#include <glib.h>
#if MOZILLA_VERSION_COLLAPSED < 1090100
#include <npupp.h>
@@ -64,8 +65,6 @@
#include <npruntime.h>
#endif
-#include "IcedTeaNPPlugin.h"
-
#define PLUGIN_DEBUG(...) \
do \
{ \
diff -r b28386115aae -r c7b7bd6fffb3 plugin/icedteanp/IcedTeaRunnable.h
--- a/plugin/icedteanp/IcedTeaRunnable.h Wed Nov 21 10:54:55 2012 -0500
+++ b/plugin/icedteanp/IcedTeaRunnable.h Wed Nov 21 13:09:54 2012 -0500
@@ -42,6 +42,9 @@
#define MOZILLA 1
#if MOZILLA
+#include <string>
+#include <npapi.h>
+
#if MOZILLA_VERSION_COLLAPSED < 1090100
#include <nsIRunnable.h>
#include <string>
diff -r b28386115aae -r c7b7bd6fffb3 tests/UnitTest++/COPYING
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/UnitTest++/COPYING Wed Nov 21 13:09:54 2012 -0500
@@ -0,0 +1,20 @@
+Copyright (c) 2006 Noel Llopis and Charles Nicholson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -r b28386115aae -r c7b7bd6fffb3 tests/UnitTest++/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/UnitTest++/Makefile Wed Nov 21 13:09:54 2012 -0500
@@ -0,0 +1,96 @@
+CXX = g++
+CXXFLAGS ?= -g -Wall -W -ansi # -pedantic
+LDFLAGS ?=
+SED = sed
+MV = mv
+RM = rm
+
+.SUFFIXES: .o .cpp
+
+lib = libUnitTest++.a
+test = TestUnitTest++
+
+src = src/AssertException.cpp \
+ src/Test.cpp \
+ src/Checks.cpp \
+ src/TestRunner.cpp \
+ src/TestResults.cpp \
+ src/TestReporter.cpp \
+ src/TestReporterStdout.cpp \
+ src/ReportAssert.cpp \
+ src/TestList.cpp \
+ src/TimeConstraint.cpp \
+ src/TestDetails.cpp \
+ src/MemoryOutStream.cpp \
+ src/DeferredTestReporter.cpp \
+ src/DeferredTestResult.cpp \
+ src/XmlTestReporter.cpp \
+ src/CurrentTest.cpp
+
+ifeq ($(MSYSTEM), MINGW32)
+ src += src/Win32/TimeHelpers.cpp
+else
+ src += src/Posix/SignalTranslator.cpp \
+ src/Posix/TimeHelpers.cpp
+endif
+
+test_src = src/tests/Main.cpp \
+ src/tests/TestAssertHandler.cpp \
+ src/tests/TestChecks.cpp \
+ src/tests/TestUnitTest++.cpp \
+ src/tests/TestTest.cpp \
+ src/tests/TestTestResults.cpp \
+ src/tests/TestTestRunner.cpp \
+ src/tests/TestCheckMacros.cpp \
+ src/tests/TestTestList.cpp \
+ src/tests/TestTestMacros.cpp \
+ src/tests/TestTimeConstraint.cpp \
+ src/tests/TestTimeConstraintMacro.cpp \
+ src/tests/TestMemoryOutStream.cpp \
+ src/tests/TestDeferredTestReporter.cpp \
+ src/tests/TestXmlTestReporter.cpp \
+ src/tests/TestCurrentTest.cpp
+
+objects = $(patsubst %.cpp, %.o, $(src))
+test_objects = $(patsubst %.cpp, %.o, $(test_src))
+dependencies = $(subst .o,.d,$(objects))
+test_dependencies = $(subst .o,.d,$(test_objects))
+
+define make-depend
+ $(CXX) $(CXXFLAGS) -M $1 | \
+ $(SED) -e 's,\($(notdir $2)\) *:,$(dir $2)\1: ,' > $3.tmp
+ $(SED) -e 's/#.*//' \
+ -e 's/^[^:]*: *//' \
+ -e 's/ *\\$$//' \
+ -e '/^$$/ d' \
+ -e 's/$$/ :/' $3.tmp >> $3.tmp
+ $(MV) $3.tmp $3
+endef
+
+
+all: $(lib)
+
+
+$(lib): $(objects)
+ @echo Creating $(lib) library...
+ @ar cr $(lib) $(objects)
+
+$(test): $(lib) $(test_objects)
+ @echo Linking $(test)...
+ @$(CXX) $(LDFLAGS) -o $(test) $(test_objects) $(lib)
+ @echo Running unit tests...
+ @./$(test)
+
+clean:
+ -@$(RM) $(objects) $(test_objects) $(dependencies) $(test_dependencies) $(test) $(lib) 2> /dev/null
+
+%.o : %.cpp
+ @echo $<
+ @$(call make-depend,$<,$@,$(subst .o,.d,$@))
+ @$(CXX) $(CXXFLAGS) -c $< -o $(patsubst %.cpp, %.o, $<)
+
+
+ifneq "$(MAKECMDGOALS)" "clean"
+-include $(dependencies)
+-include $(test_dependencies)
+endif
diff -r b28386115aae -r c7b7bd6fffb3 tests/UnitTest++/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/UnitTest++/README Wed Nov 21 13:09:54 2012 -0500
@@ -0,0 +1,68 @@
+UnitTest++ README
+Version: v1.4
+Last update: 2008-10-30
+
+UnitTest++ is free software. You may copy, distribute, and modify it under
+the terms of the License contained in the file COPYING distributed
+with this package. This license is the same as the MIT/X Consortium
+license.
+
+See src/tests/TestUnitTest++.cpp for usage.
+
+Authors:
+Noel Llopis (llopis at convexhull.com)
+Charles Nicholson (charles.nicholson at gmail.com)
+
+Contributors:
+Jim Tilander
+Kim Grasman
+Jonathan Jansson
+Dirck Blaskey
+Rory Driscoll
+Dan Lind
+Matt Kimmel -- Submitted with permission from Blue Fang Games
+Anthony Moralez
+Jeff Dixon
+Randy Coulman
+Lieven van der Heide
+
+Release notes:
+--------------
+Version 1.4 (2008-10-30)
+- CHECK macros work at arbitrary stack depth from inside TESTs.
+- Remove obsolete TEST_UTILITY macros
+- Predicated test execution (via TestRunner::RunTestsIf)
+- Better exception handling for fixture ctors/dtors.
+- VC6/7/8/9 support
+
+Version 1.3 (2007-4-22)
+- Removed dynamic memory allocations (other than streams)
+- MinGW support
+- Consistent (native) line endings
+- Minor bug fixing
+
+Version 1.2 (2006-10-29)
+- First pass at documentation.
+- More detailed error crash catching in fixtures.
+- Standard streams used for printing objects under check. This should allow the
+ use of standard class types such as std::string or other custom classes with
+ stream operators to ostream.
+- Standard streams can be optionally compiled off by defining UNITTEST_USE_CUSTOM_STREAMS
+ in Config.h
+- Added named test suites
+- Added CHECK_ARRAY2D_CLOSE
+- Posix library name is libUnitTest++.a now
+- Floating point numbers are postfixed with f in the failure reports
+
+Version 1.1 (2006-04-18)
+- CHECK macros do not have side effects even if one of the parameters changes state
+- Removed CHECK_ARRAY_EQUAL (too similar to CHECK_ARRAY_CLOSE)
+- Added local and global time constraints
+- Removed dependencies on strstream
+- Improved Posix signal to exception translator
+- Failing tests are added to Visual Studio's error list
+- Fixed Visual Studio projects to work with spaces in directories
+
+Version 1.0 (2006-03-15)
+- Initial release
+
diff -r b28386115aae -r c7b7bd6fffb3 tests/UnitTest++/src/AssertException.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/UnitTest++/src/AssertException.cpp Wed Nov 21 13:09:54 2012 -0500
@@ -0,0 +1,34 @@
+#include "AssertException.h"
+#include <cstring>
+
+namespace UnitTest {
+
+AssertException::AssertException(char const* description, char const* filename, int lineNumber)
+ : m_lineNumber(lineNumber)
+{
+ using namespace std;
+
+ strcpy(m_description, description);
+ strcpy(m_filename, filename);
+}
+
+AssertException::~AssertException() throw()
+{
+}
+
+char const* AssertException::what() const throw()
+{
+ return m_description;
+}
+
+char const* AssertException::Filename() const
+{
+ return m_filename;
+}
+
+int AssertException::LineNumber() const
+{
+ return m_lineNumber;
+}
+
+}
diff -r b28386115aae -r c7b7bd6fffb3 tests/UnitTest++/src/AssertException.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/UnitTest++/src/AssertException.h Wed Nov 21 13:09:54 2012 -0500
@@ -0,0 +1,28 @@
+#ifndef UNITTEST_ASSERTEXCEPTION_H
+#define UNITTEST_ASSERTEXCEPTION_H
+
+#include <exception>
+
+
+namespace UnitTest {
+
+class AssertException : public std::exception
+{
+public:
+ AssertException(char const* description, char const* filename, int lineNumber);
+ virtual ~AssertException() throw();
+
+ virtual char const* what() const throw();
+
+ char const* Filename() const;
+ int LineNumber() const;
+
+private:
+ char m_description[512];
+ char m_filename[256];
+ int m_lineNumber;
+};
+
+}
+
+#endif
diff -r b28386115aae -r c7b7bd6fffb3 tests/UnitTest++/src/CheckMacros.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/UnitTest++/src/CheckMacros.h Wed Nov 21 13:09:54 2012 -0500
@@ -0,0 +1,122 @@
+#ifndef UNITTEST_CHECKMACROS_H
+#define UNITTEST_CHECKMACROS_H
+
+#include "Checks.h"
+#include "AssertException.h"
+#include "MemoryOutStream.h"
+#include "TestDetails.h"
+#include "CurrentTest.h"
+
+#ifdef CHECK
+ #error UnitTest++ redefines CHECK
+#endif
+
+#ifdef CHECK_EQUAL
+ #error UnitTest++ redefines CHECK_EQUAL
+#endif
+
+#ifdef CHECK_CLOSE
More information about the distro-pkg-dev
mailing list