This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new 38dd795 UNOMI-225 ElasticSearch 7 support Increase timeout values in
integration tests as some continuous integrations might be slow/overloaded.
38dd795 is described below
commit 38dd795f80d46eae686bedf23ef5fe4821e87858
Author: Serge Huber <[email protected]>
AuthorDate: Tue Nov 26 18:21:11 2019 +0100
UNOMI-225 ElasticSearch 7 support
Increase timeout values in integration tests as some continuous
integrations might be slow/overloaded.
Signed-off-by: Serge Huber <[email protected]>
---
api/pom.xml | 9 +++++++++
itests/src/test/java/org/apache/unomi/itests/BasicIT.java | 8 ++++----
.../test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java | 4 ++--
.../src/test/java/org/apache/unomi/itests/ModifyConsentIT.java | 4 ++--
itests/src/test/java/org/apache/unomi/itests/PatchIT.java | 7 +++----
.../src/test/java/org/apache/unomi/itests/ProfileExportIT.java | 5 ++---
.../test/java/org/apache/unomi/itests/ProfileImportActorsIT.java | 4 ++--
.../test/java/org/apache/unomi/itests/ProfileImportBasicIT.java | 4 ++--
.../java/org/apache/unomi/itests/ProfileImportRankingIT.java | 4 ++--
.../java/org/apache/unomi/itests/ProfileImportSurfersIT.java | 4 ++--
.../src/test/java/org/apache/unomi/itests/ProfileServiceIT.java | 2 +-
.../java/org/apache/unomi/itests/PropertiesUpdateActionIT.java | 4 ++--
itests/src/test/java/org/apache/unomi/itests/SegmentIT.java | 2 +-
13 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 3791122..4abd7b8 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,6 +30,15 @@
<description>Main API of the Apache Unomi Context server</description>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<reporting>
<plugins>
<plugin>
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 14c524d..ab6a914 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BasicIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BasicIT.java
@@ -87,13 +87,13 @@ public class BasicIT extends BaseIT {
private static final String EMAIL_VISITOR_1 = "[email protected]";
private static final String EMAIL_VISITOR_2 = "[email protected]";
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected RulesService rulesService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected DefinitionsService definitionsService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected BundleWatcher bundleWatcher;
@Before
diff --git
a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
index b233ed6..588012e 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
@@ -48,9 +48,9 @@ public class ConditionEvaluatorIT extends BaseIT {
protected Item item;
protected Date lastVisit;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected PersistenceService persistenceService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
private DefinitionsService definitionsService;
protected boolean eval(Condition c) {
diff --git a/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java
b/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java
index d84a97f..8313115 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java
@@ -48,9 +48,9 @@ public class ModifyConsentIT extends BaseIT {
private final static String PROFILE_TEST_ID = "profile-consent";
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected EventService eventService;
@Before
diff --git a/itests/src/test/java/org/apache/unomi/itests/PatchIT.java
b/itests/src/test/java/org/apache/unomi/itests/PatchIT.java
index 412395e..0ba26c5 100644
--- a/itests/src/test/java/org/apache/unomi/itests/PatchIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/PatchIT.java
@@ -36,7 +36,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
-import java.io.File;
import java.io.IOException;
@RunWith(PaxExam.class)
@@ -45,15 +44,15 @@ public class PatchIT extends BaseIT {
private Logger logger = LoggerFactory.getLogger(PatchIT.class);
@Inject
- @Filter(timeout = 60000)
+ @Filter(timeout = 600000)
protected PatchService patchService;
@Inject
- @Filter(timeout = 60000)
+ @Filter(timeout = 600000)
protected ProfileService profileService;
@Inject
- @Filter(timeout = 60000)
+ @Filter(timeout = 600000)
protected DefinitionsService definitionsService;
@Inject
diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java
b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java
index 1fca3bf..df15438 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.unomi.itests;
-import org.apache.unomi.api.PartialList;
import org.apache.unomi.api.Profile;
import org.apache.unomi.api.services.ProfileService;
import org.apache.unomi.router.api.ExportConfiguration;
@@ -44,9 +43,9 @@ import java.util.*;
public class ProfileExportIT extends BaseIT {
private Logger logger = LoggerFactory.getLogger(ProfileExportIT.class);
- @Inject @Filter(value="(configDiscriminator=EXPORT)", timeout = 60000)
+ @Inject @Filter(value="(configDiscriminator=EXPORT)", timeout = 600000)
protected ImportExportConfigurationService<ExportConfiguration>
exportConfigurationService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
@Test
diff --git
a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java
b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java
index 86b31fc..f95cca5 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java
@@ -43,9 +43,9 @@ import java.util.*;
@ExamReactorStrategy(PerSuite.class)
public class ProfileImportActorsIT extends BaseIT {
- @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 60000)
+ @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 600000)
protected ImportExportConfigurationService<ImportConfiguration>
importConfigurationService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
@Test
diff --git
a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
index 3503284..e1b273d 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
@@ -49,9 +49,9 @@ import java.util.Map;
public class ProfileImportBasicIT extends BaseIT {
private Logger logger =
LoggerFactory.getLogger(ProfileImportBasicIT.class);
- @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 60000)
+ @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 600000)
protected ImportExportConfigurationService<ImportConfiguration>
importConfigurationService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
@Test
diff --git
a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java
b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java
index 78924d7..23c2e72 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java
@@ -46,9 +46,9 @@ import java.util.Map;
@ExamReactorStrategy(PerSuite.class)
public class ProfileImportRankingIT extends BaseIT {
- @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 60000)
+ @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 600000)
protected ImportExportConfigurationService<ImportConfiguration>
importConfigurationService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
@Test
diff --git
a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java
b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java
index 58b91dd..a7de91e 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java
@@ -51,9 +51,9 @@ import java.util.Map;
public class ProfileImportSurfersIT extends BaseIT {
private Logger logger =
LoggerFactory.getLogger(ProfileImportSurfersIT.class);
- @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 60000)
+ @Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 600000)
protected ImportExportConfigurationService<ImportConfiguration>
importConfigurationService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
@Test
diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java
b/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java
index 514a766..2c996b7 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java
@@ -39,7 +39,7 @@ public class ProfileServiceIT extends BaseIT {
private final static String TEST_PROFILE_ID = "test-profile-id";
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
@Test
diff --git
a/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java
b/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java
index 3c894e3..1e64b91 100644
--- a/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java
@@ -51,9 +51,9 @@ public class PropertiesUpdateActionIT extends BaseIT {
private final static String PROFILE_TARGET_TEST_ID =
"profile-target-event";
private final static String PROFILE_TEST_ID = "profile-to-update-by-event";
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected ProfileService profileService;
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected EventService eventService;
@Before
diff --git a/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
b/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
index 2179272..ce8bd17 100644
--- a/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java
@@ -37,7 +37,7 @@ import java.util.List;
public class SegmentIT extends BaseIT {
private final static Logger LOGGER =
LoggerFactory.getLogger(SegmentIT.class);
- @Inject @Filter(timeout = 60000)
+ @Inject @Filter(timeout = 600000)
protected SegmentService segmentService;
@Test
