X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=test.py;h=9fd058a0ad6d59c80798466d4cbf4ddace1ab6eb;hb=c31df868c655612b8387a25111e69882f0fe6344;hp=86411301e39c0af52bfebe7b806dc73ebfa788fb;hpb=97922ff1826cc6b9c0329cc30e8d4621bb2644ee;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/test.py b/test.py
index 8641130..9fd058a 100644
--- a/test.py
+++ b/test.py
@@ -870,7 +870,7 @@ class HelperTest(WebMockTestCase):
                 }
         helper.process_sell_needed__1_sell(market)
         prepare_trades.assert_called_with(market, base_currency="BTC",
-                debug=False)
+                liquidity="medium", debug=False)
         prepare_orders.assert_called_with(compute_value="average",
                 only="dispose")
         print_all_with_order.assert_called()
@@ -903,7 +903,7 @@ class HelperTest(WebMockTestCase):
                 }
         helper.process_sell_needed__2_buy(market)
         update_trades.assert_called_with(market, base_currency="BTC",
-                debug=False, only="acquire")
+                debug=False, liquidity="medium", only="acquire")
         prepare_orders.assert_called_with(compute_value="average",
                 only="acquire")
         print_all_with_order.assert_called()
@@ -968,8 +968,8 @@ class HelperTest(WebMockTestCase):
                 }
         helper.process_sell_all__2_all_buy(market)
         prepare_trades.assert_called_with(market, base_currency="BTC",
-                debug=False)
-        prepare_orders.assert_called_with()
+                liquidity="medium", debug=False)
+        prepare_orders.assert_called_with(compute_value="average")
         print_all_with_order.assert_called()
         move_balances.assert_called_with(market, debug=False)
         run_orders.assert_called()
@@ -1247,6 +1247,7 @@ class BalanceStoreTest(WebMockTestCase):
                 }
 
         amounts = portfolio.BalanceStore.dispatch_assets(portfolio.Amount("BTC", "11.1"))
+        repartition.assert_called_with(liquidity="medium")
         self.assertIn("XEM", portfolio.BalanceStore.currencies())
         self.assertEqual(D("2.6"), amounts["BTC"].value)
         self.assertEqual(D("7.5"), amounts["XEM"].value)
@@ -1635,6 +1636,16 @@ class TradeTest(WebMockTestCase):
         order_mock2 = mock.Mock()
         order_mock2.__repr__ = mock.Mock()
         order_mock2.__repr__.return_value = "Mock 2"
+        order_mock1.mouvements = []
+        mouvement_mock1 = mock.Mock()
+        mouvement_mock1.__repr__ = mock.Mock()
+        mouvement_mock1.__repr__.return_value = "Mouvement 1"
+        mouvement_mock2 = mock.Mock()
+        mouvement_mock2.__repr__ = mock.Mock()
+        mouvement_mock2.__repr__.return_value = "Mouvement 2"
+        order_mock2.mouvements = [
+                mouvement_mock1, mouvement_mock2
+                ]
         trade.orders.append(order_mock1)
         trade.orders.append(order_mock2)
 
@@ -1644,6 +1655,8 @@ class TradeTest(WebMockTestCase):
         self.assertEqual("Trade(0.50000000 BTC [10.00000000 ETH] -> 1.00000000 BTC in ETH, acquire)", out[0])
         self.assertEqual("\tMock 1", out[1])
         self.assertEqual("\tMock 2", out[2])
+        self.assertEqual("\t\tMouvement 1", out[3])
+        self.assertEqual("\t\tMouvement 2", out[4])
 
     def test__repr(self):
         value_from = portfolio.Amount("BTC", "0.5")
@@ -2030,6 +2043,20 @@ class MouvementTest(WebMockTestCase):
         self.assertEqual(portfolio.Amount("ETH", 0), mouvement.total)
         self.assertEqual(portfolio.Amount("BTC", 0), mouvement.total_in_base)
 
+    def test__repr(self):
+        mouvement = portfolio.Mouvement("ETH", "BTC", {
+            "tradeID": 42, "type": "buy", "fee": "0.0015",
+            "date": "2017-12-30 12:00:12", "rate": "0.1",
+            "amount": "10", "total": "1"
+            })
+        self.assertEqual("Mouvement(2017-12-30 12:00:12 ; buy 10.00000000 ETH (1.00000000 BTC) fee: 0.1500%)", repr(mouvement))
+        mouvement = portfolio.Mouvement("ETH", "BTC", {
+            "tradeID": 42, "type": "buy",
+            "date": "garbage", "rate": "0.1",
+            "amount": "10", "total": "1"
+            })
+        self.assertEqual("Mouvement(No date ; buy 10.00000000 ETH (1.00000000 BTC))", repr(mouvement))
+
 @unittest.skipUnless("acceptance" in limits, "Acceptance skipped")
 class AcceptanceTest(WebMockTestCase):
     @unittest.expectedFailure