diff options
Diffstat (limited to 'vid-automation/src/main/java/vid/automation/test/utils')
7 files changed, 74 insertions, 6 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java b/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java index 07fd3754e..c98b2428a 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java @@ -1,7 +1,7 @@ package vid.automation.test.utils; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.springframework.http.*; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; diff --git a/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java b/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java index ef5625232..717e2a746 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java @@ -1,8 +1,8 @@ package vid.automation.test.utils; public class DB_CONFIG { - public static String url = String.format("jdbc:mariadb://%s:%d/vid_openecomp_epsdk", - System.getProperty("DB_HOST", System.getProperty("VID_HOST", "127.0.0.1" )), + public static String url = String.format("jdbc:mariadb://%s:%d/vid_portal", + System.getProperty("DB_HOST", System.getProperty("VID_HOST", "10.0.0.10" )), Integer.valueOf(System.getProperty("DB_PORT", "3306")) ); public static String username = "euser"; diff --git a/vid-automation/src/main/java/vid/automation/test/utils/ExtendedHamcrestMatcher.java b/vid-automation/src/main/java/vid/automation/test/utils/ExtendedHamcrestMatcher.java new file mode 100644 index 000000000..b1c713f1e --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/utils/ExtendedHamcrestMatcher.java @@ -0,0 +1,24 @@ +package vid.automation.test.utils; + +import org.hamcrest.Matcher; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.hamcrest.core.AllOf.allOf; +import static org.hamcrest.core.IsCollectionContaining.hasItem; + +public class ExtendedHamcrestMatcher { + + + //this method return matcher for has items that support collection as input (Instead of ...) + public static <T> Matcher<Iterable<T>> hasItemsFromCollection(Collection<T> items) { + List<Matcher<? super Iterable<T>>> all = new ArrayList<>(items.size()); + for (T element : items) { + all.add(hasItem(element)); + } + + return allOf(all); + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java b/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java index 655cc20a6..1f6cd032b 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java @@ -3,7 +3,7 @@ package vid.automation.test.utils; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.openecomp.sdc.ci.tests.utilities.FileHandling; +import org.onap.sdc.ci.tests.utilities.FileHandling; import vid.automation.test.infra.Input; import java.io.IOException; diff --git a/vid-automation/src/main/java/vid/automation/test/utils/RegExMatcher.java b/vid-automation/src/main/java/vid/automation/test/utils/RegExMatcher.java new file mode 100644 index 000000000..c540cf5ea --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/utils/RegExMatcher.java @@ -0,0 +1,29 @@ +package vid.automation.test.utils; + +import org.hamcrest.Description; +import org.hamcrest.TypeSafeMatcher; + +public class RegExMatcher extends TypeSafeMatcher<String> { + + private final String regEx; + + public RegExMatcher(String regEx) { + this.regEx = regEx; + } + + + @Override + public void describeTo(Description description) { + description.appendText("matches regEx="+regEx); + } + + + @Override + protected boolean matchesSafely(String item) { + return item.matches(regEx); + } + + public static RegExMatcher matchesRegEx(final String regEx) { + return new RegExMatcher(regEx); + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java b/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java index ae731dbc0..0b2978dda 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java @@ -6,13 +6,13 @@ public class TestConfigurationHelper { private TestConfigurationHelper(){} - public static org.openecomp.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + public static org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { try { String envUrl = System.getProperty("ENV_URL"); boolean isCustomLogin = Boolean.parseBoolean(System.getProperty("CUSTOM_LOGIN")); - org.openecomp.sdc.ci.tests.datatypes.Configuration configuration = new org.openecomp.sdc.ci.tests.datatypes.Configuration(envUrl, isCustomLogin); + org.onap.sdc.ci.tests.datatypes.Configuration configuration = new org.onap.sdc.ci.tests.datatypes.Configuration(envUrl, isCustomLogin); String geckoDriverPath = System.getProperty("GECKO_PATH"); if(geckoDriverPath == null){ diff --git a/vid-automation/src/main/java/vid/automation/test/utils/TestHelper.java b/vid-automation/src/main/java/vid/automation/test/utils/TestHelper.java new file mode 100644 index 000000000..83876fa27 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/utils/TestHelper.java @@ -0,0 +1,15 @@ +package vid.automation.test.utils; + +import org.springframework.web.client.RestTemplate; + +import java.net.URI; + +public class TestHelper { + + public static String GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS = "getServiceModelsByDistributionStatus"; + public static String GET_TENANTS = "getTenants"; + + public static void resetAaiCache(String cacheName, RestTemplate restTemplate, URI vidUri) { + restTemplate.delete(vidUri + "/aai_reset_cache/"+cacheName); + } +} |