Merge pull request #21088 from madurangasiriwardena/jacoco2

Instrument all the identity components
wso2 · Sep 12, 2024 · 58c06aa · 58c06aa
2 parents ad65006 + 5233720
commit 58c06aa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 48 deletions.
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -65,6 +65,14 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.aggregate</groupId>
+                    <artifactId>jetty-all</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.websocket</groupId>
+                    <artifactId>websocket-server</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
@@ -55,6 +55,12 @@
         <dependency>
             <groupId>org.wso2.carbon.automation</groupId>
             <artifactId>org.wso2.carbon.automation.test.utils</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-websocket</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.automationutils</groupId>

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml
@@ -35,6 +35,12 @@
          Change this to true if you want to generate coverage statistics
         -->
         <coverage>true</coverage>
+        <coverageClassesRelativeDirectories>
+            <coverageClassesRelativeDirectory>repository/deployment/server/webapps</coverageClassesRelativeDirectory>
+            <coverageClassesRelativeDirectory>repository/components/plugins</coverageClassesRelativeDirectory>
+            <coverageClassesRelativeDirectory>repository/components/dropins</coverageClassesRelativeDirectory>
+            <coverageClassesRelativeDirectory>lib/runtimes/cxf3</coverageClassesRelativeDirectory>
+        </coverageClassesRelativeDirectories>
         <!--
          Change this to true if you want to enable framework dashboard
         -->

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/tests-backend/src/test/resources/instrumentation.txt
@@ -3,51 +3,5 @@ org.wso2.carbon.sts*
 org.wso2.carbon.user.core*
 org.wso2.carbon.user.mgt*
 org.wso2.carbon.claim.mgt*
-org.wso2.carbon.identity.application.authentication.framework*
-org.wso2.carbon.identity.application.authenticator.basicauth*
-org.wso2.carbon.identity.application.authenticator.facebook*
-org.wso2.carbon.identity.application.authenticator.facebook.v2*
-org.wso2.carbon.identity.application.authenticator.iwa*
-org.wso2.carbon.identity.application.authenticator.oidc*
-org.wso2.carbon.identity.application.authenticator.oidc.ext*
-org.wso2.carbon.identity.application.authenticator.openid*
-org.wso2.carbon.identity.application.authenticator.openid.ext*
-org.wso2.carbon.identity.application.authenticator.passive.sts*
-org.wso2.carbon.identity.application.authenticator.requestpath.basicauth*
-org.wso2.carbon.identity.application.authenticator.requestpath.oauth*
-org.wso2.carbon.identity.application.authenticator.samlsso*
-org.wso2.carbon.identity.application.common*
-org.wso2.carbon.identity.application.mgt*
-org.wso2.carbon.identity.authentication*
-org.wso2.carbon.identity.authenticator.iwa*
-org.wso2.carbon.identity.authenticator.saml2.sso*
-org.wso2.carbon.identity.authenticator.saml2.sso.common*
-org.wso2.carbon.identity.authorization.core*
-org.wso2.carbon.identity.base*
-org.wso2.carbon.identity.core*
-org.wso2.carbon.identity.entitlement*
-org.wso2.carbon.identity.entitlement.common*
-org.wso2.carbon.identity.mgt*
-org.wso2.carbon.identity.oauth*
-org.wso2.carbon.identity.oauth.common*
-org.wso2.carbon.identity.provider*
-org.wso2.carbon.identity.provisioning*
-org.wso2.carbon.identity.provisioning.connector.google*
-org.wso2.carbon.identity.provisioning.connector.salesforce*
-org.wso2.carbon.identity.provisioning.connector.scim*
-org.wso2.carbon.identity.provisioning.connector.scim2*
-org.wso2.carbon.identity.relyingparty*
-org.wso2.carbon.identity.scim.common*
-org.wso2.carbon.identity.sso.saml*
-org.wso2.carbon.identity.sso.saml.common*
-org.wso2.carbon.identity.sts.mgt*
-org.wso2.carbon.identity.sts.passive*
-org.wso2.carbon.identity.sts.store*
-org.wso2.carbon.identity.thrift.authentication*
-org.wso2.carbon.identity.tools.saml.validator*
-org.wso2.carbon.identity.user.profile*
-org.wso2.carbon.identity.user.registration*
-org.wso2.carbon.identity.user.store.configuration*
-org.wso2.carbon.identity.user.store.configuration.deployer*
-org.wso2.carbon.identity.user.store.remote*
+org.wso2.carbon.identity*
 org.wso2.carbon.xkms.mgt*
diff --git a/pom.xml b/pom.xml
@@ -2557,7 +2557,7 @@
         <commons-lang.wso2.version>2.6.0.wso2v1</commons-lang.wso2.version>
 
         <!--  Test dependencies -->
-        <carbon.automation.version>4.4.3</carbon.automation.version>
+        <carbon.automation.version>4.4.11</carbon.automation.version>
         <carbon.automationutils.version>4.5.4</carbon.automationutils.version>
         <selenium.version>2.40.0</selenium.version>
         <testng.version>6.1.1</testng.version>