From 0f15c9adc01afb8734b7c36a6bb7ae720fe707c8 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 2 Feb 2022 11:19:37 -0500 Subject: [PATCH] buxfer-cli cleanup --- .../inteligr8/buxfer/InvestNormalizeCLI.java | 1 + .../com/inteligr8/buxfer/ConditionalIT.java | 35 ---- .../inteligr8/buxfer/ConnectionClientIT.java | 176 ------------------ 3 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 buxfer-cli/src/test/java/com/inteligr8/buxfer/ConditionalIT.java delete mode 100644 buxfer-cli/src/test/java/com/inteligr8/buxfer/ConnectionClientIT.java diff --git a/buxfer-cli/src/main/java/com/inteligr8/buxfer/InvestNormalizeCLI.java b/buxfer-cli/src/main/java/com/inteligr8/buxfer/InvestNormalizeCLI.java index f623d82..423198d 100644 --- a/buxfer-cli/src/main/java/com/inteligr8/buxfer/InvestNormalizeCLI.java +++ b/buxfer-cli/src/main/java/com/inteligr8/buxfer/InvestNormalizeCLI.java @@ -78,6 +78,7 @@ public class InvestNormalizeCLI { "Investment / Security / " + ptx.getSecuritySymbol(), null); return 1; } catch (IllegalArgumentException iae) { + logger.trace("failed to parse: " + iae.getMessage(), iae); // try another } } diff --git a/buxfer-cli/src/test/java/com/inteligr8/buxfer/ConditionalIT.java b/buxfer-cli/src/test/java/com/inteligr8/buxfer/ConditionalIT.java deleted file mode 100644 index bd2ad6f..0000000 --- a/buxfer-cli/src/test/java/com/inteligr8/buxfer/ConditionalIT.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.inteligr8.buxfer; - -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.impl.client.DefaultRedirectStrategy; -import org.apache.http.impl.client.HttpClientBuilder; - -import com.inteligr8.rs.ClientConfiguration; - -public abstract class ConditionalIT { - - public abstract ClientConfiguration getConfiguration(); - - public boolean hostExists() { - String uri = this.getConfiguration().getBaseUrl(); - - HttpUriRequest request = RequestBuilder.get() - .setUri(uri) - .build(); - - HttpClient client = HttpClientBuilder.create() - .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE) - .build(); - - try { - HttpResponse response = client.execute(request); - return response.getStatusLine().getStatusCode() < 300; - } catch (Exception e) { - return false; - } - } - -} diff --git a/buxfer-cli/src/test/java/com/inteligr8/buxfer/ConnectionClientIT.java b/buxfer-cli/src/test/java/com/inteligr8/buxfer/ConnectionClientIT.java deleted file mode 100644 index 14d1fb5..0000000 --- a/buxfer-cli/src/test/java/com/inteligr8/buxfer/ConnectionClientIT.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.inteligr8.buxfer; - -import java.time.LocalDate; -import java.util.Collection; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIf; - -import com.inteligr8.buxfer.api.CommandApi; -import com.inteligr8.buxfer.model.Account; -import com.inteligr8.buxfer.model.ArrayResponse; -import com.inteligr8.buxfer.model.BaseResponse; -import com.inteligr8.buxfer.model.BaseResponse.Status; -import com.inteligr8.buxfer.model.Budget; -import com.inteligr8.buxfer.model.Item; -import com.inteligr8.buxfer.model.NamedItem; -import com.inteligr8.buxfer.model.Reminder; -import com.inteligr8.buxfer.model.Tag; -import com.inteligr8.buxfer.model.Transaction; -import com.inteligr8.buxfer.model.TransactionsResponse; - -public abstract class ConnectionClientIT extends ConditionalIT { - - public abstract BuxferPublicRestApi getClient(); - - private CommandApi api; - - public boolean fullTest() { - return false; - //return this.hostExists(); - } - - @BeforeEach - public void getApi() { - this.api = this.getClient().getCommandApi(); - } - - @Test - @EnabledIf("hostExists") - public void testTransactions() { - TransactionsResponse response = this.api.getTransactions( - LocalDate.of(2021, 12, 1), - LocalDate.of(2021, 12, 31), - null, - 1 - ).getResponse(); - this.assertArrayNotEmpty(response); - Assertions.assertTrue(response.getTotalItems() > 0L); - this.assertItems(response.getItems()); - } - - @Test - @EnabledIf("hostExists") - public void testAccounts() { - ArrayResponse response = this.api.getAccounts().getResponse(); - this.assertArrayNotEmpty(response); - this.assertItems(response.getItems()); - } - - @Test - @EnabledIf("hostExists") - public void testTags() { - ArrayResponse response = this.api.getTags().getResponse(); - this.assertArrayNotEmpty(response); - this.assertItems(response.getItems()); - } - - @Test - @EnabledIf("hostExists") - public void testBudgets() { - ArrayResponse response = this.api.getBudgets().getResponse(); - this.assertArrayNotEmpty(response); - this.assertItems(response.getItems()); - } - - @Test - @EnabledIf("hostExists") - public void testReminders() { - ArrayResponse response = this.api.getReminders().getResponse(); - this.assertArrayNotEmpty(response); - this.assertItems(response.getItems()); - } - - @Test - @EnabledIf("fullTest") - public void testGroups() { - ArrayResponse response = this.api.getGroups().getResponse(); - this.assertArrayEmpty(response); - } - - @Test - @EnabledIf("fullTest") - public void testContacts() { - ArrayResponse response = this.api.getContacts().getResponse(); - this.assertArrayEmpty(response); - } - - private void assertOk(BaseResponse response) { - Assertions.assertNotNull(response); - Assertions.assertEquals(Status.OK, response.getStatus()); - Assertions.assertNull(response.getError()); - } - - private void assertArrayEmpty(ArrayResponse response) { - this.assertOk(response); - Assertions.assertNotNull(response.getItems()); - Assertions.assertTrue(response.getItems().isEmpty()); - } - - private void assertArrayNotEmpty(ArrayResponse response) { - this.assertOk(response); - Assertions.assertNotNull(response.getItems()); - Assertions.assertFalse(response.getItems().isEmpty()); - } - - private void assertItem(Item item) { - Assertions.assertTrue(item.getId() > 0); - } - - private void assertNamedItem(NamedItem item) { - this.assertItem(item); - Assertions.assertNotNull(item.getName()); - Assertions.assertNotEquals(0, item.getName().length()); - } - - private void assertSpecificItem(Item item) { - if (item instanceof Transaction) { - this.assertTransaction((Transaction)item); - } else if (item instanceof Budget) { - this.assertBudget((Budget)item); - } else if (item instanceof Reminder) { - this.assertReminder((Reminder)item); - } else if (item instanceof Tag) { - this.assertTag((Tag)item); - } else if (item instanceof Account) { - this.assertAccount((Account)item); - } - } - - private void assertTransaction(Transaction item) { - this.assertItem(item); - Assertions.assertNotNull(item.getType()); - Assertions.assertNotNull(item.getAmount()); - Assertions.assertNotNull(item.getDate()); - } - - private void assertAccount(Account item) { - this.assertNamedItem(item); - Assertions.assertNotNull(item.getBank()); - Assertions.assertNotEquals(0, item.getBank().length()); - Assertions.assertNotNull(item.getBalance()); - } - - private void assertTag(Tag item) { - this.assertNamedItem(item); - } - - private void assertBudget(Budget item) { - this.assertNamedItem(item); - } - - private void assertReminder(Reminder item) { - this.assertNamedItem(item); - Assertions.assertNotNull(item.getStartDate()); - Assertions.assertTrue(item.getStartDate().isAfter(LocalDate.of(2010, 1, 1))); - } - - private void assertItems(Collection items) { - for (Item item : items) { - this.assertSpecificItem(item); - } - } - -}