1 files changed, 9 insertions, 6 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourceWorkspaceTopBarComponent.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourceWorkspaceTopBarComponent.java
index 9af7e73fc8..1b92b5ba17 100644
--- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourceWorkspaceTopBarComponent.java
+++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourceWorkspaceTopBarComponent.java
@@ -60,16 +60,19 @@ public class ResourceWorkspaceTopBarComponent extends AbstractPageObject {
         waitToBeClickable(XpathSelector.CREATE_BTN.getXpath()).click();
     }
 
-    public void clickOnCertify() {
+    public ComponentCertificationModal clickOnCertify() {
         waitToBeClickable(XpathSelector.CERTIFY_BTN.getXpath()).click();
+        return new ComponentCertificationModal(webDriver);
     }
 
-    public void certifyComponent() {
-        clickOnCertify();
-        final ComponentCertificationModal componentCertificationModal = new ComponentCertificationModal(webDriver);
+    /**
+     * Certify the resource and wait for success notification.
+     */
+    public void certifyResource() {
+        final ComponentCertificationModal componentCertificationModal = clickOnCertify();
         componentCertificationModal.isLoaded();
-        componentCertificationModal.fillCommentWithDefaultMessage();
-        componentCertificationModal.submit();
+        componentCertificationModal.fillComment("Certifying for the UI Integration Test");
+        componentCertificationModal.clickOnOkButton();
         notificationComponent.waitForNotification(NotificationType.SUCCESS, 20);
     }