Commits

Anonymous committed 047dd77

CWS-TOOLING: integrate CWS automation300m50cat0
2009-06-15 07:41:44 +0200 hde r272959 : 101001
2009-06-12 13:41:47 +0200 wg r272916 : i102714
2009-06-12 12:48:42 +0200 msc r272914 : #102712# AutoFilter does not work
2009-06-12 12:14:11 +0200 wg r272912 : i102710
2009-06-12 12:13:41 +0200 wg r272911 : i102710

Comments (0)

Files changed (5)

testautomation/dbaccess/required/includes/Table.inc

 '-------------------------------------------------------------------------
 testcase tAutoFilter
 
+    warnlog "#102712# AutoFilter does not work"
+    goto endsub
+    
     '/// open a new table
     printlog "open a new table"
     initTable
 '-------------------------------------------------------------------------
 testcase tRemoveFilter
 
+    warnlog "#102712# AutoFilter does not work"
+    goto endsub
+
     '/// open a new table
     printlog "open a new table"
     initTable
 '-------------------------------------------------------------------------
 testcase tApplyFilter
 
+    warnlog "#102712# AutoFilter does not work"
+    goto endsub
+
     '/// open a new table
     printlog "open a new table"
     initTable

testautomation/graphics/optional/includes/global/g_format.inc

         qaerrorlog "   The 3D-Effects-dialogue was open. Check why."
     else
     end if
-    try
-        if Perspektive.isvisible then
-        else
-            warnlog "why not in draw?"
-        end if
-    catch
-        warnlog "something is wrong mit perspective"
-    endcatch
-    Kontext "DocumentImpress"
-    gMouseClick 40,40
-    Kontext
-    Active.SetPage TabPositionAndSize
-    Kontext "TabPositionAndSize"
-    if PositionX.GetText = X Then
-        printlog "- Perspective acitvated x: "+PositionX.GetText
-    else
-        warnlog "- Perspective seems to have a problem, x value has changed!"
-    end if
-    TabPositionAndSize.OK
-    Kontext "Drei_D_Effekte"
-    Aktualisieren.Click
-    Drei_D_Effekte.Close
+        try
+            if Perspektive.isvisible then
+                Perspektive.Click                         '/// check perspective ///'
+            else
+                warnlog "why not in draw?"
+            end if
+        catch
+            warnlog "something is wrong mit perspective"
+        endcatch
+        Zuweisen.Click                            '/// assign perspective ///'
+        Kontext "DocumentImpress"
+        hTypeKeys "<MOD1 A>"
+        ContextPositionAndSize                        '/// check position and size ///'
+            Kontext
+            Active.SetPage TabPositionAndSize
+            Kontext "TabPositionAndSize"
+            if PositionX.GetText = X Then
+                printlog "- Perspective acitvated x: "+PositionX.GetText
+            else
+                warnlog "- Perspective seems to have a problem, x value has changed!"
+            end if
+            TabPositionAndSize.OK
+        Kontext "Drei_D_Effekte"
+        Aktualisieren.Click
+        Drei_D_Effekte.Close
+    EditSelectAll                   '/// delete rectangle ///'
     hTypeKeys "<DELETE>"
 
     '-----------------------------------RECTANGLE------------------------------------------------------

testautomation/graphics/tools/id_tools.inc

 '-------------------------------------------------------------------------------
 function GetDecimalSeperator ( sDummy$ ) as String
 
-    '/// Input : number with fractionmark from 'NumericField' as String ///'
-    '///+ Output: '.' or ',' as String                                  ///'
+    printlog "Input : number with fractionmark from 'NumericField' as String "
+    printlog "+ Output: '.' or ',' as String "
     dim i1, i2 as integer
 
     ' get position of fraction mark / get IT
         if (GetMeasUnit(sShould$) <> GetMeasUnit(sActual$) ) then
             warnlog "In function LiberalMeasurement the measUnit is different, compare not possible yet"
         else
-            ' set factor for liberality ;-)
-            ' took units from http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src
+            printlog "set factor for liberality ;-)"
+            printlog "took units from http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src"
             select case GetMeasUnit(sShould$)
             case "mm", "ミリ", "公厘" : iTolerance = 2.0             '01, 81,     88
             case "cm","センチ","厘米","公分"  : iTolerance = 0.5       '01, 81, 86, 88
 function GetMeasUnit ( sWert$ ) as String
 
     dim iBounder as integer
-    '/// Input : Number with or without MeasurementUnit 'NumericField' as String ///'
-    '///+ Output: Initials of MeasurementUnit as String or "" when only a number ///'
+    printlog " Input : Number with or without MeasurementUnit 'NumericField' as String "
+    printlog "+ Output: Initials of MeasurementUnit as String or when only a number "
 
     iBounder = -1
     do
 '-------------------------------------------------------------------------------
 function fIsDocumentWritable() as boolean
 
-    '/// check if a document is writeable
-    '/// <u>parameter:</u>
-    '/// <u>return:</u>
-    '/// true if the document is writeable otherwise false
+    printlog " check if a document is writeable"
+    printlog " <u>parameter:</u>"
+    printlog " <u>return:</u>"
+    printlog " true if the document is writeable otherwise false"
 
     Kontext "Standardbar"
     if Bearbeiten.GetState(2) <> 1 then
 '-------------------------------------------------------------------------------
 function fMakeDocumentWritable() as boolean
 
-    '/// make a document is writeable
-    '/// <u>parameter:</u>
-    '/// <u>return:</u>
-    '/// true if the document can make writeable otherwise false
+    printlog " make a document is writeable"
+    printlog " <u>parameter:</u>"
+    printlog " <u>return:</u>"
+    printlog " true if the document can make writeable otherwise false"
 
     Kontext "Standardbar"
     sleep (1)
         ' collecting criteria for underlining:
         ' 1st one: is word selected? yes: underlined;
 
-        '/// If the string "vnd.sun.search:SubMenu" (the SunSearch-menu) is found in the menu, we'll skip that word. ///'
+        printlog " If the string vnd.sun.search:SubMenu (the SunSearch-menu) is found in the menu, we'll skip that word. "
 
         'Get first entry.
         f = MenuGetItemCommand (MenuGetItemID (1))

testautomation/graphics/tools/id_tools_2.inc

     elseIf (gApplication = "CALC") then
         sApplication = "CALC"
     endif
+<<<<<<< .working
     printlog "   '/// - save states ///'"
+=======
+    printlog  " - save states "
+>>>>>>> .merge-right.r273717
     ToolsOptions
     hToolsOptions (sApplication,"General")
     ReferenceOld = Masseinheit.GetSelText
     elseIf (gApplication = "CALC") then
         sApplication = "CALC"
     endif
+<<<<<<< .working
     printlog "'/// - Reset states back to what they were before ///'"
+=======
+    printlog " - Reset states back to what they were before "
+>>>>>>> .merge-right.r273717
     ToolsOptions
     hToolsOptions (sApplication,"General")
     if Masseinheit.GetSelText <> ReferenceOld then 'find the right one.
 sub SetKontextApplication
     ' Removed by JSK: sleep 1
     Select Case gApplication
-    Case "DRAW"
-        Kontext "DocumentDraw"
-        '         Printlog "gApplication / Kontext is now: DocumentDraw"
-        ' Removed by JSK: sleep 1
-    Case "IMPRESS"
-        Kontext "DocumentImpress"
-        '         Printlog "gApplication / Kontext is now is now: DocumentImpress"
-        ' Removed by JSK: sleep 1
-    Case "WRITER"
-        Kontext "DocumentWriter"
-        '         Printlog "gApplication / Kontext is now is now: DocumentWriter"
-        ' Removed by JSK: sleep 1
-    Case "CALC"
-        Kontext "DocumentCalc"
-        '         Printlog "gApplication / Kontext is now is now: DocumentCalc"
-        ' Removed by JSK: sleep 1
-    end select
-    ' Removed by JSK: sleep 1
+        Case "DRAW"
+            Kontext "DocumentDraw"
+            Printlog "gApplication / Kontext is now: DocumentDraw"
+             sleep 1
+        Case "IMPRESS"
+            Kontext "DocumentImpress"
+            Printlog "gApplication / Kontext is now is now: DocumentImpress"
+             sleep 1
+        Case "WRITER"
+            Kontext "DocumentWriter"
+            Printlog "gApplication / Kontext is now is now: DocumentWriter"
+            sleep 1
+        Case "CALC"
+            Kontext "DocumentCalc"
+            Printlog "gApplication / Kontext is now is now: DocumentCalc"
+            sleep 1
+        end select
+    sleep 1
 end sub
 
 '-------------------------------------------------------------------------------
 sub mouseclickinpresentation
     Kontext "DocumentPresentation"
     autoexecute=false
-    DocumentPresentation.MouseDown ( 50, 50 )   '/// switch slides using mouse clicks ///'
+    printlog " switch slides using mouse clicks "
+    DocumentPresentation.MouseDown ( 50, 50 )   
     DocumentPresentation.MouseUp ( 50, 50 )
     autoexecute=true
 end sub

testautomation/tools/run_tests/run_tests.sh

 # set location of TestTool
 # (full path including executable 'testtool')
 # if this is empty, we try to parse $HOME/.testtoolrc and use OOoProgramdir
+# on Mac this is VCLTestTool.app/Contents/MacOS/testtool.bin
+#sTestTool="/Users/sca/qa/testtool/VCLTestTool.app/Contents/MacOS/testtool.bin"
 sTestTool=""
 
 #------------------------------------------------------------------------
 function GetValueFromSection ()
 # call with NameOfValue Section file
 {
-   awk -v  sVarName="$1" -v sSectionName="$2" \
+   $AWK -v  sVarName="$1" -v sSectionName="$2" \
       'BEGIN { bInSection = 0}
       {  if ( index ($0 ,"[" sSectionName "]") > 0 ) 
             bInSection = 1
 	Darwin)
 		testtoolrc="$HOME/Library/Application Support/.testtoolrc"
 		KILLOFFICEALL="/usr/bin/killall -9 soffice.bin"
+    AWK=awk
+		;;
+  SunOS)
+		testtoolrc="$HOME/.testtoolrc"
+		KILLOFFICEALL="pkill -9 soffice.bin"
+    AWK=nawk
 		;;
 	*)
 		testtoolrc="$HOME/.testtoolrc"
 		KILLOFFICEALL="pkill -9 soffice.bin"
+    AWK=awk
 		;;
 esac
 
 if [ -z "$sTestTool" ]
 then
    sTestTool=`GetValueFromSection Current OOoProgramDir "$testtoolrc"`
-   sTestTool="$sTestTool/program/testtool.bin"
+   sTestTool="$sTestTool/basis-link/program/testtool.bin"
 fi
 
-sd_prog=`dirname "$sTestTool"`
-case `uname -s` in
-    Darwin)
-    # this is a temporary hack until we can live with the default search paths
-    if [ "$DYLD_LIBRARY_PATH" ]; then 
-      SYSTEM_DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH"
-      export SYSTEM_DYLD_LIBRARY_PATH
-      DYLD_LIBRARY_PATH="$sd_prog":"$DYLD_LIBRARY_PATH"
-    else
-      DYLD_LIBRARY_PATH="$sd_prog"
-    fi
-    export DYLD_LIBRARY_PATH
-    ;;               
 
-  *)
-    # this is a temporary hack until we can live with the default search paths
-    if [ "$LD_LIBRARY_PATH" ]; then
-      SYSTEM_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
-      export SYSTEM_LD_LIBRARY_PATH
-      LD_LIBRARY_PATH="$sd_prog":"$LD_LIBRARY_PATH"
-    else
-      LD_LIBRARY_PATH="$sd_prog"
-    fi
-    export LD_LIBRARY_PATH
-    ;;  
-esac
 
 echo "****************************************************"
 echo "************ STARTING ************"
 	`$KILLOFFICEALL`        
 	
 	echo "****************************************************"
-	echo "running $x"
+	x=`echo "$x"|sed s/[[:blank:]]*$//`	#cut all trailing blanks 
 	sTest="$sLocation$x"
+	if [ -f "$sTest" ]; then
 
-	# three pass logic - first pass is the real test, second pass is reset office, third is closeoffice
-    for z in "1" "2" "3";
-    do
-		"$sTestTool" -run "$sTest" &
-		sleep 5
-		echo " "
+		# two pass logic - first pass is the real test, second pass is reset office, third is closeoffice
+    		for z in "1" "2";
+		do
+			echo "running <$sTest>"
+			"$sTestTool" -run "$sTest" &
+			sleep 5
+			echo " "
 
-		######### save the PID from the last Background job
-		testtoolpid=$!
-		echo "PID of Testtool: " $testtoolpid
+			######### save the PID from the last Background job
+			testtoolpid=$!
+			echo "PID of Testtool: " $testtoolpid
 
-		if [ `ps -A | grep -v "grep" | grep $testtoolpid | wc -l` -gt 0 ] ; then
-			echo " Successfully started"
-		else
-			echo " There might be something wrong with starting the Testtool!"
-		fi
+			if [ `ps -A | grep -v "grep" | grep $testtoolpid | wc -l` -gt 0 ] ; then
+				echo " Successfully started"
+			else
+				echo " There might be something wrong with starting the Testtool!"
+			fi
 
-		######### wait until Testtool has finished & closed
-		while [ `ps -A | grep -v "grep" | grep $testtoolpid | wc -l` -gt 0 ] ; 
-		do
-			sleep 5
-			i=$((i+5))
+			######### wait until Testtool has finished & closed
+			while [ `ps -A | grep -v "grep" | grep $testtoolpid | wc -l` -gt 0 ] ; 
+			do
+				sleep 5
+				i=$((i+5))
+			done
+
+			####### for the second run use the office reset script!
+        		case $z in
+            			"1")    sTest="$sResetOfficeBas";;
+            		esac
 		done
-
-		####### for the second run use the office reset script, for the third use office exit!
-        case $z in
-            "1")    sTest="$sResetOfficeBas";;
-            "2")    sTest="$sExitOfficeBas";;
-        esac
-	done
+	else
+		echo "Error: file <$sTest> not found"
+	fi
 done
 
 echo "Duration:" $((i/60)) "min" $((i%60)) "sec "