This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch UNOMI-598-validate-events-with-scope
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to
refs/heads/UNOMI-598-validate-events-with-scope by this push:
new f525cf8a0 refactor create scope
f525cf8a0 is described below
commit f525cf8a0c663d18fe4ef2930c1e62a93cbf1656
Author: jsinovassin <[email protected]>
AuthorDate: Wed Jun 29 11:07:29 2022 +0200
refactor create scope
---
itests/src/test/java/org/apache/unomi/itests/BasicIT.java | 12 +++---------
.../test/java/org/apache/unomi/itests/ContextServletIT.java | 8 +-------
.../java/org/apache/unomi/itests/InputValidationIT.java | 13 +++++--------
.../src/test/java/org/apache/unomi/itests/JSONSchemaIT.java | 11 ++++-------
itests/src/test/java/org/apache/unomi/itests/TestUtils.java | 13 +++++++++++++
5 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/itests/src/test/java/org/apache/unomi/itests/BasicIT.java
b/itests/src/test/java/org/apache/unomi/itests/BasicIT.java
index 6bbde1f95..819ce4495 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BasicIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BasicIT.java
@@ -102,22 +102,16 @@ public class BasicIT extends BaseIT {
@Before
public void setUp() throws InterruptedException {
- Scope scope = new Scope();
- scope.setItemId(TEST_SCOPE);
- Metadata metadata = new Metadata();
- metadata.setName("Test scope");
- metadata.setId(TEST_SCOPE);
- scope.setMetadata(metadata);
- scopeService.save(scope);
- keepTrying("Scope test-scope not found in the required time", () ->
scopeService.getScope(TEST_SCOPE),
+ TestUtils.createScope(TEST_SCOPE, "Test scope", scopeService);
+ keepTrying("Scope "+ TEST_SCOPE +" not found in the required time", ()
-> scopeService.getScope(TEST_SCOPE),
Objects::nonNull, DEFAULT_TRYING_TIMEOUT,
DEFAULT_TRYING_TRIES);
}
+
@After
public void tearDown() {
scopeService.delete(TEST_SCOPE);
}
-
@Test
public void testContextJS() throws IOException {
LOGGER.info("Start test testContextJS");
diff --git a/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
b/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
index 4ee8aa9d2..830e995e7 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
@@ -153,13 +153,7 @@ public class ContextServletIT extends BaseIT {
schemaIds.contains("https://unomi.apache.org/schemas/json/events/testEventType/1-0-0";)),
DEFAULT_TRYING_TIMEOUT, DEFAULT_TRYING_TRIES);
- Scope scope = new Scope();
- scope.setItemId(TEST_SCOPE);
- Metadata metadata = new Metadata();
- metadata.setName("Test scope");
- metadata.setId(TEST_SCOPE);
- scope.setMetadata(metadata);
- scopeService.save(scope);
+ TestUtils.createScope(TEST_SCOPE, "Test scope", scopeService);
keepTrying("Scope test-scope not found in the required time", () ->
scopeService.getScope(TEST_SCOPE),
Objects::nonNull, DEFAULT_TRYING_TIMEOUT,
DEFAULT_TRYING_TRIES);
}
diff --git
a/itests/src/test/java/org/apache/unomi/itests/InputValidationIT.java
b/itests/src/test/java/org/apache/unomi/itests/InputValidationIT.java
index 5bda5bc09..3ca188796 100644
--- a/itests/src/test/java/org/apache/unomi/itests/InputValidationIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/InputValidationIT.java
@@ -59,6 +59,7 @@ public class InputValidationIT extends BaseIT {
private final static String ERROR_MESSAGE_REQUEST_SIZE_LIMIT_EXCEEDED =
"Request rejected by the server because: Request size exceed the limit";
private final static String ERROR_MESSAGE_INVALID_DATA_RECEIVED = "Request
rejected by the server because: Invalid received data";
+ public static final String DUMMY_SCOPE = "dummy_scope";
@Inject
@Filter(timeout = 600000)
@@ -69,14 +70,10 @@ public class InputValidationIT extends BaseIT {
protected ScopeService scopeService;
@Before
- public void setUp() {
- Scope scope = new Scope();
- scope.setItemId("dummy_scope");
- Metadata metadata = new Metadata();
- metadata.setName("Dummy scope");
- metadata.setId("dummy_scope");
- scope.setMetadata(metadata);
- scopeService.save(scope);
+ public void setUp() throws InterruptedException {
+ TestUtils.createScope(DUMMY_SCOPE, "Dummy scope", scopeService);
+ keepTrying("Scope "+ DUMMY_SCOPE +" not found in the required time",
() -> scopeService.getScope(DUMMY_SCOPE),
+ Objects::nonNull, DEFAULT_TRYING_TIMEOUT,
DEFAULT_TRYING_TRIES);
}
@After
diff --git a/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
b/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
index 8bf84165f..75f7d1310 100644
--- a/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
@@ -59,6 +59,7 @@ public class JSONSchemaIT extends BaseIT {
private final static String JSONSCHEMA_URL = "/cxs/jsonSchema";
private static final int DEFAULT_TRYING_TIMEOUT = 2000;
private static final int DEFAULT_TRYING_TRIES = 30;
+ public static final String DUMMY_SCOPE = "dummy_scope";
@Inject
@Filter(timeout = 600000)
@@ -73,13 +74,9 @@ public class JSONSchemaIT extends BaseIT {
keepTrying("Couldn't find json schema endpoint", () ->
get(JSONSCHEMA_URL, List.class), Objects::nonNull, DEFAULT_TRYING_TIMEOUT,
DEFAULT_TRYING_TRIES);
- Scope scope = new Scope();
- scope.setItemId("dummy_scope");
- Metadata metadata = new Metadata();
- metadata.setName("Dummy scope");
- metadata.setId("dummy_scope");
- scope.setMetadata(metadata);
- scopeService.save(scope);
+ TestUtils.createScope(DUMMY_SCOPE, "Dummy scope", scopeService);
+ keepTrying("Scope "+ DUMMY_SCOPE +" not found in the required time",
() -> scopeService.getScope(DUMMY_SCOPE),
+ Objects::nonNull, DEFAULT_TRYING_TIMEOUT,
DEFAULT_TRYING_TRIES);
}
@After
diff --git a/itests/src/test/java/org/apache/unomi/itests/TestUtils.java
b/itests/src/test/java/org/apache/unomi/itests/TestUtils.java
index 2767a3837..c52d92024 100644
--- a/itests/src/test/java/org/apache/unomi/itests/TestUtils.java
+++ b/itests/src/test/java/org/apache/unomi/itests/TestUtils.java
@@ -37,10 +37,13 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.apache.unomi.api.ContextResponse;
import org.apache.unomi.api.Event;
+import org.apache.unomi.api.Metadata;
import org.apache.unomi.api.Profile;
+import org.apache.unomi.api.Scope;
import org.apache.unomi.api.Session;
import org.apache.unomi.api.conditions.Condition;
import org.apache.unomi.api.services.DefinitionsService;
+import org.apache.unomi.api.services.ScopeService;
import org.apache.unomi.itests.tools.httpclient.HttpClientThatWaitsForUnomi;
import org.apache.unomi.persistence.spi.CustomObjectMapper;
import org.apache.unomi.persistence.spi.PersistenceService;
@@ -131,6 +134,16 @@ public class TestUtils {
return persistenceService.removeByQuery(condition,
Session.class);
}
+ public static void createScope(String scopeId, String scopeName,
ScopeService scopeService) {
+ Scope scope = new Scope();
+ scope.setItemId(scopeId);
+ Metadata metadata = new Metadata();
+ metadata.setName(scopeName);
+ metadata.setId(scopeId);
+ scope.setMetadata(metadata);
+ scopeService.save(scope);
+ }
+
public static class RequestResponse {
private ContextResponse contextResponse;
private String cookieHeaderValue;
