#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2

2 files changed, 70 insertions, 74 deletions

diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index 70c42e6463..e935abd1c0 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,17 +42,13 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
-SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj 
+SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj
 SHL1TARGET=recent_docs
-SHL1STDLIBS=$(SALLIB) 
+SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \
 ..$/unxsols4.pro$/slb$/libsysshell.a \
 $(EXPATASCII3RDLIB)
 .ENDIF
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index 40a0d92eac..314e7f9134 100755
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "systemshell.hxx"
 #include "osl/file.hxx"
@@ -41,114 +41,114 @@
 #include <stdlib.h>
 #include <iostream>
 
-//########################################        
+//########################################
 using namespace osl;
 using namespace rtl;
 
 namespace syssh = SystemShell;
 
-//########################################  
+//########################################
 const OUString SXW_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.writer");
 const OUString SXC_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.calc");
 const OUString SXI_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.impress");
 const OUString SXD_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.draw");
 const OUString SXM_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.math");
-      
+
 class Test_AddToRecentDocs : public CppUnit::TestFixture
-{    
+{
 public:
-    
+
     Test_AddToRecentDocs()
-    {        
+    {
     }
-         
-    //------------------------------------------------    
+
+    //------------------------------------------------
     void test_existing_recently_used_file_with_valid_xml()
-    {        		
+    {
         system("rm $HOME/.recently-used");
-        system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");	
-        
+        system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
+
         rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
-        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);                                    
-        
+        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
+
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxc");
-        syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);                                    
-        
+        syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
+
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxi");
-        syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);                              
+        syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
 
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxd");
-        syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);                              
+        syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
 
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxm");
-        syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);                                    
+        syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
     }
 
-    //------------------------------------------------        
-    void test_existing_recently_used_file_with_invalid_xml()	
+    //------------------------------------------------
+    void test_existing_recently_used_file_with_invalid_xml()
     {
         system("rm $HOME/.recently-used");
         system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n<RecentItem>\n<URI>file:///home/federico/gedit2.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
-        
+
         rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
-        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);                                    		
+        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
     }
-    
-    //------------------------------------------------    
+
+    //------------------------------------------------
     void test_non_existing_recently_used_file()
     {
-        int ret = system("rm $HOME/.recently-used");        
-                
+        int ret = system("rm $HOME/.recently-used");
+
         rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
-        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);                                    
-        
+        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
+
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxc");
-        syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);                                    
-        
+        syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
+
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxi");
-        syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);                              
+        syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
 
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxd");
-        syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);                              
+        syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
 
         url = rtl::OUString::createFromAscii("file:///home_athene/test.sxm");
-        syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE); 
+        syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
 
         ret = system("ls $HOME/.recently-used");
-        
+
         CPPUNIT_ASSERT_MESSAGE(".recently-used doesn't exist", 0 == ret);
     }
-    
+
     //------------------------------------------------
     OUString get_recently_used_url()
     {
         Security sec;
         OUString recently_used_url;
-    
+
         CPPUNIT_ASSERT_MESSAGE("cannot get user home directory", sec.getHomeDir(recently_used_url));
-                        
-        if ((recently_used_url.getLength() > 0) && 
+
+        if ((recently_used_url.getLength() > 0) &&
             ('/' != recently_used_url.pData->buffer[recently_used_url.getLength() - 1]))
-            recently_used_url += rtl::OUString::createFromAscii("/");    
-        
+            recently_used_url += rtl::OUString::createFromAscii("/");
+
         recently_used_url += rtl::OUString::createFromAscii(".recently-used");
         return recently_used_url;
     }
-    
+
     //------------------------------------------------
     void read_recently_used(void* buffer, size_t size)
     {
         File ruf(get_recently_used_url());
         FileBase::RC rc = ruf.open(OpenFlag_Read);
-        
+
         CPPUNIT_ASSERT_MESSAGE("Cannot open ~/.recently-used", FileBase::E_None == rc);
-                        
+
         sal_uInt64 read;
         ruf.read(buffer, size, read);
         ruf.close();
         CPPUNIT_ASSERT_MESSAGE("Cannot read .recently-used", (read > 0));
     }
-        
+
     //------------------------------------------------
     void test_existing_recently_used_file_without_xml()
     {
@@ -156,48 +156,48 @@ public:
         // create a new one with non xml data
         system("rm $HOME/.recently-used");
         system("date > $HOME/.recently-used");
-                        
+
         char cnt_before[128];
-        memset(cnt_before, 0, sizeof(cnt_before));		
-        read_recently_used(cnt_before, sizeof(cnt_before));		
-        
+        memset(cnt_before, 0, sizeof(cnt_before));
+        read_recently_used(cnt_before, sizeof(cnt_before));
+
         OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
-        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); 
-                        
+        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
+
         char cnt_after[128];
         memset(cnt_after, 0, sizeof(cnt_after));
-        read_recently_used(cnt_after, sizeof(cnt_after));			
-        CPPUNIT_ASSERT_MESSAGE(".recently-used unexpectly touched", (0 == strcmp(cnt_before, cnt_after)));				
+        read_recently_used(cnt_after, sizeof(cnt_after));
+        CPPUNIT_ASSERT_MESSAGE(".recently-used unexpectly touched", (0 == strcmp(cnt_before, cnt_after)));
     }
-    
-    //------------------------------------------------	
+
+    //------------------------------------------------
     void test_existing_recently_used_with_unknown_xml()
-    {	
+    {
         system("rm $HOME/.recently-used");
-        
-        char* xml_unknown = "<?xml version=\"1.0\"?>\n<test>test</test>";			
+
+        char* xml_unknown = "<?xml version=\"1.0\"?>\n<test>test</test>";
         char cmd[256];
         sprintf(cmd, "echo '%s' > $HOME/.recently-used", xml_unknown);
         system(cmd);
-        
+
         OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
-        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); 
-        
+        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
+
         char buffer[256];
         memset(buffer, 0, sizeof(buffer));
         read_recently_used(buffer, sizeof(buffer));
-                
+
         CPPUNIT_ASSERT_MESSAGE("Unexpected recently-used content", (0 == strncmp(xml_unknown, buffer, strlen(xml_unknown))));
     }
-    
+
     //------------------------------------------------
     void test_existing_empty_recently_used_file()
     {
         system("rm $HOME/.recently-used");
         system("touch $HOME/.recently-used");
-        
+
         OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
-        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); 
+        syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
         
         char buffer[256];
         memset(buffer, 0, sizeof(buffer));