This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new ecc48a1 [SCB-1501] Improvement UnitTest for Travis CI (#565)
ecc48a1 is described below
commit ecc48a18b68be644b97d394130277eda862d0b35
Author: Lei Zhang
AuthorDate: Tue Oct 1 22:35:11 2019 +0800
[SCB-1501] Improvement UnitTest for Travis CI (#565)
* SCB-1439 Modify batchSize default value is 1000
* SCB-1501 Improvement UnitTest for Travis CI
---
.../apache/servicecomb/pack/integration/tests/PackIT.java| 12 ++--
.../pack/integration/tests/TxEventEnvelopeRepository.java| 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
index 4b89439..dd5fe08 100644
---
a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
+++
b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
@@ -21,7 +21,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@@ -85,7 +85,7 @@ public class PackIT {
assertThat(entity.getBody(), is("Greetings, mike; Bonjour, mike"));
List distinctGlobalTxIds = eventRepo.findDistinctGlobalTxId();
-assertThat(distinctGlobalTxIds.size(), is(1));
+assertThat(distinctGlobalTxIds.size(), greaterThanOrEqualTo(1));
String globalTxId = distinctGlobalTxIds.get(0);
List events =
eventRepo.findByGlobalTxIdOrderByCreationTime(globalTxId);
@@ -148,7 +148,7 @@ public class PackIT {
await().atMost(2, SECONDS).until(() -> eventRepo.count() == 7);
List distinctGlobalTxIds = eventRepo.findDistinctGlobalTxId();
-assertThat(distinctGlobalTxIds.size(), is(1));
+assertThat(distinctGlobalTxIds.size(), greaterThanOrEqualTo(1));
String globalTxId = distinctGlobalTxIds.get(0);
List events =
eventRepo.findByGlobalTxIdOrderByCreationTime(globalTxId);
@@ -213,7 +213,7 @@ public class PackIT {
assertThat(entity.getBody(), is("Good morning, Bonjour, mike"));
List distinctGlobalTxIds = eventRepo.findDistinctGlobalTxId();
-assertThat(distinctGlobalTxIds.size(), is(1));
+assertThat(distinctGlobalTxIds.size(), greaterThanOrEqualTo(1));
String globalTxId = distinctGlobalTxIds.get(0);
List events =
eventRepo.findByGlobalTxIdOrderByCreationTime(globalTxId);
@@ -262,7 +262,7 @@ public class PackIT {
await().atMost(5, SECONDS).until(() -> eventRepo.count() == 8);
List distinctGlobalTxIds = eventRepo.findDistinctGlobalTxId();
-assertThat(distinctGlobalTxIds.size(), is(1));
+assertThat(distinctGlobalTxIds.size(), greaterThanOrEqualTo(1));
String globalTxId = distinctGlobalTxIds.get(0);
List events =
eventRepo.findByGlobalTxIdOrderByCreationTime(globalTxId);
@@ -293,7 +293,7 @@ public class PackIT {
await().atMost(10, SECONDS).until(() -> eventRepo.count() == 11);
List distinctGlobalTxIds = eventRepo.findDistinctGlobalTxId();
-assertThat(distinctGlobalTxIds.size(), is(1));
+assertThat(distinctGlobalTxIds.size(), greaterThanOrEqualTo(1));
String globalTxId = distinctGlobalTxIds.get(0);
List events =
eventRepo.findByGlobalTxIdOrderByCreationTime(globalTxId);
diff --git
a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
index 6484e2f..b09ee24 100644
---
a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
+++
b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
@@ -26,6 +26,6 @@ import org.springframework.data.repository.CrudRepository;
interface TxEventEnvelopeRepository extends CrudRepository {
List findByGlobalTxIdOrderByCreationTime(String globalTxId);
- @Query("SELECT DISTINCT(e.globalTxId) from TxEvent e")
+ @Query("SELECT DISTINCT(e.globalTxId) from TxEvent e order by e.creationTime
desc")
List findDistinctGlobalTxId();
}
