Resolve conflicts from Merger of Issue #138 into release branch v1.3.0

damies13 · Apr 28, 2024 · 5a32272 · 5a32272
2 parents 85f937b + b570b72
commit 5a32272
Show file tree

Hide file tree

Showing 498 changed files with 14,598,771 additions and 420 deletions.
diff --git a/.github/workflows/Regression_Tests.yaml b/.github/workflows/Regression_Tests.yaml
@@ -242,6 +242,7 @@ jobs:
         if: ${{ matrix.platform == 'ubuntu-latest' }}
         run: |
           sudo apt -y install python3-tk python3-dev python3-xlib scrot fluxbox tesseract-ocr
+          sudo apt -y install xsel xclip
           sudo apt list --installed
       - name: "Ubuntu Xvfb"
         if: ${{ matrix.platform == 'ubuntu-latest' }}
@@ -292,6 +293,9 @@ jobs:
         if: ${{ matrix.platform == 'windows-latest' }}
         run: |
           dir dist
+      # - name: "Ubuntu pip installs"
+      #   if: ${{ matrix.platform == 'ubuntu-latest' }}
+      #   run: pip install gtk PyQt4
       - name: Install Reporter from dist UM
         if: ${{ matrix.platform != 'windows-latest' }}
         run: pip install rfswarm_reporter-*.whl

diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml
@@ -21,7 +21,7 @@ jobs:
         uses: github/super-linter@v4
         env:
           DEFAULT_BRANCH: main
-          FILTER_REGEX_EXCLUDE: (.*sh|.git/.*|.Doc/Images/.*|.Tests/.*/Logs/.*)
+          FILTER_REGEX_EXCLUDE: (.*sh|.git/.*|.Doc/Images/.*|.Tests/.*/Logs/.*|.Tests/.*/testdata/.*)
           VALIDATE_PYTHON_BLACK: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_CSS: false

diff --git a/README.md b/README.md
@@ -6,10 +6,10 @@
 
 | Master | Branch |
 | -- | -- |
-| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=master&label=Linter)](https://github.com/damies13/rfswarm/actions/workflows/superlinter.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=v1.3.0&label=Linter) |
-| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=master&label=Regression%20Tests)](https://github.com/damies13/rfswarm/actions/workflows/Regression_Tests.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=v1.3.0&label=Regression%20Tests) |
-| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=master&label=Linter)](https://github.com/damies13/rfswarm/actions/workflows/superlinter.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=v1.3.0&label=Linter) |
-| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=master&label=Regression%20Tests)](https://github.com/damies13/rfswarm/actions/workflows/Regression_Tests.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=v1.3.0&label=Regression%20Tests) |
+| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=master&label=Linter)](https://github.com/damies13/rfswarm/actions/workflows/superlinter.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=Issue-%23138-reporter-time-range&label=Linter) |
+| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=master&label=Regression%20Tests)](https://github.com/damies13/rfswarm/actions/workflows/Regression_Tests.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=Issue-%23138-reporter-time-range&label=Regression%20Tests) |
+| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=master&label=Linter)](https://github.com/damies13/rfswarm/actions/workflows/superlinter.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/superlinter.yml?branch=Issue-%23138-reporter-time-range&label=Linter) |
+| [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=master&label=Regression%20Tests)](https://github.com/damies13/rfswarm/actions/workflows/Regression_Tests.yml) | ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/damies13/rfswarm/Regression_Tests.yml?branch=Issue-%23138-reporter-time-range&label=Regression%20Tests) |
 
 <img align="right" src="Doc/Images/Icon_Information.png">
 

diff --git a/Tests/Regression/Reporter/CommandLine_Basic.robot b/Tests/Regression/Reporter/CommandLine_Basic.robot
@@ -1,13 +1,8 @@
 *** Settings ***
-Library 	OperatingSystem
-Library 	Process
+Resource 	CommandLine_Common.robot
 
 Suite Setup			Clean Up Old Files
 
-*** Variables ***
-${cmd_reporter} 		rfswarm-reporter
-${pyfile}			${EXECDIR}${/}rfswarm_reporter${/}rfswarm_reporter.py
-
 *** Test Cases ***
 Robot Version
 	[Documentation] 	Logs the robot framework version used
@@ -34,72 +29,3 @@ Reporter Help
 	${result}= 	Run 	${cmd_reporter} -h
 	Log to console 	${\n}${result}
 	Should Contain	${result}	Excel
-
-Command Line Generate HTML
-	[Tags]	ubuntu-latest 	macos-latest 	windows-latest 	Issue #144 	HTML
-	Log To Console 	${\n}TAGS: ${TEST TAGS}
-	${testdata}= 	Set Variable    Issue-#144
-	${resultdata}= 	Set Variable    20230320_185055_demo
-	${basefolder}= 	Set Variable    ${CURDIR}${/}testdata${/}${testdata}
-	Should Exist	${basefolder}
-	Log 	basefolder: ${basefolder} 	console=True
-	${resultfolder}= 	Set Variable    ${basefolder}${/}${resultdata}
-	Should Exist	${resultfolder}
-	Log 	resultfolder: ${resultfolder} 	console=True
-	${template}= 	Set Variable    ${basefolder}${/}90%ileTemplate.template
-	Should Exist	${template}
-	Log 	template: ${template} 	console=True
-	# ${result}=	Run 	python3 ${pyfile} -n -g 1 -d ${resultfolder} -t ${template} --html
-	${result}= 	Run 	${cmd_reporter} -n -g 1 -d ${resultfolder} -t ${template} --html
-	Log 	result: ${\n}${result} 	console=True
-	Should Not Contain 	${result} 	Traceback
-	Should Exist	${resultfolder}${/}${resultdata}.html
-
-Command Line Generate Docx
-	[Tags]	ubuntu-latest 	macos-latest 	windows-latest 	Issue #144 	DOCX
-	Log To Console 	${\n}TAGS: ${TEST TAGS}
-	${testdata}= 	Set Variable    Issue-#144
-	${resultdata}= 	Set Variable    20230320_185055_demo
-	${basefolder}= 	Set Variable    ${CURDIR}${/}testdata${/}${testdata}
-	Should Exist	${basefolder}
-	Log to console 	basefolder: ${basefolder} 	console=True
-	${resultfolder}= 	Set Variable    ${basefolder}${/}${resultdata}
-	Should Exist	${resultfolder}
-	Log 	resultfolder: ${resultfolder} 	console=True
-	${template}= 	Set Variable    ${basefolder}${/}90%ileTemplate.template
-	Should Exist	${template}
-	Log 	template: ${template} 	console=True
-	# ${result}=	Run 	python3 ${pyfile} -n -g 1 -d ${resultfolder} -t ${template} --docx
-	${result}= 	Run 	${cmd_reporter} -n -g 1 -d ${resultfolder} -t ${template} --docx
-	Log 	${\n}${result} 	console=True
-	Should Not Contain 	${result} 	Traceback
-	Should Exist	${resultfolder}${/}${resultdata}.docx
-
-Command Line Generate Xlsx
-	[Tags]	ubuntu-latest 	macos-latest 	windows-latest 	Issue #144 	XLSX
-	Log To Console 	${\n}TAGS: ${TEST TAGS}
-	${testdata}= 	Set Variable    Issue-#144
-	${resultdata}= 	Set Variable    20230320_185055_demo
-	${basefolder}= 	Set Variable    ${CURDIR}${/}testdata${/}${testdata}
-	Should Exist	${basefolder}
-	Log 	basefolder: ${basefolder} 	console=True
-	${resultfolder}= 	Set Variable    ${basefolder}${/}${resultdata}
-	Should Exist	${resultfolder}
-	Log 	resultfolder: ${resultfolder} 	console=True
-	${template}= 	Set Variable    ${basefolder}${/}90%ileTemplate.template
-	Should Exist	${template}
-	Log 	template: ${template} 	console=True
-	# ${result}=	Run 	python3 ${pyfile} -n -g 1 -d ${resultfolder} -t ${template} --xlsx
-	${result}= 	Run 	${cmd_reporter} -n -g 1 -d ${resultfolder} -t ${template} --xlsx
-	Log 	${\n}${result} 	console=True
-	Should Not Contain 	${result} 	Traceback
-	Should Exist	${resultfolder}${/}${resultdata}.xlsx
-
-*** Keywords ***
-Clean Up Old Files
-		[Tags]	ubuntu-latest 	macos-latest 	windows-latest
-		# cleanup previous output
-		Log To Console    ${OUTPUT DIR}
-		Remove File    ${OUTPUT DIR}${/}*.txt
-		Remove File    ${OUTPUT DIR}${/}*.png
-		# Remove File    ${OUTPUT DIR}${/}sikuli_captured${/}*.*
diff --git a/Tests/Regression/Reporter/CommandLine_Bugs.robot b/Tests/Regression/Reporter/CommandLine_Bugs.robot
@@ -19,3 +19,64 @@ Check If The Not Buildin Modules Are Included In The Reporter Setup File
 		...    Should Contain	${requires}	${i}
 		...    msg="Some modules are not in Reporter setup file"
 	END
+
+*** Test Cases ***
+Command Line Generate HTML
+	[Tags]	ubuntu-latest 	macos-latest 	windows-latest 	Issue #144 	HTML
+	Log To Console 	${\n}TAGS: ${TEST TAGS}
+	${testdata}= 	Set Variable    Issue-#144
+	${resultdata}= 	Set Variable    20230320_185055_demo
+	${basefolder}= 	Set Variable    ${CURDIR}${/}testdata${/}${testdata}
+	Should Exist	${basefolder}
+	Log 	basefolder: ${basefolder} 	console=True
+	${resultfolder}= 	Set Variable    ${basefolder}${/}${resultdata}
+	Should Exist	${resultfolder}
+	Log 	resultfolder: ${resultfolder} 	console=True
+	${template}= 	Set Variable    ${basefolder}${/}90%ileTemplate.template
+	Should Exist	${template}
+	Log 	template: ${template} 	console=True
+	# ${result}=	Run 	python3 ${pyfile} -n -g 1 -d ${resultfolder} -t ${template} --html
+	${result}= 	Run 	${cmd_reporter} -n -g 1 -d ${resultfolder} -t ${template} --html
+	Log 	result: ${\n}${result} 	console=True
+	Should Not Contain 	${result} 	Traceback
+	Should Exist	${resultfolder}${/}${resultdata}.html
+
+Command Line Generate Docx
+	[Tags]	ubuntu-latest 	macos-latest 	windows-latest 	Issue #144 	DOCX
+	Log To Console 	${\n}TAGS: ${TEST TAGS}
+	${testdata}= 	Set Variable    Issue-#144
+	${resultdata}= 	Set Variable    20230320_185055_demo
+	${basefolder}= 	Set Variable    ${CURDIR}${/}testdata${/}${testdata}
+	Should Exist	${basefolder}
+	Log to console 	basefolder: ${basefolder} 	console=True
+	${resultfolder}= 	Set Variable    ${basefolder}${/}${resultdata}
+	Should Exist	${resultfolder}
+	Log 	resultfolder: ${resultfolder} 	console=True
+	${template}= 	Set Variable    ${basefolder}${/}90%ileTemplate.template
+	Should Exist	${template}
+	Log 	template: ${template} 	console=True
+	# ${result}=	Run 	python3 ${pyfile} -n -g 1 -d ${resultfolder} -t ${template} --docx
+	${result}= 	Run 	${cmd_reporter} -n -g 1 -d ${resultfolder} -t ${template} --docx
+	Log 	${\n}${result} 	console=True
+	Should Not Contain 	${result} 	Traceback
+	Should Exist	${resultfolder}${/}${resultdata}.docx
+
+Command Line Generate Xlsx
+	[Tags]	ubuntu-latest 	macos-latest 	windows-latest 	Issue #144 	XLSX
+	Log To Console 	${\n}TAGS: ${TEST TAGS}
+	${testdata}= 	Set Variable    Issue-#144
+	${resultdata}= 	Set Variable    20230320_185055_demo
+	${basefolder}= 	Set Variable    ${CURDIR}${/}testdata${/}${testdata}
+	Should Exist	${basefolder}
+	Log 	basefolder: ${basefolder} 	console=True
+	${resultfolder}= 	Set Variable    ${basefolder}${/}${resultdata}
+	Should Exist	${resultfolder}
+	Log 	resultfolder: ${resultfolder} 	console=True
+	${template}= 	Set Variable    ${basefolder}${/}90%ileTemplate.template
+	Should Exist	${template}
+	Log 	template: ${template} 	console=True
+	# ${result}=	Run 	python3 ${pyfile} -n -g 1 -d ${resultfolder} -t ${template} --xlsx
+	${result}= 	Run 	${cmd_reporter} -n -g 1 -d ${resultfolder} -t ${template} --xlsx
+	Log 	${\n}${result} 	console=True
+	Should Not Contain 	${result} 	Traceback
+	Should Exist	${resultfolder}${/}${resultdata}.xlsx
diff --git a/Tests/Regression/Reporter/CommandLine_Common.robot b/Tests/Regression/Reporter/CommandLine_Common.robot
@@ -5,7 +5,19 @@ Library 	DatabaseLibrary
 Library 	String
 Library 	Collections
 
+*** Variables ***
+${cmd_reporter} 		rfswarm-reporter
+${pyfile}			${EXECDIR}${/}rfswarm_reporter${/}rfswarm_reporter.py
+
 *** Keywords ***
+Clean Up Old Files
+		[Tags]	ubuntu-latest 	macos-latest 	windows-latest
+		# cleanup previous output
+		Log To Console    ${OUTPUT DIR}
+		Remove File    ${OUTPUT DIR}${/}*.txt
+		Remove File    ${OUTPUT DIR}${/}*.png
+		# Remove File    ${OUTPUT DIR}${/}sikuli_captured${/}*.*
+
 Get Modules From Program .py File That Are Not BuildIn
 	[Tags]	windows-latest	ubuntu-latest	macos-latest	Issue #123
 	[Arguments]		${file_path}