Skip to content

Commit

Permalink
Release 2.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@vttn
vttn committed Jul 25, 2020
1 parent 5efc582 commit a1179a0
Show file tree
Hide file tree
Showing 7 changed files with 128 additions and 56 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>com.wallee</groupId>
<artifactId>wallee-java-sdk</artifactId>
<version>2.2.2</version>
<version>2.2.3</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -33,7 +33,7 @@ Add this dependency to your project's POM:
Add this dependency to your project's build file:

```groovy
compile "com.wallee:wallee-java-sdk:2.2.2"
compile "com.wallee:wallee-java-sdk:2.2.3"
```

### Others
Expand All @@ -46,7 +46,7 @@ mvn clean package

Then manually install the following JARs:

* `target/wallee-java-sdk-2.2.2.jar`
* `target/wallee-java-sdk-2.2.3.jar`
* `target/lib/*.jar`

## Usage
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'idea'
apply plugin: 'eclipse'

group = 'com.wallee'
version = '2.2.2'
version = '2.2.3'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "com.wallee",
name := "wallee-java-sdk",
version := "2.2.2",
version := "2.2.3",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>wallee-java-sdk</artifactId>
<packaging>jar</packaging>
<name>wallee-java-sdk</name>
<version>2.2.2</version>
<version>2.2.3</version>
<url>https://www.wallee.com</url>
<description>The SDK for simplifying the integration with wallee API.</description>
<scm>
Expand Down
66 changes: 42 additions & 24 deletions src/test/java/com/wallee/sdk/test/RefundServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,40 +153,58 @@ public void readTest() {
public void refundTest() {
try {
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
// wait for transaction to be authorized
for (int i = 1; i <= 5; i++) {
if (
transaction.getState() == TransactionState.FULFILL ||
transaction.getState() == TransactionState.FAILED
) {
if (transaction.getState() == TransactionState.AUTHORIZED) {
break;
}
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());

try {
Thread.sleep(i * 30);
Thread.sleep(i * 15000);
} catch (InterruptedException e) {
System.err.println(e.getMessage());
}
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
}

if (transaction.getState() == TransactionState.FULFILL) {
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
Assert.assertEquals(
"Transaction completion successful",
transactionCompletion.getState(),
TransactionCompletionState.SUCCESSFUL
);

transaction = this.apiClient.getTransactionService().read(transaction.getLinkedSpaceId(), transactionCompletion.getLinkedTransaction());
Refund refund = this.apiClient.getRefundService().refund(this.spaceId, getRefundPayload(transaction));

Assert.assertEquals(
"Refund successful",
refund.getState(),
RefundState.SUCCESSFUL
);
}
if (transaction.getState() == TransactionState.AUTHORIZED) {
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
for (int i = 1; i <= 5; i++) {
if (
transaction.getState() == TransactionState.FULFILL ||
transaction.getState() == TransactionState.FAILED
) {
break;
}

try {
Thread.sleep(i * 15000);
} catch (InterruptedException e) {
System.err.println(e.getMessage());
}
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
}

if (transaction.getState() == TransactionState.FULFILL) {
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
Assert.assertEquals(
"Transaction completion successful",
transactionCompletion.getState(),
TransactionCompletionState.SUCCESSFUL
);

transaction = this.apiClient.getTransactionService().read(transaction.getLinkedSpaceId(), transactionCompletion.getLinkedTransaction());
Refund refund = this.apiClient.getRefundService().refund(this.spaceId, getRefundPayload(transaction));

Assert.assertEquals(
"Refund successful",
refund.getState(),
RefundState.SUCCESSFUL
);
}
} else {
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
}
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
66 changes: 51 additions & 15 deletions src/test/java/com/wallee/sdk/test/TransactionCompletionServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,32 @@ private TransactionCreate getTransactionPayload() {
public void completeOfflineTest() {
try {
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
TransactionCompletionState[] TransactionCompletionStates = {
TransactionCompletionState.SUCCESSFUL,
TransactionCompletionState.PENDING
};
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
} catch (Exception e) {
// wait for transaction to be authorized
for (int i = 1; i <= 5; i++) {
if (transaction.getState() == TransactionState.AUTHORIZED) {
break;
}
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());

try {
Thread.sleep(i * 15000);
} catch (InterruptedException e) {
System.err.println(e.getMessage());
}
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
}
if (transaction.getState() == TransactionState.AUTHORIZED) {
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
TransactionCompletionState[] TransactionCompletionStates = {
TransactionCompletionState.SUCCESSFUL,
TransactionCompletionState.PENDING
};
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
} else {
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
}
} catch (Exception e) {
e.printStackTrace();
}
}
Expand All @@ -103,13 +121,31 @@ public void completeOfflineTest() {
public void completeOnlineTest() {
try {
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOnline(this.spaceId, transaction.getId());
TransactionCompletionState[] TransactionCompletionStates = {
TransactionCompletionState.SUCCESSFUL,
TransactionCompletionState.PENDING
};
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
// wait for transaction to be authorized
for (int i = 1; i <= 5; i++) {
if (transaction.getState() == TransactionState.AUTHORIZED) {
break;
}
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());

try {
Thread.sleep(i * 15000);
} catch (InterruptedException e) {
System.err.println(e.getMessage());
}
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
}
if (transaction.getState() == TransactionState.AUTHORIZED) {
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOnline(this.spaceId, transaction.getId());
TransactionCompletionState[] TransactionCompletionStates = {
TransactionCompletionState.SUCCESSFUL,
TransactionCompletionState.PENDING
};
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
} else {
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
}
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
40 changes: 29 additions & 11 deletions src/test/java/com/wallee/sdk/test/TransactionServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,27 +253,45 @@ public void processOneClickTokenAndRedirectWithCredentialsTest() {
public void processWithoutUserInteractionTest() {
try {
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId());
// wait for transaction to be authorized
for (int i = 1; i <= 5; i++) {
if (
transaction.getState() == TransactionState.FULFILL ||
transaction.getState() == TransactionState.FAILED
) {
if (transaction.getState() == TransactionState.AUTHORIZED) {
break;
}
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());

try {
Thread.sleep(i * 30);
Thread.sleep(i * 15000);
} catch (InterruptedException e) {
System.err.println(e.getMessage());
}
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
}
TransactionState[] TransactionStates = {
TransactionState.FULFILL,
TransactionState.FAILED
};
Assert.assertTrue(Arrays.asList(TransactionStates).contains(transaction.getState()));
if (transaction.getState() == TransactionState.AUTHORIZED) {
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId());
for (int i = 1; i <= 5; i++) {
if (
transaction.getState() == TransactionState.FULFILL ||
transaction.getState() == TransactionState.FAILED
) {
break;
}

try {
Thread.sleep(i * 15000);
} catch (InterruptedException e) {
System.err.println(e.getMessage());
}
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
}
TransactionState[] TransactionStates = {
TransactionState.FULFILL,
TransactionState.FAILED
};
Assert.assertTrue(Arrays.asList(TransactionStates).contains(transaction.getState()));
} else {
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
}
} catch (Exception e) {
e.printStackTrace();
}
Expand Down

0 comments on commit a1179a0

Please sign in to comment.