Skip to content

Commit 7d32e98

Browse files
vttnvttn
committed
Release 2.2.3
1 parent e0adc4f commit 7d32e98

File tree

7 files changed

+128
-56
lines changed

7 files changed

+128
-56
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
2323
<dependency>
2424
<groupId>com.postfinancecheckout</groupId>
2525
<artifactId>postfinancecheckout-java-sdk</artifactId>
26-
<version>2.2.2</version>
26+
<version>2.2.3</version>
2727
<scope>compile</scope>
2828
</dependency>
2929
```
@@ -33,7 +33,7 @@ Add this dependency to your project's POM:
3333
Add this dependency to your project's build file:
3434

3535
```groovy
36-
compile "com.postfinancecheckout:postfinancecheckout-java-sdk:2.2.2"
36+
compile "com.postfinancecheckout:postfinancecheckout-java-sdk:2.2.3"
3737
```
3838

3939
### Others
@@ -46,7 +46,7 @@ mvn clean package
4646

4747
Then manually install the following JARs:
4848

49-
* `target/postfinancecheckout-java-sdk-2.2.2.jar`
49+
* `target/postfinancecheckout-java-sdk-2.2.3.jar`
5050
* `target/lib/*.jar`
5151

5252
## Usage

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'idea'
22
apply plugin: 'eclipse'
33

44
group = 'com.postfinancecheckout'
5-
version = '2.2.2'
5+
version = '2.2.3'
66

77
buildscript {
88
repositories {

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "com.postfinancecheckout",
44
name := "postfinancecheckout-java-sdk",
5-
version := "2.2.2",
5+
version := "2.2.3",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>postfinancecheckout-java-sdk</artifactId>
66
<packaging>jar</packaging>
77
<name>postfinancecheckout-java-sdk</name>
8-
<version>2.2.2</version>
8+
<version>2.2.3</version>
99
<url>https://www.postfinance.ch/checkout</url>
1010
<description>The SDK for simplifying the integration with PostFinance Checkout API.</description>
1111
<scm>

‎src/test/java/com/postfinancecheckout/sdk/test/RefundServiceTest.java‎

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -153,40 +153,58 @@ public void readTest() {
153153
public void refundTest() {
154154
try {
155155
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
156-
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
156+
// wait for transaction to be authorized
157157
for (int i = 1; i <= 5; i++) {
158-
if (
159-
transaction.getState() == TransactionState.FULFILL ||
160-
transaction.getState() == TransactionState.FAILED
161-
) {
158+
if (transaction.getState() == TransactionState.AUTHORIZED) {
162159
break;
163160
}
161+
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());
164162

165163
try {
166-
Thread.sleep(i * 30);
164+
Thread.sleep(i * 15000);
167165
} catch (InterruptedException e) {
168166
System.err.println(e.getMessage());
169167
}
170168
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
171169
}
172-
173-
if (transaction.getState() == TransactionState.FULFILL) {
174-
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
175-
Assert.assertEquals(
176-
"Transaction completion successful",
177-
transactionCompletion.getState(),
178-
TransactionCompletionState.SUCCESSFUL
179-
);
180-
181-
transaction = this.apiClient.getTransactionService().read(transaction.getLinkedSpaceId(), transactionCompletion.getLinkedTransaction());
182-
Refund refund = this.apiClient.getRefundService().refund(this.spaceId, getRefundPayload(transaction));
183-
184-
Assert.assertEquals(
185-
"Refund successful",
186-
refund.getState(),
187-
RefundState.SUCCESSFUL
188-
);
189-
}
170+
if (transaction.getState() == TransactionState.AUTHORIZED) {
171+
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
172+
for (int i = 1; i <= 5; i++) {
173+
if (
174+
transaction.getState() == TransactionState.FULFILL ||
175+
transaction.getState() == TransactionState.FAILED
176+
) {
177+
break;
178+
}
179+
180+
try {
181+
Thread.sleep(i * 15000);
182+
} catch (InterruptedException e) {
183+
System.err.println(e.getMessage());
184+
}
185+
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
186+
}
187+
188+
if (transaction.getState() == TransactionState.FULFILL) {
189+
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
190+
Assert.assertEquals(
191+
"Transaction completion successful",
192+
transactionCompletion.getState(),
193+
TransactionCompletionState.SUCCESSFUL
194+
);
195+
196+
transaction = this.apiClient.getTransactionService().read(transaction.getLinkedSpaceId(), transactionCompletion.getLinkedTransaction());
197+
Refund refund = this.apiClient.getRefundService().refund(this.spaceId, getRefundPayload(transaction));
198+
199+
Assert.assertEquals(
200+
"Refund successful",
201+
refund.getState(),
202+
RefundState.SUCCESSFUL
203+
);
204+
}
205+
} else {
206+
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
207+
}
190208
} catch (Exception e) {
191209
e.printStackTrace();
192210
}

‎src/test/java/com/postfinancecheckout/sdk/test/TransactionCompletionServiceTest.java‎

Lines changed: 51 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,32 @@ private TransactionCreate getTransactionPayload() {
8282
public void completeOfflineTest() {
8383
try {
8484
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
85-
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
86-
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
87-
TransactionCompletionState[] TransactionCompletionStates = {
88-
TransactionCompletionState.SUCCESSFUL,
89-
TransactionCompletionState.PENDING
90-
};
91-
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
92-
} catch (Exception e) {
85+
// wait for transaction to be authorized
86+
for (int i = 1; i <= 5; i++) {
87+
if (transaction.getState() == TransactionState.AUTHORIZED) {
88+
break;
89+
}
90+
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());
91+
92+
try {
93+
Thread.sleep(i * 15000);
94+
} catch (InterruptedException e) {
95+
System.err.println(e.getMessage());
96+
}
97+
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
98+
}
99+
if (transaction.getState() == TransactionState.AUTHORIZED) {
100+
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
101+
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId());
102+
TransactionCompletionState[] TransactionCompletionStates = {
103+
TransactionCompletionState.SUCCESSFUL,
104+
TransactionCompletionState.PENDING
105+
};
106+
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
107+
} else {
108+
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
109+
}
110+
} catch (Exception e) {
93111
e.printStackTrace();
94112
}
95113
}
@@ -103,13 +121,31 @@ public void completeOfflineTest() {
103121
public void completeOnlineTest() {
104122
try {
105123
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
106-
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
107-
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOnline(this.spaceId, transaction.getId());
108-
TransactionCompletionState[] TransactionCompletionStates = {
109-
TransactionCompletionState.SUCCESSFUL,
110-
TransactionCompletionState.PENDING
111-
};
112-
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
124+
// wait for transaction to be authorized
125+
for (int i = 1; i <= 5; i++) {
126+
if (transaction.getState() == TransactionState.AUTHORIZED) {
127+
break;
128+
}
129+
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());
130+
131+
try {
132+
Thread.sleep(i * 15000);
133+
} catch (InterruptedException e) {
134+
System.err.println(e.getMessage());
135+
}
136+
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
137+
}
138+
if (transaction.getState() == TransactionState.AUTHORIZED) {
139+
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId());
140+
TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOnline(this.spaceId, transaction.getId());
141+
TransactionCompletionState[] TransactionCompletionStates = {
142+
TransactionCompletionState.SUCCESSFUL,
143+
TransactionCompletionState.PENDING
144+
};
145+
Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState()));
146+
} else {
147+
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
148+
}
113149
} catch (Exception e) {
114150
e.printStackTrace();
115151
}

‎src/test/java/com/postfinancecheckout/sdk/test/TransactionServiceTest.java‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -253,27 +253,45 @@ public void processOneClickTokenAndRedirectWithCredentialsTest() {
253253
public void processWithoutUserInteractionTest() {
254254
try {
255255
Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload());
256-
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId());
256+
// wait for transaction to be authorized
257257
for (int i = 1; i <= 5; i++) {
258-
if (
259-
transaction.getState() == TransactionState.FULFILL ||
260-
transaction.getState() == TransactionState.FAILED
261-
) {
258+
if (transaction.getState() == TransactionState.AUTHORIZED) {
262259
break;
263260
}
261+
System.out.println("Waiting for transaction for be authorized --- transaction current state: " + transaction.getState());
264262

265263
try {
266-
Thread.sleep(i * 30);
264+
Thread.sleep(i * 15000);
267265
} catch (InterruptedException e) {
268266
System.err.println(e.getMessage());
269267
}
270268
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
271269
}
272-
TransactionState[] TransactionStates = {
273-
TransactionState.FULFILL,
274-
TransactionState.FAILED
275-
};
276-
Assert.assertTrue(Arrays.asList(TransactionStates).contains(transaction.getState()));
270+
if (transaction.getState() == TransactionState.AUTHORIZED) {
271+
transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId());
272+
for (int i = 1; i <= 5; i++) {
273+
if (
274+
transaction.getState() == TransactionState.FULFILL ||
275+
transaction.getState() == TransactionState.FAILED
276+
) {
277+
break;
278+
}
279+
280+
try {
281+
Thread.sleep(i * 15000);
282+
} catch (InterruptedException e) {
283+
System.err.println(e.getMessage());
284+
}
285+
transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId());
286+
}
287+
TransactionState[] TransactionStates = {
288+
TransactionState.FULFILL,
289+
TransactionState.FAILED
290+
};
291+
Assert.assertTrue(Arrays.asList(TransactionStates).contains(transaction.getState()));
292+
} else {
293+
Assert.assertTrue(transaction.getState() != TransactionState.AUTHORIZED);
294+
}
277295
} catch (Exception e) {
278296
e.printStackTrace();
279297
}

0 commit comments

Comments
 (0)