autoit v3.3.10.2 버전 적용 및 Webdriver 연동 기능 추가

guitar/bin/GUITAR.au3

@@ -1,5 +1,5 @@
 #AutoIt3Wrapper_Icon=GUITAR.ico
-#AutoIt3Wrapper_Res_Fileversion=1.5.3.8
+#AutoIt3Wrapper_Res_Fileversion=1.5.3.18
 #AutoIt3Wrapper_Res_FileVersion_AutoIncrement=p
 
 ;#RequireAdmin
@@ -20,7 +20,6 @@
 #include <Excel.au3>
 #include <Sound.au3>
 
-
 #include ".\_include_nhn\_util.au3"
 #include ".\_include_nhn\_file.au3"
 #include ".\_include_nhn\_http.au3"
@@ -30,7 +29,6 @@
 #include ".\_include_nhn\_ie2.au3"
 #include ".\_include_nhn\_statusbar.au3"
 
-
 #include "UIACommon.au3"
 #include "UIAFormMain.au3"
 #include "UIAOptions.au3"
@@ -46,7 +44,6 @@
 #include "GUITARAImageList.au3"
 #include "GUITARLanguage.au3"
 
-
 main()
 
 func main ()
@@ -85,7 +82,6 @@ func main ()
 
 	endif
 
-
 	_ScriptLogWrite("해상도 확인 완료")
 
 
@@ -136,6 +132,9 @@ func main ()
 
 	;exit
 
+	; 언어 리소스를 캐싱함
+	_writeLanguageMsgcache ()
+
 	if _isWorksatationLocked() then
 		_RemoteProgrammError(_getLanguageMsg("error_systemlock"))
 		_exit(1, True )
@@ -888,6 +887,20 @@ func runRichScript($bIsRetry, $bAutoSave = False)
 
 			_getLastBrowserInfo ()
 
+			; 최근 수행한 웹드라이버 세션이 있을 경우 수행
+			if $_webdriver_connection_host <> "" and $_runWebdriver = False then
+				$sNewBrowserCreate = _ProgramQuestionYN(("이전 사용한 웹드라이버 세션을 사용하시겠습니까?" & @crlf & @crlf & $_webdriver_connection_host))
+				if $sNewBrowserCreate ="Y" then
+					$_runWebdriver = True
+					$_runBrowser = ""
+					$_hBrowser = ""
+				else
+					$_runWebdriver = False
+					$_webdriver_current_sessionid = ""
+					$_webdriver_connection_host = ""
+				endif
+			endif
+
 			; 프로세스가 존재할 경우 브라우저 이름이  동일한지 확인
 			if WinExists($_hBrowser) <> 0 then
 				if getBrowserExe($_runBrowser) <> _ProcessGetName(WinGetProcess($_hBrowser, ""))  then
@@ -896,7 +909,7 @@ func runRichScript($bIsRetry, $bAutoSave = False)
 				endif
 			endif
 
-			if $_runBrowser = "" or WinExists($_hBrowser) = 0  Then
+			if ($_runBrowser = "" or WinExists($_hBrowser) = 0) and $_runWebdriver = False  Then
 
 				$sNewBrowserCreate = _ProgramQuestionYNC(_getLanguageMsg("information_browsersetting"))
 
@@ -912,16 +925,17 @@ func runRichScript($bIsRetry, $bAutoSave = False)
 				if $sNewBrowserType <> "" Then
 					$_runBrowser = $sNewBrowserType
 					$_hBrowser = $hNewBrowser
-				Else
-					$bResult = False
-					writeRunLog($_sLogText_PreError & _getLanguageMsg("error_browserselectfail"))
-					exitloop
+				;Else
+				;	$bResult = False
+				;	writeRunLog($_sLogText_PreError & _getLanguageMsg("error_browserselectfail"))
+				;	exitloop
 				endif
 			endif
 
 			;msg("선택 브라우저 정보 : " & $_runBrowser & ", Handle:" & $_hBrowser)
 			_setCurrentBrowserInfo()
 
+
 			;if $_runBrowser = $_sBrowserIE then
 			;	$_oBrowser = _IEAttach($_hBrowser,"HWND")
 			;endif
@@ -931,7 +945,6 @@ func runRichScript($bIsRetry, $bAutoSave = False)
 					_setBrowserWindowsSize($_hBrowser, False)
 				case else
 					_setBrowserWindowsSize($_hBrowser, True )
-
 			EndSwitch
 
 
@@ -1125,11 +1138,14 @@ func runRichScript($bIsRetry, $bAutoSave = False)
 
 			endif
 
+
+			; 장시간 테스트후 리소스가 초기화 되는 경우가 발생하여 오브젝트 재 로딩
+			_loadLanguageResource(_loadLanguageFile(getReadINI("Environment","Language")))
 			;SaveResultMHT("테스트결과 : " & _GetFileName($sScriptName) , $aTestLogInfo, getLogFileName($sScriptName))
 
 			writeDebugTimeLog("report 파일 생성 후2 ")
-			writeDebugTimeLog("report 파일 생성 후2 " & $sReportFile)
 			writeDebugTimeLog("report 파일 생성 후2 " & _getLanguageMsg("report_create"))
+			writeDebugTimeLog("report 파일 생성 후2 " & $sReportFile)
 			writeRunLog(_getLanguageMsg("report_create") & " : " & $sReportFile)
 			writeDebugTimeLog("report 파일 열기 ")
 
@@ -2868,6 +2884,7 @@ func onClipboardOpen()
 endfunc
 
 
+
 func HudsonDateTimeConvert($sDate)
 
 	local $aSplit = StringSplit($sDate, "_")
@@ -2965,7 +2982,4 @@ func _ScriptCommentSet()
 
 	_GUICtrlRichEdit_Setsel($_gEditScript, $iCharStart, $iCharEnd)
 
-endfunc
-
-
-
+endfunc

guitar/bin/GUITARIEObject.au3

@@ -135,7 +135,7 @@ func IEObjectGetAllInnerHtml_old($oIE)
 	local $oItems, $oItem
 
 	local $oMyError = ObjEvent("AutoIt.Error","UIAIE_NavigateError")
-	_IEErrorHandlerRegister("_IEErrorHandlerRegister")
+
 
 	;debug($iFrameCnt)
 	;debug(_IEPropertyGet ($oIE, "outertext"))
@@ -174,7 +174,7 @@ func IEObjectGetAllInnerHtml_old($oIE)
 
 	;debug("왔어1")
 
-	_IEErrorHandlerDeRegister()
+
 	$oMyError = ObjEvent("AutoIt.Error")
 
 	return $sInnerHtml
@@ -206,7 +206,7 @@ func IEObjectSearchFromObject($oIE, $sCondition, $bCountCheck)
 	local $aCondition[1][5]
 
 	local $oMyError = ObjEvent("AutoIt.Error","UIAIE_NavigateError")
-	_IEErrorHandlerRegister("_IEErrorHandlerRegister")
+
 
 	;debug("찾는조건 : " & $sCondition)
 
@@ -274,8 +274,6 @@ func IEObjectSearchFromObject($oIE, $sCondition, $bCountCheck)
 	next
 
 
-
-	_IEErrorHandlerDeRegister()
 	$oMyError = ObjEvent("AutoIt.Error")
 
 	return $aRetObject

guitar/bin/GUITARLanguage.au3

@@ -1,7 +1,10 @@
+#include-once
+#Include <array.au3>
 #include ".\_include_nhn\_util.au3"
 
 Global $_sLanguageName
 Global $_oLanguageDictionary
+Global $_aLanguageCache[1][3]
 
 ;_loadLanguageResource(_loadLanguageFile("english"))
 
@@ -40,10 +43,10 @@ func _loadLanguageResource($sFile)
 
 	local $aFileContents
 	local $iTabPos, $i
-	local $oDictionary
 	local $sKey, $sValue
 
-	$oDictionary = ObjCreate("Scripting.Dictionary")
+	$_oLanguageDictionary = 0
+	$_oLanguageDictionary = ObjCreate("Scripting.Dictionary")
 
 	_FileReadToArray($sFile,$aFileContents)
 
@@ -58,13 +61,11 @@ func _loadLanguageResource($sFile)
 			;if $sKey <> "" and $sValue <> "" then
 				;_debug("추가 : " & $sKey, $sValue)
 				;$oDictionary.add ($sKey, "K" & $sValue)
-				$oDictionary.add ($sKey,  $sValue)
+				$_oLanguageDictionary.add ($sKey,  $sValue)
 			;endif
 		endif
 	next
 
-	$_oLanguageDictionary = $oDictionary
-
 endfunc
 
 
@@ -76,11 +77,18 @@ func _getLanguageMsg($sID, $sParam1="", $sParam2="", $sParam3="", $sParam4="", $
 
 	$sID = StringLower($sID)
 
-	If $_oLanguageDictionary.Exists($sID) Then
-		$sMessage= $_oLanguageDictionary.item ($sID)
-	else
-		$sMessage= "undefined : " & $sID
-		_msg($sMessage)
+	$sMessage = _getLanguageMsgcache($sID)
+
+	;debug("캐시:" & $sMessage)
+
+	if $sMessage = "" then
+		If $_oLanguageDictionary.Exists($sID) Then
+			$sMessage= $_oLanguageDictionary.item ($sID)
+			_addLanguageMsgcache($sID, $sMessage)
+		else
+			$sMessage= "undefined : " & $sID
+			_msg($sMessage)
+		endif
 	endif
 
 	$sMessage = stringreplace($sMessage, "@crlf", @crlf)
@@ -93,4 +101,63 @@ func _getLanguageMsg($sID, $sParam1="", $sParam2="", $sParam3="", $sParam4="", $
 
 	return $sMessage
 
-endfunc
+endfunc
+
+
+func _addLanguageMsgcache($sID, $sMsg)
+
+	redim $_aLanguageCache[ubound($_aLanguageCache,1) + 1][3]
+
+	$_aLanguageCache[ubound($_aLanguageCache)-1][1] = $sID
+	$_aLanguageCache[ubound($_aLanguageCache)-1][2] = $sMsg
+	;debug($sID, $sMsg)
+
+endfunc
+
+
+func _getLanguageMsgcache($sID)
+
+	local $iIndex
+	local $sRet = ""
+
+	$iIndex =  _ArraySearch($_aLanguageCache,$sID,0,0,0,0,1,1)
+
+	if $iIndex <> -1 then $sRet = $_aLanguageCache[$iIndex][2]
+
+	return $sRet
+
+endfunc
+
+
+
+func _writeLanguageMsgcache()
+
+	local $sTemp
+
+	$sTemp = _getLanguageMsg("report_testserver")
+	$sTemp = _getLanguageMsg("report_testscript")
+	$sTemp = _getLanguageMsg("report_testrun")
+	$sTemp = _getLanguageMsg("information_teststop")
+	$sTemp = _getLanguageMsg("information_testpause")
+	$sTemp = _getLanguageMsg("report_testend")
+	$sTemp = _getLanguageMsg("report_result")
+	$sTemp = _getLanguageMsg("report_pass")
+	$sTemp = _getLanguageMsg("report_fail")
+	$sTemp = _getLanguageMsg("report_testresult")
+	$sTemp = _getLanguageMsg("report_target")
+	$sTemp = _getLanguageMsg("report_run")
+	$sTemp = _getLanguageMsg("report_notrun")
+	$sTemp = _getLanguageMsg("report_skip")
+	$sTemp = _getLanguageMsg("common_timeminute")
+	$sTemp = _getLanguageMsg("report_testtime")
+	$sTemp = _getLanguageMsg("report_version")
+	$sTemp = _getLanguageMsg("status_fail")
+	$sTemp = _getLanguageMsg("status_success")
+	$sTemp = _getLanguageMsg("report_detail")
+	$sTemp = _getLanguageMsg("report_create")
+	$sTemp = _getLanguageMsg("report_sendsms")
+	$sTemp = _getLanguageMsg("report_sendemail")
+	$sTemp = _getLanguageMsg("error_emailsend")
+	$sTemp = _getLanguageMsg("report_testend")
+
+endfunc

guitar/bin/UIAAnalysis.au3

@@ -70,7 +70,8 @@ Global Const $_sCommandTargetCapture = "TargetCapture"
 Global Const $_sCommandTagCountGet = "TagCountGet"
 Global Const $_sCommandJSRun = "JSRun"
 Global Const $_sCommandJSInsert = "JSInsert"
-
+Global Const $_sCommandWDSessionCreate = "WDSessionCreate"
+Global Const $_sCommandWDSessionDelete = "WDSessionDelete"
 
 Global Const $_sScriptFileExt = ".txt"
 
@@ -297,6 +298,9 @@ func getCommandText()
 	addCommandList($iCommandCount, $_sCommandJSRun  , $aCommandList, _getLanguageMsg("Command_JSRun"))
 	addCommandList($iCommandCount, $_sCommandJSInsert   , $aCommandList, _getLanguageMsg("Command_JSInsert"))
 
+	addCommandList($iCommandCount, $_sCommandWDSessionCreate   , $aCommandList, _getLanguageMsg("Command_WDSessionCreate"))
+	addCommandList($iCommandCount, $_sCommandWDSessionDelete   , $aCommandList, _getLanguageMsg("Command_WDSessionDelete"))
+
 
 	redim $aCommandList[$iCommandCount + 1][$_iCommandEnd]
 
@@ -352,7 +356,6 @@ func addCommandList(byref $iCommandCount, $sCommand, byref $aCommandList, $sDefa
 		endif
 	next
 
-
 endfunc
 
 
@@ -900,20 +903,23 @@ Func checkTartgetImageExists($sPrimeCommand, $sScriptTarget, byref $aImageList,
 	local $bCheckResult
 	local $bCheckCache
 	local const $sCacheSplit = "|"
-	local $aReservedWord[3]
+	local $aReservedWord[5]
 	local $sCacheImageName
 
 
 	$aReservedWord[1] = "["
 	$aReservedWord[2] = "]"
+	$aReservedWord[3] = "{"
+	$aReservedWord[4] = "}"
 
 	;msg("왔어")
 
+	; 이미지 방식이 아닌 경우 (웹드라이버, TAG 방식) 바로 OK
+	if getImageType($sScriptTarget) = False then return True
+
 	$aImageListMulti = StringSplit($sScriptTarget,",")
 	$bResult = True
 
-
-
 	for $i=1 to ubound($aImageListMulti) -1
 
 		$aImageListMulti[$i] = _Trim($aImageListMulti[$i])
@@ -1119,6 +1125,9 @@ func getImageType($sScriptTarget)
 
 	$bRet = getVarType($sScriptTarget)
 	if $bRet = False then $bRet = getIEObjectType($sScriptTarget)
+	if $bRet = False then $bRet = isWebdriverParam($sScriptTarget)
+
+	;debug(isWebdriverParam($sScriptTarget), $sScriptTarget)
 
 	return not($bRet)
 
@@ -1197,8 +1206,6 @@ func getVarNameValue($sScriptTarget, byref $sNewName, byref $sNewValue, $sConver
 
 		ConvertVarFull ($sVarValue, $sNewValue, $bVarAddInfo, $sConvertType, $bExtractCheck)
 
-
-
 		$bReturn = True
 	Else
 		$bReturn = False
@@ -1480,7 +1487,7 @@ func checkSimpleCommand($sCommand)
 
 	Switch  $sCommand
 
-		case $_sCommandSuccess, $_sCommandFail, $_sCommandCapture, $_sCommandBrowserEnd, $_sCommandMouseHide, $_sCommandMouseWheelUp , $_sCommandMouseWheelDown, $_sCommandComma, $_sCommandGoHome, $_sCommandBlockStart, $_sCommandBlockEnd, $_sCommandFullScreenWork
+		case $_sCommandSuccess, $_sCommandFail, $_sCommandCapture, $_sCommandBrowserEnd, $_sCommandMouseHide, $_sCommandMouseWheelUp , $_sCommandMouseWheelDown, $_sCommandComma, $_sCommandGoHome, $_sCommandBlockStart, $_sCommandBlockEnd, $_sCommandFullScreenWork, $_sCommandWDSessionDelete
 
 			$bResult = True