JENKINS-72538 - SKIP status configurable when calculating all tests

src/main/java/hudson/plugins/robot/AggregatedRobotAction.java

@@ -109,33 +109,34 @@
 
 		private static final long serialVersionUID = 1L;
 		private final transient AggregatedRobotAction parent;
-		private int passed, failed, skipped, criticalPassed, criticalFailed;
+		private int passed, failed, skipped;
 
 		public AggregatedRobotResult(AggregatedRobotAction parent) {
 			this.parent = parent;
 		}
 
 		public void addResult(RobotResult result) {
-			criticalFailed += result.getCriticalFailed();
-			criticalPassed += result.getCriticalPassed();
 			failed += result.getOverallFailed();
 			passed += result.getOverallPassed();
 			skipped += result.getOverallSkipped();
 		}
 
+		@Deprecated
 		@Override
 		public long getCriticalPassed() {
-			return criticalPassed;
+			return this.getOverallPassed();
 		}
 
+		@Deprecated
 		@Override
 		public long getCriticalFailed() {
-			return criticalFailed;
+			return this.getOverallFailed();
 		}
 
+		@Deprecated
 		@Override
 		public long getCriticalTotal() {
-			return criticalFailed + criticalPassed;
+			return this.getOverallTotal();
 		}
 
 		@Override

src/main/java/hudson/plugins/robot/RobotBuildAction.java

@@ -65,6 +65,8 @@
 	private RobotResult result;
 	private String xAxisLabel;
 
+	private boolean countSkippedTests;
+
 	static {
 		XSTREAM.alias("result",RobotResult.class);
 		XSTREAM.alias("suite",RobotSuiteResult.class);
@@ -83,7 +85,8 @@
 	 * @param enableCache Whether we want to enable caching or not
 	 */
 	public RobotBuildAction(Run<?, ?> build, RobotResult result,
-			String outputPath, TaskListener listener, String logFileLink, String logHtmlLink, boolean enableCache, String xAxisLabel) {
+			String outputPath, TaskListener listener, String logFileLink, String logHtmlLink, boolean enableCache, String xAxisLabel,
+							boolean countSkippedTests) {
 		super();
 		super.onAttached(build);
 		this.build = build;
@@ -92,6 +95,7 @@
 		this.logHtmlLink = logHtmlLink;
 		this.enableCache = enableCache;
 		this.xAxisLabel = xAxisLabel;
+		this.countSkippedTests = countSkippedTests;
 		setResult(result, listener);
 	}
 
@@ -333,4 +337,12 @@
 	public List<RobotCaseResult> getAllTests() {
 		return getResult().getAllCases();
 	}
+
+	public boolean isCountSkippedTests() {
+		return countSkippedTests;
+	}
+
+	public void setCountSkippedTests(boolean countSkippedTests) {
+		this.countSkippedTests = countSkippedTests;
+	}
 }

src/main/java/hudson/plugins/robot/RobotParser.java

@@ -293,7 +293,7 @@ private RobotCaseResult processTest(XMLStreamReader reader, RobotSuiteResult res
 			caseResult.setLogFile(this.logFileName);
 			//parse attributes
 			caseResult.setName(reader.getAttributeValue(null, "name"));
-			setCriticalityIfAvailable(reader, caseResult);
+			//setCriticalityIfAvailable(reader, caseResult);
 			caseResult.setId(reader.getAttributeValue(null, "id"));
 			//parse test tags
 			caseResult.setDescription("");
@@ -346,7 +346,7 @@ private RobotCaseResult processTest(XMLStreamReader reader, RobotSuiteResult res
 			if (schemaVersion >= 5) {
 				caseResult.setElapsedTime(reader.getAttributeValue(null, elapsedLocalName));
 			}
-			setCriticalityIfAvailable(reader, caseResult);
+//			setCriticalityIfAvailable(reader, caseResult);
 			while(reader.hasNext()){
 				reader.next();
 				if(reader.isCharacters()){