LRCI-4360 Do not include extra properties in the job summary for the …

…rule engine

modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/JUnitBatchTestClassGroup.java

@@ -64,6 +64,15 @@ public int getAxisCount() {
 	}
 
 	public List<JobProperty> getExcludesJobProperties() {
+		if (_jUnitTestBatch != null) {
+			List<JobProperty> testBatchJobProperties =
+				getTestSelectorExcludesJobProperties();
+
+			recordJobProperties(testBatchJobProperties);
+
+			return testBatchJobProperties;
+		}
+
 		List<JobProperty> excludesJobProperties = new ArrayList<>();
 
 		excludesJobProperties.addAll(getRequiredExcludesJobProperties());
@@ -105,6 +114,15 @@ public List<JobProperty> getFilterJobProperties() {
 	}
 
 	public List<JobProperty> getIncludesJobProperties() {
+		if (_jUnitTestBatch != null) {
+			List<JobProperty> testBatchJobProperties =
+				getTestSelectorIncludesJobProperties();
+
+			recordJobProperties(testBatchJobProperties);
+
+			return testBatchJobProperties;
+		}
+
 		List<JobProperty> includesJobProperties = new ArrayList<>();
 
 		includesJobProperties.addAll(getRequiredIncludesJobProperties());
@@ -568,6 +586,18 @@ protected List<JobProperty> getStableRequiredIncludesJobProperties() {
 		return includesJobProperties;
 	}
 
+	protected List<JobProperty> getTestSelectorExcludesJobProperties() {
+		JUnitTestSelector jUnitTestSelector = _jUnitTestBatch.getTestSelector();
+
+		return jUnitTestSelector.getExcludesJobProperties();
+	}
+
+	protected List<JobProperty> getTestSelectorIncludesJobProperties() {
+		JUnitTestSelector jUnitTestSelector = _jUnitTestBatch.getTestSelector();
+
+		return jUnitTestSelector.getIncludesJobProperties();
+	}
+
 	@Override
 	protected boolean ignore() {
 		return false;

modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/ModulesJUnitBatchTestClassGroup.java

@@ -12,7 +12,6 @@
 import com.liferay.jenkins.results.parser.PortalTestClassJob;
 import com.liferay.jenkins.results.parser.job.property.JobProperty;
 import com.liferay.jenkins.results.parser.test.batch.JUnitTestBatch;
-import com.liferay.jenkins.results.parser.test.batch.JUnitTestSelector;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,17 +40,13 @@ protected ModulesJUnitBatchTestClassGroup(
 		String batchName, PortalTestClassJob portalTestClassJob) {
 
 		super(batchName, portalTestClassJob);
-
-		_testBatch = null;
 	}
 
 	protected ModulesJUnitBatchTestClassGroup(
 		String batchName, PortalTestClassJob portalTestClassJob,
 		JUnitTestBatch jUnitTestBatch) {
 
 		super(batchName, portalTestClassJob, jUnitTestBatch);
-
-		_testBatch = jUnitTestBatch;
 	}
 
 	@Override
@@ -92,10 +87,6 @@ protected List<JobProperty> getReleaseIncludesJobProperties() {
 
 	@Override
 	protected List<JobProperty> getRelevantExcludesJobProperties() {
-		if (_testBatch != null) {
-			return _getTestSelectorExcludesJobProperties();
-		}
-
 		Set<File> modifiedModuleDirsList = new HashSet<>();
 
 		try {
@@ -136,10 +127,6 @@ protected List<JobProperty> getRelevantExcludesJobProperties() {
 
 	@Override
 	protected List<JobProperty> getRelevantIncludesJobProperties() {
-		if (_testBatch != null) {
-			return _getTestSelectorIncludesJobProperties();
-		}
-
 		if (includeStableTestSuite && isStableTestSuiteBatch()) {
 			return super.getRelevantIncludesJobProperties();
 		}
@@ -400,18 +387,4 @@ private String _getSymbolicName(File bndBndFile) {
 		return bndBndProperties.getProperty("Bundle-SymbolicName");
 	}
 
-	private List<JobProperty> _getTestSelectorExcludesJobProperties() {
-		JUnitTestSelector jUnitTestSelector = _testBatch.getTestSelector();
-
-		return jUnitTestSelector.getExcludesJobProperties();
-	}
-
-	private List<JobProperty> _getTestSelectorIncludesJobProperties() {
-		JUnitTestSelector jUnitTestSelector = _testBatch.getTestSelector();
-
-		return jUnitTestSelector.getIncludesJobProperties();
-	}
-
-	private JUnitTestBatch _testBatch;
-
 }