PR: add unit tests from SALOMDSImpl and SALOMEDS

diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am
index 75ba9cfa6b2c1c75f209092c8382adfc430ede97..22bb96bbabe42b4df6c4e145036d15ee92adb949 100644 (file)
--- a/src/UnitTests/Makefile.am
+++ b/src/UnitTests/Makefile.am
@@ -56,6 +56,8 @@ UnitTests_CPPFLAGS =\
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
        -I$(srcdir)/../LifeCycleCORBA -I$(srcdir)/../LifeCycleCORBA/Test \
+       -I$(srcdir)/../SALOMDESImpl -I$(srcdir)/../SALOMEDSImpl/Test \
+       -I$(srcdir)/../SALOMDES -I$(srcdir)/../SALOMEDS/Test \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
@@ -73,6 +75,8 @@ UnitTests_LDADD    =\
        ../SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \
        ../Utils/libOpUtil.la ../Utils/Test/libUtilsTest.la \
        ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la ../LifeCycleCORBA/Test/libLifeCycleCORBATest.la \
+       ../SALOMEDSImpl/libSalomeDSImpl.la ../SALOMEDSImpl/Test/libSALOMEDSImplTest.la \
+       ../SALOMEDS/libSalomeDS.la ../SALOMEDS/Test/libSALOMEDSTest.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la\
        @CORBA_LIBS@
 

diff --git a/src/UnitTests/UnitTests.cxx b/src/UnitTests/UnitTests.cxx
index d1198cc2179cd44256e4aeefe63e67ec92d24a18..edebe38bafa9a4defa809a96ebff4b8069dde577 100644 (file)
--- a/src/UnitTests/UnitTests.cxx
+++ b/src/UnitTests/UnitTests.cxx
@@ -25,6 +25,8 @@
 #include "UtilsTest.hxx"
 #include "NamingServiceTest.hxx"
 #include "LifeCycleCORBATest.hxx"
+#include "SALOMEDSImplTest.hxx"
+#include "SALOMEDSTest.hxx"
 
 // --- Registers the fixture into the 'registry'
 
@@ -33,6 +35,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SALOMETraceCollectorTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( UtilsTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( NamingServiceTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( LifeCycleCORBATest );
+CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSImplTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(SALOMEDSTest );
 
 // --- generic Main program from Basic/Test