Skip to content

Commit

Permalink
Merge pull request #130 from jbee/FISH-659-fault-tolerance-3.0
Browse files Browse the repository at this point in the history
FISH-659 Micro Profile Fault tolerance 3.0
  • Loading branch information
MattGill98 authored Dec 17, 2020
2 parents b1594f0 + dd3d2de commit 32c2438
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 5 deletions.
18 changes: 13 additions & 5 deletions MicroProfile-Fault-Tolerance/tck-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,13 @@

<properties>
<!-- Defaults for API and TCK dependencies - latest version -->
<microprofile.fault-tolerance.version>2.1</microprofile.fault-tolerance.version>
<microprofile.fault-tolerance.tck.version>2.1</microprofile.fault-tolerance.tck.version>
<microprofile.fault-tolerance.tck.suite>tck-suite2.1-stable.xml</microprofile.fault-tolerance.tck.suite>
<microprofile.fault-tolerance.version>3.0-RC2</microprofile.fault-tolerance.version>
<microprofile.fault-tolerance.tck.version>3.0-RC2</microprofile.fault-tolerance.tck.version>
<microprofile.metrics.version>3.0-RC4</microprofile.metrics.version>
<microprofile.fault-tolerance.tck.suite>tck-suite3.0-stable.xml</microprofile.fault-tolerance.tck.suite>

<!-- Test Dependencies -->
<testng.version>6.9.9</testng.version>

<skipTests>true</skipTests>
</properties>

<dependencies>
Expand All @@ -79,6 +78,12 @@
<version>${microprofile.fault-tolerance.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
<version>${microprofile.metrics.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand All @@ -101,6 +106,9 @@
<suiteXmlFiles>
<suiteXmlFile>${basedir}/src/test/resources/${microprofile.fault-tolerance.tck.suite}</suiteXmlFile>
</suiteXmlFiles>
<systemPropertyVariables>
<org.eclipse.microprofile.fault.tolerance.tck.timeout.multiplier>2.0</org.eclipse.microprofile.fault.tolerance.tck.timeout.multiplier>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >

<suite name="microprofile-FT-TCK" verbose="2" configfailurepolicy="continue" >

<test name="microprofile-FT 3.0 TCK">
<packages>
<package name="org.eclipse.microprofile.fault.tolerance.tck.*" />
</packages>

<!-- excludes -->
<classes>
<!-- Unstable: Fail in fully TCK run but pass when run individually -->
<class name="org.eclipse.microprofile.fault.tolerance.tck.CircuitBreakerBulkheadTest">
<methods><exclude name="testCircuitBreakerAroundBulkheadSync"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.bulkhead.BulkheadSynchRetryTest">
<methods><exclude name="testRetryTestExceptionMethod"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.bulkhead.BulkheadSynchTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.metrics.BulkheadMetricTest">
<methods>
<exclude name="bulkheadMetricHistogramTest"></exclude>
<exclude name="bulkheadMetricRejectionTest"></exclude>
<exclude name="bulkheadMetricTest"></exclude>
</methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.bulkhead.BulkheadSynchConfigTest">
<methods><exclude name="testBulkheadClassSemaphore3"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.config.BulkheadConfigTest">
<methods><exclude name="testConfigValue"></exclude></methods>
</class>
<!--
-->

<!-- exception is thrown but wrapped, added JUnit tests instead -->
<class name="org.eclipse.microprofile.fault.tolerance.tck.fallbackmethod.FallbackMethodWildcardNegativeTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.fallbackmethod.FallbackMethodOutOfPackageTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.fallbackmethod.FallbackMethodSuperclassPrivateTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.fallbackmethod.FallbackMethodSubclassTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.illegalConfig.IncompatibleFallbackMethodTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.illegalConfig.IncompatibleFallbackMethodWithArgsTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.illegalConfig.IncompatibleFallbackPolicies">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.illegalConfig.IncompatibleFallbackTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidAsynchronousClassTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidAsynchronousMethodTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidBulkheadAsynchQueueTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidBulkheadValueTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerDelayTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerFailureRatioPosTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerFailureRatioNegTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerFailureReqVol0Test">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerFailureReqVolNegTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerFailureSuccessNegTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidCircuitBreakerFailureSuccess0Test">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidRetryDelayDurationTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidRetryDelayTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidRetryJitterTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidRetryMaxRetriesTest">
<methods><exclude name=".*"></exclude></methods>
</class>
<class name="org.eclipse.microprofile.fault.tolerance.tck.invalidParameters.InvalidTimeoutValueTest">
<methods><exclude name=".*"></exclude></methods>
</class>
</classes>
</test>

</suite>

0 comments on commit 32c2438

Please sign in to comment.