./packages/libreoffice/3.3.0/experimental r2180: rediff smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff

[Rene Engelhard]

------------------------------------------------------------
revno: 2180
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2010-11-10 11:32:10 +0100
message:
  rediff smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
modified:
  changelog
  smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff

=== modified file 'changelog'
--- a/changelog 2010-11-09 09:09:30 +0000
+++ b/changelog 2010-11-10 10:32:10 +0000
@@ -38,8 +38,10 @@
     backports to debian-backpo...@l.d.o 
   * debian/rules, debian/control.in: hi-IN -> hi 
   * debian/watch: update to look for libreoffice-build 
+  * debian/smoketest/smoketest-disable-db-insert-delete-seek-tests.diff:
+    rediff (closes: #603008) 
 
- -- Rene Engelhard <r...@debian.org>  Sat, 06 Nov 2010 16:36:32 +0100
+ -- Rene Engelhard <r...@debian.org>  Wed, 10 Nov 2010 11:30:30 +0100
 
 libreoffice (1:3.3.0~beta2-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-07-14 14:48:51 +0000
+++ b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff      
2010-11-10 10:32:10 +0000
@@ -10,58 +10,58 @@
  const cMessageDatabaseClose = &quot;Close Database&quot;
  
  Sub TestDB (FilterType as Integer)
-@@ -61,54 +58,6 @@
-               SetStatus (FilterType, cDBService, not IsNull (oRowSet))
-       End If
-       
--      nCurrentAction = cDBInsert
--      sCurrentMessage = cMessageDatabaseInsert
--      
--      oRowSet.ActiveConnection = oDBConnection
+@@ -87,54 +87,6 @@ Const sTestString = &quot;Automatical Test&quot;
+         SetStatus (FilterType, cDBService, not IsNull (oRowSet))
+     End If
+     
+-    nCurrentAction = cDBInsert
+-    sCurrentMessage = cMessageDatabaseInsert
+-    
+-    oRowSet.ActiveConnection = oDBConnection
 -
 -    oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND
 -    oRowSet.Command = &quot;SELECT * FROM &quot; + sTable
--      oRowSet.execute()
--
--      oRowSet.moveToInsertRow
--      oRowSet.updateString(5, sTestString)
--
--      oRowSet.insertRow()
--      nRowCount=oRowSet.RowCount
--      
--      oRowSet.moveToCurrentRow()
--      
--      bResult = (oRowSet.getString(5) = sTestString)
--      LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
FileChannel)
--      LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
MainFileChannel)
--      SetStatus (FilterType, cDBInsert, bResult)
--      
--      &apos;delete only if insert passed
--      
--      if (bResult) Then
--              nCurrentAction = cDBDelete
--              sCurrentMessage = cMessageDatabaseDelete
--              oRowSet.deleteRow()
--              bResult = (nRowCount - oRowSet.RowCount = 0)
--              if ( bResult ) Then
--                      oRowSet.next()
--                      bResult = (nRowCount - oRowSet.RowCount = 1)
--              End If
--              LogState (bResult, &quot;Database &quot;+ 
cMessageDatabaseDelete, FileChannel)
--              LogState (bResult, &quot;Database &quot;+ 
cMessageDatabaseDelete, MainFileChannel)
--              SetStatus (FilterType, cDBDelete, bResult)
--      End If  
--
--      &apos; read other record
--      
--      nCurrentAction = cDBSeek
--      sCurrentMessage = cMessageDatabaseSeek
--      oRowSet.first()
--      bResult = not (oRowSet.getString(5) = sTestString)
--      LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
FileChannel)
--      LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
MainFileChannel)
--      SetStatus (FilterType, cDBSeek, bResult)
--      
-       nCurrentAction = cDBClose
-       sCurrentMessage = cMessageDatabaseClose
-       oDBConnection.Dispose()
+-    oRowSet.execute()
+-
+-    oRowSet.moveToInsertRow
+-    oRowSet.updateString(5, sTestString)
+-
+-    oRowSet.insertRow()
+-    nRowCount=oRowSet.RowCount
+-    
+-    oRowSet.moveToCurrentRow()
+-    
+-    bResult = (oRowSet.getString(5) = sTestString)
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
FileChann
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
MainFileC
+-    SetStatus (FilterType, cDBInsert, bResult)
+-    
+-    &apos;delete only if insert passed
+-    
+-    if (bResult) Then
+-        nCurrentAction = cDBDelete
+-        sCurrentMessage = cMessageDatabaseDelete
+-        oRowSet.deleteRow()
+-        bResult = (nRowCount - oRowSet.RowCount = 0)
+-        if ( bResult ) Then
+-            oRowSet.next()
+-            bResult = (nRowCount - oRowSet.RowCount = 1)
+-        End If
+-        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
FileC
+-        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
MainF
+-        SetStatus (FilterType, cDBDelete, bResult)
+-    End If     
+-
+-    &apos; read other record
+-    
+-    nCurrentAction = cDBSeek
+-    sCurrentMessage = cMessageDatabaseSeek
+-    oRowSet.first()
+-    bResult = not (oRowSet.getString(5) = sTestString)
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
FileChannel
+-    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
MainFileCha
+-    SetStatus (FilterType, cDBSeek, bResult)
+-    
+     nCurrentAction = cDBClose
+     sCurrentMessage = cMessageDatabaseClose
+     oDBConnection.Dispose()