sb118: merged in DEV300_m68

This commit is contained in:
sb 2010-01-05 13:49:30 +01:00
commit 0367aa64de
23 changed files with 89 additions and 121 deletions

View File

@ -30,7 +30,10 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
@ -294,13 +297,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BasicTest, "BasicTest");
CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);
}
// -----------------------------------------------------------------------------
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
NOADDITIONAL;
CPPUNIT_PLUGIN_IMPLEMENT();

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -180,7 +182,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpMaskTest, "BmpMaskTest");
CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest);
}

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -207,7 +209,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpTest, "BmpTest");
CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest);
}

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
@ -274,7 +276,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ClipTest, "ClipTest");
CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest);
}

View File

@ -31,7 +31,7 @@
UDK_3.1 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2drange.hxx>
@ -268,7 +270,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FillTest, "FillTest");
CPPUNIT_TEST_SUITE_REGISTRATION(FillTest);
}

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
@ -216,7 +218,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(LineTest, "LineTest");
CPPUNIT_TEST_SUITE_REGISTRATION(LineTest);
}

View File

@ -88,7 +88,6 @@ SHL1OBJS= \
# source/makefile.mk
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
$(TESTSHL2LIB)\
$(CPPUNITLIB) \
$(BASEGFXLIB)
@ -125,7 +124,6 @@ SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
@ -134,7 +132,7 @@ unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
$(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
$(CPPUNITTESTER) $(SHL1TARGETN)
ALLTAR : unittest
.ENDIF

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -168,7 +170,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(MaskTest, "MaskTest");
CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest);
}

View File

@ -30,7 +30,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
@ -288,7 +290,7 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PolyTest, "PolyTest");
CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest);
}

View File

@ -1,4 +1,4 @@
fx basegfx : o3tl sal offuh cppuhelper cppu testshl2 NULL
fx basegfx : o3tl sal offuh cppuhelper cppu cppunit NULL
fx basegfx usr1 - all fx_mkout NULL
fx basegfx\inc nmake - all fx_inc NULL
fx basegfx\prj get - all fx_prj NULL

View File

@ -33,7 +33,10 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
namespace basegfx1d
{
@ -55,7 +58,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -68,13 +70,7 @@ public:
}; // class b1drange
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx1d::b1drange, "basegfx1d");
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx1d::b1drange);
} // namespace basegfx1d
// -----------------------------------------------------------------------------
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
NOADDITIONAL;
CPPUNIT_PLUGIN_IMPLEMENT();

View File

@ -33,7 +33,9 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
@ -753,7 +755,6 @@ public:
{
// this is demonstration code
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1105,7 +1106,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1135,7 +1135,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1317,7 +1316,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1347,7 +1345,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1375,7 +1372,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1405,7 +1401,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1433,7 +1428,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -1618,21 +1612,21 @@ public:
}; // class b2dvector
// -----------------------------------------------------------------------------
//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dmultirange, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dsvgdimpex, "basegfx2d");
//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dbeziertools, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dcubicbezier, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dhommatrix, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dhompoint, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpoint, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolygon, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolygontools, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolypolygon, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dquadraticbezier, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2drange, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dtuple, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dvector, "basegfx2d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::bcolor, "basegfx2d");
//CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dmultirange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex);
//CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dbeziertools);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dcubicbezier);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhommatrix);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhompoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygon);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygontools);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolypolygon);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dquadraticbezier);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2drange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dtuple);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dvector);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::bcolor);
} // namespace basegfx2d

View File

@ -33,7 +33,9 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
namespace basegfx3d
{
@ -55,7 +57,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -83,7 +84,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -113,7 +113,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -141,7 +140,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -171,7 +169,6 @@ public:
void EmptyMethod()
{
// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -199,7 +196,6 @@ public:
// insert your test code here.
void EmptyMethod()
{
CPPUNIT_ASSERT_STUB();
}
// Change the following lines only, if you add, remove or rename
@ -212,12 +208,12 @@ public:
}; // class b3dvector
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dhommatrix, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dhompoint, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dpoint, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3drange, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dtuple, "basegfx3d");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dvector, "basegfx3d");
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhommatrix);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhompoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dpoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3drange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dtuple);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dvector);
} // namespace basegfx3d

View File

@ -31,7 +31,7 @@
UDK_3.1 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;

View File

@ -66,7 +66,6 @@ SHL1STDLIBS= \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
@ -83,7 +82,6 @@ SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
# --- Enable testshl2 execution in normal build ------------------------
@ -91,7 +89,7 @@ $(MISC)$/unittest_succeeded : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
$(TESTSHL2) -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
$(CPPUNITTESTER) $(SHL1TARGETN)
$(TOUCH) $@
ALLTAR : $(MISC)$/unittest_succeeded

View File

@ -1,20 +0,0 @@
# Jobfile
basegfx1d.b1drange
basegfx2d.b2dcubicbezier
basegfx2d.b2dhommatrix
basegfx2d.b2dhompoint
basegfx2d.b2dpoint
basegfx2d.b2dpolygon
basegfx2d.b2dpolygontools
basegfx2d.b2dpolypolygon
basegfx2d.b2dquadraticbezier
basegfx2d.b2drange
basegfx2d.b2dtuple
basegfx2d.b2dvector
basegfx3d.b3dhommatrix
basegfx3d.b3dhompoint
basegfx3d.b3dhompoint
basegfx3d.b3dpoint
basegfx3d.b3drange
basegfx3d.b3dtuple
basegfx3d.b3dvector

View File

@ -1,4 +1,4 @@
ot o3tl : sal testshl2 BOOST:boost NULL
ot o3tl : sal cppunit BOOST:boost NULL
ot o3tl usr1 - all ot_mkout NULL
ot o3tl\inc get - all ot_inc NULL
ot o3tl\prj get - all ot_prj NULL

View File

@ -31,7 +31,7 @@
UDK_3.1 {
global:
registerAllTestFunction;
cppunitTestPlugIn;
local:
*;

View File

@ -51,7 +51,6 @@ SHL1OBJS= \
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
$(TESTSHL2LIB)\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
@ -69,7 +68,6 @@ SLOFILES=$(SHL1OBJS)
.ENDIF # L10N_framework
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
@ -77,7 +75,7 @@ unittest : $(SHL1TARGETN)
@echo ----------------------------------------------------------
@echo - start unit test on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
$(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
$(CPPUNITTESTER) $(SHL1TARGETN)
ALLTAR : unittest
.ENDIF # L10N_framework

View File

@ -1,6 +1,9 @@
// autogenerated file with codegen.pl
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "cow_wrapper_clients.hxx"
@ -119,15 +122,6 @@ public:
};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cow_wrapper_test, "cow_wrapper_test");
// -----------------------------------------------------------------------------
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
void RegisterAdditionalFunctions(FktRegFuncPtr )
{
}
// NOADDITIONAL;
CPPUNIT_TEST_SUITE_REGISTRATION(cow_wrapper_test);
CPPUNIT_PLUGIN_IMPLEMENT();

View File

@ -28,7 +28,9 @@
*
************************************************************************/
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <o3tl/heap_ptr.hxx>
@ -163,4 +165,4 @@ class heap_ptr_test : public CppUnit::TestFixture
}; // class heap_ptr_test
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(heap_ptr_test, "o3tltests");
CPPUNIT_TEST_SUITE_REGISTRATION(heap_ptr_test);

View File

@ -28,8 +28,9 @@
*
************************************************************************/
#include <testshl/simpleheader.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include <o3tl/range.hxx>
#include <vector>
@ -233,4 +234,4 @@ public:
}; // class range_test
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(range_test, "o3tltests");
CPPUNIT_TEST_SUITE_REGISTRATION(range_test);