Examples/cppunittest/makefile.

examples/cppunittest/makefile.am : added TestSetupTest.(cpp/h)

* examples/examples.dsw: removed some unnecessary dependencies.

* examples/msvc6/HostApp/HostApp.dsp: fixed release configuration

* src/msvc6/DSPlugIn/DSPlugIn.dsp: fixed release configuration, and
disabled the custom build command that does not work.

* include/cppunit/extensions/HelperMacros.h: reordered header to remove
some warning with VC++.

* INSTALL-WIN32.txt : detailed what was in each project. Added a FAQ
about the failing test case in cppunittest.

7 files changed, 74 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 12305b9..96f6abd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-09-19 Baptiste Lepilleur <gaiacrtn@free.fr>
+
+	* examples/cppunittest/makefile.am : added TestSetupTest.(cpp/h)
+
+	* examples/examples.dsw: removed some unnecessary dependencies. 
+
+	* examples/msvc6/HostApp/HostApp.dsp: fixed release configuration
+
+	* src/msvc6/DSPlugIn/DSPlugIn.dsp: fixed release configuration, and
+	disabled the custom build command that does not work.
+
+	* include/cppunit/extensions/HelperMacros.h: reordered header to remove
+	some warning with VC++.
+
+	* INSTALL-WIN32.txt : detailed what was in each project. Added a FAQ 
+	about the failing test case in cppunittest.
+
 2001-09-19  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>
 
 	* README: Describe how to check if libtool is fixed.
@@ -15,6 +32,7 @@
 	* include/cppunit/Portability.h: Qualify ostrstream with std.
 	Suggested by Patrick Hartling.
 
+>>>>>>> 1.69
 2001-09-18 Baptiste Lepilleur <gaiacrtn@free.fr>
 
 	* examples/examples.dsw:
diff --git a/INSTALL-WIN32.txt b/INSTALL-WIN32.txt
index 8770ed6..06a2d59 100644
--- a/INSTALL-WIN32.txt
+++ b/INSTALL-WIN32.txt
@@ -1,29 +1,52 @@
 At the current time, the only supported WIN32 platform is 
 Microsoft Visual C++. You must have VC++ 6.0 at least.
 
+Quick Steps to compile & run a sample using the GUI TestRunner:
+- Open examples/examples.dsw in VC++ (contains all the samples)
+- Make HostApp the Active project
+- Compile & Run
 
-Build Targets:
---------------
 
-* cppunit.lib : unit testing framework library, the one you use to
-write unit tests.
+Project build Target:
+---------------------
+
+Framework & tools:
+
+* cppunit (cppunit.lib) : unit testing framework library, the one you use 
+to write unit tests.
+
+* TestRunner (testrunner.dll) : a MFC extension DLL to run and browser unit 
+tests from a GUI.
+
+* DSPlugIn (dspluging.dll) : a VC++ add-in used by testrunner.dll to open 
+the file containing a test failure by double-clicking on the failure in the 
+GUI.
+
+* TestPlugInRunner : (Warning: experimental) a VC++ 
+application to run test plug-in. A test plug-in is a DLL that publish a 
+specified interface. This application is still incomplete (the auto-reload 
+feature is missing).
 
-* testrunner.dll : a MFC extension DLL to run and browser unit tests 
-from a GUI.
+All libraries are placed in the Lib/ directory.
 
-* dspluging.dll : a VC++ add-in used by testrunner.dll to open the
-file containing a test failure by double-clicking on the failure
-in the GUI.
 
-* testpluginrunner : (Warning: experimental) a VC++ application to run 
-test plug-in. A test plug-in is a DLL that publish a specified interface.
-This application is still incomplete (the auto-reload feature is missing).
+Examples:
 
-  Quick Steps to compile & run a sample using the GUI TestRunner:
-  - Open examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw in VC++
-    (A sample using the GUI TestRunner to run CppUnit one's unit tests)
-  - Make CppUnitTestApp the Active project
-  - Compile & Run
+* CppUnitTestMain : the actual test suite use to test CppUnit. Use a 
+TextTestRunner.
+
+* CppUnitTestApp : contains the same test suite as CppUnitTestMain, but
+run them using the MFC TestRunner.
+
+* hierarchy : a sample demonstrating how to sublcass test (you might rather
+want to use HelperMacros.h and the CPPUNIT_TEST_SUB_SUITE macro which does
+it in a 'cleaner' way. That sample has not been updated for a long time).
+
+* HostApp : a sample using the MFC TestRunner demonstrating different test
+failure.
+
+* TestPlugIn : a sample demonstrating how to write a TestPlugIn for the
+TestPlugInRunner (experimental).
 
 
 Configuration:
@@ -133,3 +156,10 @@ do so for all configurations.
    In Debug configurations, CppUnit use "Debug Multihreaded DLL".
    Check that Projects/Settings.../C++/Code Generation is indeed using
 the correct library.
+
+3) Why does the test ExceptionTest.testAssignment failed in CppUnit test 
+   suite ?
+
+   I've never been able to figure out why that test failed. It seems to
+specific to VC++ since it pass sucessfully with gcc. I you can figure that
+out, you're welcome!
diff --git a/examples/cppunittest/Makefile.am b/examples/cppunittest/Makefile.am
index 267d238..080c7c4 100644
--- a/examples/cppunittest/Makefile.am
+++ b/examples/cppunittest/Makefile.am
@@ -41,6 +41,8 @@ cppunittestmain_SOURCES = \
 	TestFailureTest.h \
 	TestResultTest.cpp \
 	TestResultTest.h \
+	TestSetUpTest.cpp \
+	TestSetUpTest.h \
 	TestSuiteTest.cpp \
 	TestSuiteTest.h \
 	TrackedTestCase.cpp \
diff --git a/examples/examples.dsw b/examples/examples.dsw
index 6576808..63e604b 100644
--- a/examples/examples.dsw
+++ b/examples/examples.dsw
@@ -12,14 +12,8 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name cppunit
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name TestRunner
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DSPlugIn
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -62,12 +56,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name TestRunner
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cppunit
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DSPlugIn
-    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/examples/msvc6/HostApp/HostApp.dsp b/examples/msvc6/HostApp/HostApp.dsp
index 7e7de59..d48cbaf 100644
--- a/examples/msvc6/HostApp/HostApp.dsp
+++ b/examples/msvc6/HostApp/HostApp.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ..\..\..\lib\cppunit.lib ..\..\..\lib\testrunner.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunner.lib /nologo /subsystem:windows /machine:I386
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Cmds=copy ..\..\..\lib\testrunner.dll Release
diff --git a/include/cppunit/extensions/HelperMacros.h b/include/cppunit/extensions/HelperMacros.h
index 21d3340..495f97c 100644
--- a/include/cppunit/extensions/HelperMacros.h
+++ b/include/cppunit/extensions/HelperMacros.h
@@ -7,9 +7,9 @@
 #define CPPUNIT_EXTENSIONS_HELPERMACROS_H
 
 #include <cppunit/Portability.h>
-#include <string>
 #include <cppunit/extensions/AutoRegisterSuite.h>
 #include <cppunit/extensions/TestSuiteBuilder.h>
+#include <string>
 
 // The macro __CPPUNIT_SUITE_CTOR_ARGS expand to an expression used to construct
 // the TestSuiteBuilder with macro CPPUNIT_TEST_SUITE.
diff --git a/src/msvc6/DSPlugIn/DSPlugIn.dsp b/src/msvc6/DSPlugIn/DSPlugIn.dsp
index de7a74d..19dd05a 100644
--- a/src/msvc6/DSPlugIn/DSPlugIn.dsp
+++ b/src/msvc6/DSPlugIn/DSPlugIn.dsp
@@ -62,7 +62,8 @@ InputPath=\prg\vc\Lib\cppunit\lib\TestRunnerDSPlugIn.dll
 SOURCE="$(InputPath)"
 
 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	"$(TargetPath)" /RegServer 
+	rem Following command disabled since it does not work 
+	rem "$(TargetPath)" /RegServer 
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
 	echo Server registration done! 
 	
@@ -102,7 +103,8 @@ InputPath=\prg\vc\Lib\cppunit\lib\TestRunnerDSPlugInD.dll
 SOURCE="$(InputPath)"
 
 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	"$(TargetPath)" /RegServer 
+	rem Following command disabled since it does not work 
+	rem "$(TargetPath)" /RegServer 
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
 	echo Server registration done! 
 	
@@ -144,7 +146,7 @@ SOURCE=.\TestRunnerDSPlugin.idl
 
 !IF  "$(CFG)" == "DSPlugIn - Win32 Release"
 
-# ADD MTL /tlb "../../../lib/TestRunnerDSPlugin.tlb" /h "../../../include/msvc6/DSPlugin/TestRunnerDSPlugin.h" /iid "../../../include/msvc6/DSPlugin/TestRunnerDSPlugin_i.c"
+# ADD MTL /tlb "TestRunnerDSPlugin.tlb" /h "../../../include/msvc6/DSPlugin/TestRunnerDSPlugin.h" /iid "../../../include/msvc6/DSPlugin/TestRunnerDSPlugin_i.c"
 
 !ELSEIF  "$(CFG)" == "DSPlugIn - Win32 Debug"