From 8da74eb32386aa75b37ca7758339ce6fa0766e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Pro=C3=9F?= Date: Wed, 2 Apr 2025 16:31:45 +0200 Subject: [PATCH 1/2] Prevent passing of test suite when all core conformance tests are skipped --- .../src/main/resources/com/occamlab/te/earl_html_report.xsl | 3 +++ .../com/occamlab/te/spi/executors/testng/EarlReporter.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl index e40c6d41..542e7bc2 100644 --- a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl +++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl @@ -219,6 +219,9 @@ + + + diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java index 1e696fa9..5e8b56b2 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java @@ -170,6 +170,11 @@ void processSuiteResults(Model model, Map results) { if (nFailed > 0) { areCoreConformanceClassesPassed = false; } + // prevent passing of basic conformance class with all tests skipped + // see https://github.com/opengeospatial/teamengine/issues/636 + else if (nFailed == 0 && nPassed == 0 && nSkipped > 0) { + areCoreConformanceClassesPassed = false; + } } processTestResults(model, testContext.getFailedTests()); processTestResults(model, testContext.getSkippedTests()); From b399dca47fcafc162e7467ffb4dc4a498e878c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Pro=C3=9F?= Date: Fri, 4 Apr 2025 09:44:45 +0200 Subject: [PATCH 2/2] Prevent passing of CTL test suite when all core conformance tests are skipped --- .../src/main/java/com/occamlab/te/CtlEarlReporter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java index d9127487..acbd3de2 100644 --- a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java +++ b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java @@ -252,6 +252,11 @@ private void getSubtestResult(Model model, NodeList testcallList, NodeList logLi if (cFailCount > 0 || cInheritedFailureCount > 0) { areCoreConformanceClassesPassed = false; } + // prevent passing of basic conformance class with all tests skipped + // see https://github.com/opengeospatial/teamengine/issues/636 + else if (cFailCount == 0 && cInheritedFailureCount == 0 && cPassCount == 0 && cSkipCount > 0) { + areCoreConformanceClassesPassed = false; + } } this.totalPassCount += cPassCount; this.totalFailCount += cFailCount;