Removed SL API workaround after clarification with Dukascopy.

juxeii · Mar 8, 2017 · 3d61aea · 3d61aea
1 parent 190e2c1
commit 3d61aea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 30 deletions.
diff --git a/src/main/java/com/jforex/programming/order/task/TaskExecutor.java b/src/main/java/com/jforex/programming/order/task/TaskExecutor.java
@@ -80,11 +80,9 @@ public Completable setStopLossPrice(final IOrder order,
                                         final double newSL,
                                         final OfferSide offerSide,
                                         final double trailingStep) {
-        return trailingStep < 0
-                ? completable(() -> order.setStopLossPrice(newSL, offerSide))
-                : completable(() -> order.setStopLossPrice(newSL,
-                                                           offerSide,
-                                                           trailingStep));
+        return completable(() -> order.setStopLossPrice(newSL,
+                                                        offerSide,
+                                                        trailingStep));
     }
 
     public Completable setTakeProfitPrice(final IOrder order,

diff --git a/src/main/java/com/jforex/programming/order/task/params/basic/SetSLParams.java b/src/main/java/com/jforex/programming/order/task/params/basic/SetSLParams.java
@@ -39,7 +39,7 @@ private OfferSide evalOfferSide(final Optional<OfferSide> maybeOfferSide) {
     }
 
     private double evalTrailingStep(final Optional<Double> maybeTrailingStep) {
-        return maybeTrailingStep.orElse(-1.0);
+        return maybeTrailingStep.orElse(0.0);
     }
 
     public final IOrder order() {
@@ -123,6 +123,7 @@ public Builder withTrailingStep(final double trailingStep) {
             return this;
         }
 
+        @Override
         public SetSLParams build() {
             return new SetSLParams(this);
         }

diff --git a/src/test/java/com/jforex/programming/order/task/params/basic/test/SetSLParamsTest.java b/src/test/java/com/jforex/programming/order/task/params/basic/test/SetSLParamsTest.java
@@ -50,12 +50,12 @@ public void askIsOfferSideWhenOrderIsShort() {
     }
 
     @Test
-    public void trailingStepIsNegativeWhenNotSpecified() {
+    public void trailingStepIsZeroWhenNotSpecified() {
         setSLParams = SetSLParams
             .setSLAtPrice(buyOrderEURUSD, newSL)
             .build();
 
-        assertThat(setSLParams.trailingStep(), equalTo(-1.0));
+        assertThat(setSLParams.trailingStep(), equalTo(0.0));
     }
 
     @Test

diff --git a/src/test/java/com/jforex/programming/order/task/test/BasicTaskTest.java b/src/test/java/com/jforex/programming/order/task/test/BasicTaskTest.java
@@ -653,7 +653,7 @@ public class AsPipsSetup {
             public void setUp() {
                 when(calculationUtilMock.slPriceForPips(orderForTest, pips))
                     .thenReturn(newSL);
-                when(orderTaskExecutorMock.setStopLossPrice(orderForTest, newSL, OfferSide.ASK, -1.0))
+                when(orderTaskExecutorMock.setStopLossPrice(orderForTest, newSL, OfferSide.ASK, 0.0))
                     .thenReturn(emptyCompletable());
 
                 observable = basicTask.setStopLossPrice(SetSLParams
@@ -700,7 +700,7 @@ public void verifyTaskExecutorCall() {
                     verify(orderTaskExecutorMock).setStopLossPrice(orderForTest,
                                                                    newSL,
                                                                    OfferSide.ASK,
-                                                                   -1);
+                                                                   0.0);
                 }
             }
         }

diff --git a/src/test/java/com/jforex/programming/order/task/test/TaskExecutorTest.java b/src/test/java/com/jforex/programming/order/task/test/TaskExecutorTest.java
@@ -308,26 +308,6 @@ public void taskExecutorCallsOnStrategyThreadWithAction() throws Exception {
         }
     }
 
-    public class APIWorkaroundTrailingstep {
-
-        private final double newSL = 1.1234;
-        private final double trailingStep = -1;
-
-        @Before
-        public void setUp() {
-            taskExecutor.setStopLossPrice(orderForTest,
-                                          newSL,
-                                          OfferSide.ASK,
-                                          trailingStep);
-        }
-
-        @Test
-        public void taskExecutorIsCalledWithoutTrailingStep() throws Exception {
-            captureAndRunAction();
-            verify(orderForTest).setStopLossPrice(newSL, OfferSide.ASK);
-        }
-    }
-
     public class SetTakeProfitSetup {
 
         private final double newTP = 1.1234;