[Mobies-commit] [commit] r3852 - in UDM/trunk: Projects/Win32/VC10/tests/test_ns Projects/Win32/VC9/tests/test_ns tests/test_ns
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Fri Aug 26 09:18:23 CDT 2011
Author: ksmyth
Date: Fri Aug 26 09:18:22 2011
New Revision: 3852
Log:
Convert to cppunit
Added:
UDM/trunk/tests/test_ns/test_ns_test.cpp
- copied, changed from r3839, UDM/trunk/tests/test_ns/main.cpp
Replaced:
UDM/trunk/tests/test_ns/main.cpp
- copied unchanged from r3839, UDM/trunk/tests/test_assocInheritanceMGA/main.cpp
Modified:
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters
UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj
UDM/trunk/tests/test_ns/Makefile.am
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Thu Aug 25 16:26:16 2011 (r3851)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Fri Aug 26 09:18:22 2011 (r3852)
@@ -142,6 +142,7 @@
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns_test.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.h">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters Thu Aug 25 16:26:16 2011 (r3851)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters Fri Aug 26 09:18:22 2011 (r3852)
@@ -24,6 +24,9 @@
<ClCompile Include="..\..\..\..\..\tests\test_ns\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns_test.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.h">
Modified: UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj Thu Aug 25 16:26:16 2011 (r3851)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj Fri Aug 26 09:18:22 2011 (r3852)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UdmDllD.lib xerces-c_2D.lib"
+ AdditionalDependencies="UdmDllD.lib xerces-c_2D.lib cppunitd.lib"
OutputFile="$(OutDir)\test_nsD.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="$(OutDir)"
@@ -152,7 +152,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Uml.lib UdmBase.lib UdmDom.lib UdmUtil.lib xerces-c_2.lib zlib.lib $(NOINHERIT)"
+ AdditionalDependencies="Uml.lib UdmBase.lib UdmDom.lib UdmUtil.lib xerces-c_2.lib zlib.lib cppunit.lib $(NOINHERIT)"
OutputFile="$(OutDir)\test_ns.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(OutDir)"
@@ -201,10 +201,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.cpp"
>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -213,10 +213,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -224,6 +224,10 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\..\..\..\..\tests\test_ns\test_ns_test.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -231,10 +235,10 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.h"
>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -243,10 +247,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.h"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -262,45 +266,45 @@
>
</Filter>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns_udm.xml"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns_udm.xml"
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- CommandLine=""$(OutDir)\UdmD.exe" -o "$(OutDir)\Gen\tests\test_ns" "$(InputPath)" -t -v
"
- Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp; $(OutDir)\Gen\tests\test_ns\test_ns.h; $(OutDir)\Gen\tests\test_ns\test_ns.dtd; $(OutDir)\Gen\tests\test_ns\test_ns.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_A.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_A.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_B.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_B.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ Description="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd Udm.exe $(InputFileName)"
+ CommandLine=""$(OutDir)\Udm.exe" -o "$(OutDir)\Gen\tests\test_ns" "$(InputPath)" -t -v
"
+ Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns_udm.xml"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns_udm.xml"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine=""$(OutDir)\UdmD.exe" -o "$(OutDir)\Gen\tests\test_ns" "$(InputPath)" -t -v
"
+ Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp; $(OutDir)\Gen\tests\test_ns\test_ns.h; $(OutDir)\Gen\tests\test_ns\test_ns.dtd; $(OutDir)\Gen\tests\test_ns\test_ns.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_A.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_A.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_B.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_B.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd Udm.exe $(InputFileName)"
- CommandLine=""$(OutDir)\Udm.exe" -o "$(OutDir)\Gen\tests\test_ns" "$(InputPath)" -t -v
"
- Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
/>
</FileConfiguration>
</File>
Modified: UDM/trunk/tests/test_ns/Makefile.am
==============================================================================
--- UDM/trunk/tests/test_ns/Makefile.am Thu Aug 25 16:26:16 2011 (r3851)
+++ UDM/trunk/tests/test_ns/Makefile.am Fri Aug 26 09:18:22 2011 (r3852)
@@ -7,7 +7,7 @@
BUILT_SOURCES = test_ns.cpp test_ns.h test_ns.xsd \
test_ns_A.xsd test_ns_B.xsd test_ns_AB.xsd
-test_ns_SOURCES = main.cpp
+test_ns_SOURCES = main.cpp test_ns_test.cpp
nodist_test_ns_SOURCES = $(BUILT_SOURCES)
test_ns_LDADD = ../../lib/libudm.la $(CPPUNITLIBS)
Copied: UDM/trunk/tests/test_ns/main.cpp (from r3839, UDM/trunk/tests/test_assocInheritanceMGA/main.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_ns/main.cpp Fri Aug 26 09:18:22 2011 (r3852, copy of r3839, UDM/trunk/tests/test_assocInheritanceMGA/main.cpp)
@@ -0,0 +1,50 @@
+#include <cppunit/CompilerOutputter.h>
+
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#ifdef _WIN32
+#include <crtdbg.h>
+#include <signal.h>
+#include <windows.h>
+
+int __cdecl CrtReportHook(int reportType, char *message, int *returnValue)
+{
+ if (reportType == _CRT_ASSERT) {
+ DebugBreak();
+ return TRUE;
+ }
+ return FALSE;
+}
+
+void __cdecl AbrtHandler(int)
+{
+ DebugBreak();
+}
+#endif
+
+int main(int argc, char* argv[])
+{
+#ifdef _WIN32
+ signal(SIGABRT, &AbrtHandler);
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+ _set_abort_behavior(0, _WRITE_ABORT_MSG);
+ _CrtSetReportHook(&CrtReportHook);
+#endif
+
+ CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();
+
+ // Adds the test to the list of test to run
+ CPPUNIT_NS::TextUi::TestRunner runner;
+ runner.addTest( suite );
+
+ // Change the default outputter to a compiler error format outputter
+ runner.setOutputter( new CPPUNIT_NS::CompilerOutputter( &runner.result(),
+ std::cerr ) );
+ // Run the test.
+ bool wasSucessful = runner.run();
+
+ // Return error code 1 if the one of test failed.
+ return wasSucessful ? 0 : 1;
+
+}
Copied and modified: UDM/trunk/tests/test_ns/test_ns_test.cpp (from r3839, UDM/trunk/tests/test_ns/main.cpp)
==============================================================================
--- UDM/trunk/tests/test_ns/main.cpp Wed Aug 24 16:34:38 2011 (r3839, copy source)
+++ UDM/trunk/tests/test_ns/test_ns_test.cpp Fri Aug 26 09:18:22 2011 (r3852)
@@ -4,7 +4,24 @@
#include "test_ns.h"
#include <Uml.h>
-void writeTest(const std::string& fname)
+#include <string>
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace std;
+
+class TestNSTest : public CPPUNIT_NS::TestFixture
+{
+ CPPUNIT_TEST_SUITE( TestNSTest );
+ CPPUNIT_TEST(test_ns);
+ CPPUNIT_TEST_SUITE_END();
+ void writeTest(const std::string& fname);
+ void readTest(const std::string& fname);
+public:
+ void test_ns();
+};
+
+
+void TestNSTest::writeTest(const std::string& fname)
{
Udm::SmartDataNetwork out(test_ns::diagram);
@@ -25,7 +42,7 @@
}
//==========================================
-void readTest(const std::string& fname)
+void TestNSTest::readTest(const std::string& fname)
{
Udm::SmartDataNetwork in(test_ns::diagram);
@@ -37,10 +54,8 @@
}
//=========================================
-int main()
+void TestNSTest::test_ns()
{
- try
- {
std::string fn ="test.xml";
writeTest(fn);
readTest(fn);
@@ -51,14 +66,5 @@
Uml::Diagram theUmlDiagram(Uml::Diagram::Cast(udmDN.GetRootObject()));
test_ns::Initialize(theUmlDiagram);
-
- }
- catch(udm_exception& e)
- {
- std::cout << e.what();
- return 1;
- }
-
- return 0;
}
More information about the Mobies-commit
mailing list