From fbacc5ae44e246b8361be3586ac6c0d28b6aac2f Mon Sep 17 00:00:00 2001
From: pinpong <o.nitzschke@gmail.com>
Date: Sun, 12 Nov 2017 16:47:55 +0100
Subject: [PATCH] updated tests

---
 jota/src/test/java/jota/IotaAPITest.java     | 38 +++++++++++---------
 jota/src/test/java/jota/IotaCoreApiTest.java |  3 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/jota/src/test/java/jota/IotaAPITest.java b/jota/src/test/java/jota/IotaAPITest.java
index 32cee0c..3aa2304 100644
--- a/jota/src/test/java/jota/IotaAPITest.java
+++ b/jota/src/test/java/jota/IotaAPITest.java
@@ -151,25 +151,33 @@ public class IotaAPITest {
         assertEquals(res.getAddresses().size(), 100);
     }
 
-    @Test
+    //seed contains 0 balance
+    @Test(expected = IllegalStateException.class)
     public void shouldPrepareTransfer() throws ArgumentException {
+        List<Transfer> transfers = new ArrayList<>();
+
+        transfers.add(new Transfer(TEST_ADDRESS_WITH_CHECKSUM_SECURITY_LEVEL_2, 100, TEST_MESSAGE, TEST_TAG));
+        List<String> trytes = iotaAPI.prepareTransfers(TEST_SEED1, 2, transfers, null, null, false);
+
+        Assert.assertNotNull(trytes);
+        assertThat(trytes.isEmpty(), Is.is(false));
+    }
+
+    //seed contains 0 balance
+    @Test(expected = IllegalStateException.class)
+    public void shouldPrepareTransferWithInputs() throws ArgumentException {
         List<Input> inputlist = new ArrayList<>();
         List<Transfer> transfers = new ArrayList<>();
 
-        GetBalancesAndFormatResponse rsp = iotaAPI.getInputs(TEST_SEED1, 2, 0, 0, 100);
+        GetBalancesAndFormatResponse rsp = iotaAPI.getInputs(TEST_SEED1, 2, 0, 0, 0);
 
-        for (Input input : rsp.getInputs()) {
-            inputlist.add(input);
-        }
-        transfers.add(new Transfer(TEST_ADDRESS_WITH_CHECKSUM_SECURITY_LEVEL_2, 0, TEST_MESSAGE, TEST_TAG));
-        transfers.add(new Transfer(TEST_ADDRESS_WITH_CHECKSUM_SECURITY_LEVEL_2, 0));
-        List<String> trytes1 = iotaAPI.prepareTransfers(TEST_SEED1, 2, transfers, null, null, false);
-        List<String> trytes2 = iotaAPI.prepareTransfers(TEST_SEED1, 2, transfers, null, inputlist, true);
+        inputlist.addAll(rsp.getInputs());
 
-        Assert.assertNotNull(trytes1);
-        assertThat(trytes1.isEmpty(), Is.is(false));
-        Assert.assertNotNull(trytes2);
-        assertThat(trytes2.isEmpty(), Is.is(false));
+        transfers.add(new Transfer(TEST_ADDRESS_WITH_CHECKSUM_SECURITY_LEVEL_2, 100, TEST_MESSAGE, TEST_TAG));
+        List<String> trytes = iotaAPI.prepareTransfers(TEST_SEED1, 2, transfers, null, inputlist, true);
+
+        Assert.assertNotNull(trytes);
+        assertThat(trytes.isEmpty(), Is.is(false));
     }
 
     @Test
@@ -274,9 +282,7 @@ public class IotaAPITest {
 
         GetBalancesAndFormatResponse rsp = iotaAPI.getInputs(TEST_SEED1, 2, 0, 0, 1);
 
-        for (Input input : rsp.getInputs()) {
-            inputlist.add(input);
-        }
+        inputlist.addAll(rsp.getInputs());
 
         transfers.add(new Transfer(TEST_ADDRESS_WITHOUT_CHECKSUM_SECURITY_LEVEL_2, 1, TEST_MESSAGE, TEST_TAG));
 
diff --git a/jota/src/test/java/jota/IotaCoreApiTest.java b/jota/src/test/java/jota/IotaCoreApiTest.java
index 3962e26..c33487a 100644
--- a/jota/src/test/java/jota/IotaCoreApiTest.java
+++ b/jota/src/test/java/jota/IotaCoreApiTest.java
@@ -100,10 +100,9 @@ public class IotaCoreApiTest {
     public void shouldGetTrytes() throws ArgumentException {
         GetTrytesResponse res = proxy.getTrytes(TEST_HASH);
         assertThat(res.getTrytes(), IsNull.notNullValue());
-
     }
 
-    @Test(expected = ArgumentException.class)
+    @Test
     public void shouldNotGetInclusionStates() throws ArgumentException {
         proxy.getInclusionStates(new String[]{TEST_HASH}, new String[]{"ZIJGAJ9AADLRPWNCYNNHUHRRAC9QOUDATEDQUMTNOTABUVRPTSTFQDGZKFYUUIE9ZEBIVCCXXXLKX9999"});
     }