upgrade some 3rd parties dependencies

Issue-ID: VID-705
Change-Id: Idd72448ed1b2f033005ff8031856efe06f67cdf4
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>

2 files changed, 25 insertions, 21 deletions

diff --git a/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java b/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java
index 03378b615..962a1de53 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java
@@ -1,6 +1,13 @@
 package vid.automation.test.test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static vid.automation.test.Constants.TestEnvironments.REFRESH_BUTTON;
+
 import com.google.common.collect.ImmutableMap;
+import java.util.List;
+import java.util.Map;
 import org.junit.Assert;
 import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.openqa.selenium.WebElement;
@@ -9,7 +16,13 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import vid.automation.test.Constants;
-import vid.automation.test.infra.*;
+import vid.automation.test.infra.Click;
+import vid.automation.test.infra.Exists;
+import vid.automation.test.infra.Features;
+import vid.automation.test.infra.Get;
+import vid.automation.test.infra.Input;
+import vid.automation.test.infra.SelectOption;
+import vid.automation.test.infra.Wait;
 import vid.automation.test.model.Environment;
 import vid.automation.test.sections.SideMenu;
 import vid.automation.test.sections.TestEnvironmentPage;
@@ -17,12 +30,6 @@ import vid.automation.test.sections.VidBasePage;
 import vid.automation.test.services.SimulatorApi;
 import vid.automation.test.utils.ReadFile;
 
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-import static vid.automation.test.Constants.TestEnvironments.REFRESH_BUTTON;
-
 
 /*
 
@@ -349,7 +356,7 @@ public class EnvironmentsTest extends VidBaseTestCase {
     }
 
     @Test
-    public void testApplicationEnvironmentActivationBadManifestStructure() throws Exception {
+    public void testApplicationEnvironmentActivationBadManifestStructure() {
         testApplicationEnvironmentActivationBadManifestStructure("bad_manifest_structure.json", "Manifest structure is wrong");
         testApplicationEnvironmentActivationBadManifestStructure("manifest_with_wrong_recovery_action.json",
                 "Wrong value for RecoveryAction in manifest. Allowed options are: abort, retry, skip. Wrong value is: leave");
diff --git a/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java b/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java
index 2bb97aa2e..b8f90c22d 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java
@@ -1,30 +1,27 @@
 package vid.automation.test.test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset;
 import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
 import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet;
-import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.openqa.selenium.remote.RemoteWebElement;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import vid.automation.test.infra.Click;
 import vid.automation.test.infra.Get;
-import vid.automation.test.infra.Wait;
 import vid.automation.test.sections.VidBasePage;
 import vid.automation.test.services.SimulatorApi;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.testng.Assert.assertTrue;
-import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET;
-
 public class HealthStatusTest extends VidBaseTestCase {
 
     private VidBasePage vidBasePage = new VidBasePage();
@@ -45,7 +42,7 @@ public class HealthStatusTest extends VidBaseTestCase {
     public void testAaiHealthStatus(Collection<BasePreset> presets, String cssName, String description, int httpCode) throws IOException {
         SimulatorApi.registerExpectationFromPresets(presets, CLEAR_THEN_SET);
         refreshStatus();
-        assertTrue(Wait.waitByClassAndTextXpathOnly(cssName, "AAI", 10)); //instead of ultimate wait
+        GeneralUIUtils.ultimateWait(); //instead of assertTrue(Wait.waitByClassAndTextXpathOnly(cssName, "AAI", 10))
         RemoteWebElement componentName = (RemoteWebElement)Get.byTestId("component-name-AAI");
         assertThat("Wrong component name", componentName.getText(), equalTo("AAI"));
         assertThat("Wrong css for component name", componentName.getAttribute("class"), containsString(cssName));