tubes: resurrect unit test to serve again

- make it subsequent test to be less annoying
- we again inherit from CppUnit::TestFixture
- currently there is no test that we've received the sent packet
- nor any test for received file
- to prevent exporting more symbols we link directly tubes' object files

Change-Id: I79edf0c701f8c46eb45d507266f6dafc0c8eeea2

tubes/CppunitTest_tubes_test.mk

@@ -30,10 +30,15 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tubes_test, \
 	tubes/qa/test_manager \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
+$(eval $(call gb_CppunitTest_use_packages,tubes_test,tubes_inc))
+
+$(eval $(call gb_CppunitTest_use_library_objects,tubes_test,tubes))
+
+$(eval $(call gb_CppunitTest_use_libraries,tubes_test, \
+	comphelper \
+	cppu \
 	sal \
-	tubes \
-	unotest \
+	utl \
 	$(gb_STDLIBS) \
 ))
 
@@ -41,13 +46,6 @@ $(eval $(call gb_CppunitTest_use_externals,tubes_test,\
 	telepathy \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,tubes_test,\
-	-I$(SRCDIR)/tubes/inc \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_add_api,tubes_test, \
-	udkapi \
-))
+$(eval $(call gb_CppunitTest_use_udk_api,tubes_test))
 
 # vim: set noet sw=4 ts=4:

tubes/Library_tubes.mk

@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,tubes,\
 	comphelper \
 	cppu \
 	sal \
-	salhelper \
 ))
 
 $(eval $(call gb_Library_use_externals,tubes,\

tubes/Module_tubes.mk

@@ -35,9 +35,9 @@ $(eval $(call gb_Module_add_targets,tubes,\
 	Executable_liboapprover \
 ))
 
-# $(eval $(call gb_Module_add_check_targets,tubes,\
-#    CppunitTest_tubes_test \
-# ))
+$(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\
+	CppunitTest_tubes_test \
+))
 
 endif
 

tubes/source/manager.cxx

@@ -223,9 +223,12 @@ void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel
 
     sal_Int32 first = aUri.indexOf('_');
     sal_Int32 last = aUri.lastIndexOf('_');
-    OString sUuid( OUStringToOString( aUri.copy( first + 1, last - first - 1),
+    if (first != last)
+    {
+        OString sUuid( OUStringToOString( aUri.copy( first + 1, last - first - 1),
                 RTL_TEXTENCODING_UTF8));
-    TeleManager::setCurrentUuid( sUuid );
+        TeleManager::setCurrentUuid( sUuid );
+    }
     TeleManager_fileReceived( aUri );
 
     g_object_unref( handler);