./packages/libreoffice/3.3.0/experimental r2214: rediff smoketest patch again

[Rene Engelhard]

------------------------------------------------------------
revno: 2214
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-11-23 09:26:04 +0100
message:
  rediff smoketest patch again
modified:
  changelog
  smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff

=== modified file 'changelog'
--- a/changelog 2010-11-21 23:12:51 +0000
+++ b/changelog 2010-11-23 08:26:04 +0000
@@ -7,8 +7,10 @@
     more lintian fixes
   * debian/uno-libs3.symbols: tighten depends to (>= 1.7.0+LibO3.3.0~beta3)
     for osl_{set,clear}environm...@udk_3.11 (closes: #604201)
+  * debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff:
+    rediff again - seems it got broken last time (closes: #603008)
 
- -- Rene Engelhard <r...@debian.org>  Mon, 22 Nov 2010 00:12:47 +0100
+ -- Rene Engelhard <r...@debian.org>  Tue, 23 Nov 2010 09:22:50 +0100
 
 libreoffice (1:3.3.0~beta3-2) experimental; urgency=low
 

=== modified file 
'smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff'
--- a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff      
2010-11-10 10:32:10 +0000
+++ b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff      
2010-11-23 08:26:04 +0000
@@ -1,6 +1,6 @@
 --- smoketestoo_native/data/Test_DB.xml
 +++ smoketestoo_native/data/Test_DB.xml
-@@ -4,9 +4,6 @@
+@@ -30,9 +30,6 @@
  
  const cMessageDatabaseService = &quot;Database Service&quot;
  const cMessageDatabaseOpen = &quot;Open Database&quot;
@@ -10,7 +10,7 @@
  const cMessageDatabaseClose = &quot;Close Database&quot;
  
  Sub TestDB (FilterType as Integer)
-@@ -87,54 +87,6 @@ Const sTestString = &quot;Automatical Test&quot;
+@@ -87,54 +84,6 @@ Const sTestString = &quot;Automatical Test&quot;
          SetStatus (FilterType, cDBService, not IsNull (oRowSet))
      End If
      
@@ -32,8 +32,8 @@
 -    oRowSet.moveToCurrentRow()
 -    
 -    bResult = (oRowSet.getString(5) = sTestString)
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
FileChann
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
MainFileC
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
FileChannel)
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
MainFileChannel)
 -    SetStatus (FilterType, cDBInsert, bResult)
 -    
 -    &apos;delete only if insert passed
@@ -47,10 +47,10 @@
 -            oRowSet.next()
 -            bResult = (nRowCount - oRowSet.RowCount = 1)
 -        End If
--        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
FileC
--        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
MainF
+-        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
FileChannel)
+-        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
MainFileChannel)
 -        SetStatus (FilterType, cDBDelete, bResult)
--    End If     
+-    End If    
 -
 -    &apos; read other record
 -    
@@ -58,8 +58,8 @@
 -    sCurrentMessage = cMessageDatabaseSeek
 -    oRowSet.first()
 -    bResult = not (oRowSet.getString(5) = sTestString)
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
FileChannel
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
MainFileCha
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
FileChannel)
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
MainFileChannel)
 -    SetStatus (FilterType, cDBSeek, bResult)
 -    
      nCurrentAction = cDBClose