Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bugfix requireVersion using assumeTrue
  • Loading branch information
michele committed Aug 8, 2019
commit 7b8eae6314b829d2c88d2739e7058360fa5f7c45
53 changes: 14 additions & 39 deletions src/test/java/com/arangodb/ArangoDatabaseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;

/**
* @author Mark Vollmary
Expand Down Expand Up @@ -1409,9 +1410,7 @@ public void transactionPojoReturn() {

@Test
public void beginStreamTransaction() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
StreamTransactionEntity tx = db.beginStreamTransaction(null);
assertThat(tx.getId(), is(notNullValue()));
assertThat(tx.getStatus(), is(StreamTransactionEntity.StreamTransactionStatus.running));
Expand All @@ -1420,17 +1419,13 @@ public void beginStreamTransaction() {

@Test(expected = ArangoDBException.class)
public void beginStreamTransactionWithNonExistingCollectionsShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.beginStreamTransaction(new StreamTransactionOptions().writeCollections("notExistingCollection"));
}

@Test
public void abortStreamTransaction() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
StreamTransactionEntity begunTx = db.beginStreamTransaction(null);
StreamTransactionEntity abortedTx = db.abortStreamTransaction(begunTx.getId());
assertThat(abortedTx.getId(), is(notNullValue()));
Expand All @@ -1440,35 +1435,27 @@ public void abortStreamTransaction() {

@Test(expected = ArangoDBException.class)
public void abortStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.abortStreamTransaction("000000");
}

@Test(expected = ArangoDBException.class)
public void abortStreamTransactionWithInvalidTransactionIdShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.abortStreamTransaction("invalidTransactionId");
}

@Test(expected = ArangoDBException.class)
public void abortCommittedStreamTransactionShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
db.commitStreamTransaction(createdTx.getId());
db.abortStreamTransaction(createdTx.getId());
}

@Test
public void getStreamTransaction() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
StreamTransactionEntity gotTx = db.getStreamTransaction(createdTx.getId());
assertThat(gotTx.getId(), is(notNullValue()));
Expand All @@ -1479,25 +1466,19 @@ public void getStreamTransaction() {

@Test(expected = ArangoDBException.class)
public void getStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.getStreamTransaction("000000");
}

@Test(expected = ArangoDBException.class)
public void getStreamTransactionWithInvalidTransactionIdShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.getStreamTransaction("invalidTransactionId");
}

@Test
public void commitStreamTransaction() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
StreamTransactionEntity committedTx = db.commitStreamTransaction(createdTx.getId());
assertThat(committedTx.getId(), is(notNullValue()));
Expand All @@ -1507,25 +1488,19 @@ public void commitStreamTransaction() {

@Test(expected = ArangoDBException.class)
public void commitStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.commitStreamTransaction("000000");
}

@Test(expected = ArangoDBException.class)
public void commitStreamTransactionWithInvalidTransactionIdShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
db.commitStreamTransaction("invalidTransactionId");
}

@Test(expected = ArangoDBException.class)
public void commitAbortedStreamTransactionShouldThrow() {
if (!requireVersion(3, 5)) {
return;
}
assumeTrue(requireVersion(3, 5));
StreamTransactionEntity createdTx = db.beginStreamTransaction(null);
db.abortStreamTransaction(createdTx.getId());
db.commitStreamTransaction(createdTx.getId());
Expand Down