forked from apache/fineract
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
client: serialize LocalDate as 2009-01-01 (FINERACT-1234)
- Loading branch information
Showing
6 changed files
with
254 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
fineract-client/src/test/java/org/apache/fineract/client/testutil/CallSubject.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.fineract.client.testutil; | ||
|
||
import com.google.common.truth.FailureMetadata; | ||
import com.google.common.truth.Subject; | ||
import com.google.common.truth.Truth; | ||
import java.io.IOException; | ||
import javax.annotation.Nullable; | ||
import retrofit2.Call; | ||
|
||
/** | ||
* Google Truth Extension for Retrofit Call. | ||
* | ||
* @author Michael Vorburger.ch | ||
*/ | ||
public class CallSubject extends Subject { | ||
|
||
// as per https://truth.dev/extension | ||
|
||
public static CallSubject assertThat(@Nullable Call<?> actual) { | ||
return Truth.assertAbout(calls()).that(actual); | ||
} | ||
|
||
public static Factory<CallSubject, Call<?>> calls() { | ||
return CallSubject::new; | ||
} | ||
|
||
private final Call<?> actual; | ||
|
||
protected CallSubject(FailureMetadata metadata, @Nullable Call<?> actual) { | ||
super(metadata, actual); | ||
this.actual = actual; | ||
} | ||
|
||
public void hasHttpStatus(int expectedHttpStatus) throws IOException { | ||
check("httpStatus").that(actual.execute().code()).isEqualTo(expectedHttpStatus); | ||
} | ||
} |
134 changes: 134 additions & 0 deletions
134
...t-client/src/test/java/org/apache/fineract/integrationtests/newstyle/IntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.fineract.integrationtests.newstyle; | ||
|
||
import com.google.common.truth.BigDecimalSubject; | ||
import com.google.common.truth.BooleanSubject; | ||
import com.google.common.truth.ComparableSubject; | ||
import com.google.common.truth.DoubleSubject; | ||
import com.google.common.truth.FloatSubject; | ||
import com.google.common.truth.IntegerSubject; | ||
import com.google.common.truth.IterableSubject; | ||
import com.google.common.truth.LongSubject; | ||
import com.google.common.truth.OptionalSubject; | ||
import com.google.common.truth.StringSubject; | ||
import com.google.common.truth.Subject; | ||
import com.google.common.truth.Truth; | ||
import com.google.common.truth.Truth8; | ||
import java.math.BigDecimal; | ||
import java.util.Optional; | ||
import java.util.Random; | ||
import okhttp3.logging.HttpLoggingInterceptor.Level; | ||
import org.apache.fineract.client.testutil.CallSubject; | ||
import org.apache.fineract.client.util.Calls; | ||
import org.apache.fineract.client.util.FineractClient; | ||
import org.junit.jupiter.api.MethodOrderer; | ||
import org.junit.jupiter.api.TestMethodOrder; | ||
import retrofit2.Call; | ||
|
||
/** | ||
* Integration Test for /documents API. | ||
* | ||
* @author Michael Vorburger.ch | ||
*/ | ||
// TODO Remove @TestMethodOrder when https://github.com/junit-team/junit5/issues/1919 is available | ||
@TestMethodOrder(MethodOrderer.OrderAnnotation.class) | ||
public abstract class IntegrationTest { | ||
|
||
private static final Random random = new Random(); | ||
|
||
private FineractClient fineract; | ||
|
||
protected FineractClient fineract() { | ||
if (fineract == null) { | ||
// TODO change from Fineract.dev to https://localhost:8443/fineract-provider/api/v1/ after FINERACT-1209 | ||
String url = System.getProperty("fineract.it.url", "https://demo.fineract.dev/fineract-provider/api/v1/"); | ||
fineract = FineractClient.builder().baseURL(url).tenant("default").basicAuth("mifos", "password").insecure(true) | ||
.logging(Level.BODY).build(); | ||
} | ||
return fineract; | ||
} | ||
|
||
/** | ||
* See {@link FineractClient#DATE_FORMAT}. | ||
*/ | ||
protected String dateFormat() { | ||
return FineractClient.DATE_FORMAT; | ||
} | ||
|
||
protected String random() { | ||
return Long.toString(random.nextLong()); | ||
} | ||
|
||
// This method just makes it easier to use Calls.ok() in tests (it avoids having to static import) | ||
protected <T> T ok(Call<T> call) { | ||
return Calls.ok(call); | ||
} | ||
|
||
// as above, avoids import static CallSubject.assertThat | ||
protected <T> CallSubject assertThat(Call<T> call) { | ||
return CallSubject.assertThat(call); | ||
} | ||
|
||
// as above, this avoids issues with e.g. the Eclipse compiler getting confused which assertThat is which | ||
public static IterableSubject assertThat(Iterable<?> actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static <T extends Comparable<?>> ComparableSubject<T> assertThat(T actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static BigDecimalSubject assertThat(BigDecimal actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static Subject assertThat(Object actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static LongSubject assertThat(Long actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static DoubleSubject assertThat(Double actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static FloatSubject assertThat(Float actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static IntegerSubject assertThat(Integer actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static BooleanSubject assertThat(Boolean actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
public static StringSubject assertThat(String actual) { | ||
return Truth.assertThat(actual); | ||
} | ||
|
||
// from truth-java8-extension | ||
public static OptionalSubject assertThat(Optional<?> actual) { | ||
return Truth8.assertThat(actual); | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
fineract-client/src/test/java/org/apache/fineract/integrationtests/newstyle/OfficeTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.fineract.integrationtests.newstyle; | ||
|
||
import java.time.LocalDate; | ||
import org.apache.fineract.client.models.PostOfficesRequest; | ||
import org.junit.jupiter.api.Order; | ||
import org.junit.jupiter.api.Test; | ||
|
||
/** | ||
* Integration Test for /offices API. | ||
* | ||
* @author Michael Vorburger.ch | ||
*/ | ||
public class OfficeTest extends IntegrationTest { | ||
|
||
@Test | ||
@Order(1) | ||
void createOne() { | ||
// NB parentId(1) always exists (Head Office) | ||
// NB name random() because Office Names have to be unique | ||
// TODO requiring dateFormat(..).locale(..) is dumb :( see https://issues.apache.org/jira/browse/FINERACT-1233 | ||
assertThat(ok(fineract().offices.createOffice(new PostOfficesRequest().name("TestOffice-" + random()).parentId(1L) | ||
.openingDate(LocalDate.now()).dateFormat(dateFormat()).locale("en_US"))).getOfficeId()).isGreaterThan(0); | ||
} | ||
|
||
@Test | ||
@Order(2) | ||
void retrieveOneExisting() { | ||
assertThat(ok(fineract().offices.retrieveOffices(true, null, null)).size()).isAtLeast(2); | ||
} | ||
} |