Added method isInAllInstruments

juxeii · Nov 8, 2017 · 988fe9d · 988fe9d
1 parent 2af1662
commit 988fe9d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/src/main/java/com/jforex/programming/currency/CurrencyUtil.java b/src/main/java/com/jforex/programming/currency/CurrencyUtil.java
@@ -50,4 +50,14 @@ public static final boolean isInInstruments(final ICurrency currency,
             .stream()
             .anyMatch(instrument -> isInInstrument(currency, instrument));
     }
+
+    public static final boolean isInAllInstruments(final ICurrency currency,
+                                                   final Collection<Instrument> instruments) {
+        checkNotNull(currency);
+        checkNotNull(instruments);
+
+        return instruments
+            .stream()
+            .allMatch(instrument -> isInInstrument(currency, instrument));
+    }
 }
diff --git a/src/main/java/com/jforex/programming/instrument/InstrumentFactory.java b/src/main/java/com/jforex/programming/instrument/InstrumentFactory.java
@@ -94,8 +94,8 @@ public static final Set<Instrument> combineWithAnchorCurrency(final ICurrency an
             .collect(toSet());
     }
 
-    public static final Maybe<Instrument> maybeCrossInstrument(final Instrument firstInstrument,
-                                                               final Instrument secondInstrument) {
+    public static final Maybe<Instrument> maybeCross(final Instrument firstInstrument,
+                                                     final Instrument secondInstrument) {
         checkNotNull(firstInstrument);
         checkNotNull(secondInstrument);
 

diff --git a/src/test/java/com/jforex/programming/currency/test/CurrencyUtilTest.java b/src/test/java/com/jforex/programming/currency/test/CurrencyUtilTest.java
@@ -1,5 +1,6 @@
 package com.jforex.programming.currency.test;
 
+import static com.jforex.programming.currency.CurrencyUtil.isInAllInstruments;
 import static com.jforex.programming.currency.CurrencyUtil.isInInstrument;
 import static com.jforex.programming.currency.CurrencyUtil.isInInstruments;
 import static com.jforex.programming.currency.CurrencyUtil.isNameValid;
@@ -85,4 +86,19 @@ public void testIsInInstrumentsIsTrueForContainingCurrency() {
     public void testIsInInstrumentsIsFalseForNotContainingCurrency() {
         assertFalse(isInInstruments(currencyAUD, instrumentsForTest));
     }
+
+    @Test
+    public void testIsInAllInstrumentsIsTrueForEmptyInstrumentCollection() {
+        assertTrue(isInAllInstruments(currencyUSD, Collections.emptySet()));
+    }
+
+    @Test
+    public void testIsInAllInstrumentsIsTrueForContainingCurrency() {
+        assertTrue(isInAllInstruments(currencyUSD, instrumentsForTest));
+    }
+
+    @Test
+    public void testIsInAllInstrumentsIsFalseForNotAllContainingCurrency() {
+        assertFalse(isInAllInstruments(currencyEUR, instrumentsForTest));
+    }
 }
diff --git a/src/test/java/com/jforex/programming/instrument/test/InstrumentFactoryTest.java b/src/test/java/com/jforex/programming/instrument/test/InstrumentFactoryTest.java
@@ -2,7 +2,7 @@
 
 import static com.jforex.programming.instrument.InstrumentFactory.combineCurrencies;
 import static com.jforex.programming.instrument.InstrumentFactory.combineWithAnchorCurrency;
-import static com.jforex.programming.instrument.InstrumentFactory.maybeCrossInstrument;
+import static com.jforex.programming.instrument.InstrumentFactory.maybeCross;
 import static com.jforex.programming.instrument.InstrumentFactory.maybeFromCurrencies;
 import static com.jforex.programming.instrument.InstrumentFactory.maybeFromName;
 import static org.hamcrest.Matchers.equalTo;
@@ -161,20 +161,20 @@ public void testCombineAllWithAnchorCurrencyReturnsCorrectInstruments() {
 
     @Test
     public void testMaybeCrossInstrumentIsEmptyWhenInstrumentsFormNoCrossInstrument() {
-        maybeCrossInstrument(instrumentEURUSD, instrumentEURUSD)
+        maybeCross(instrumentEURUSD, instrumentEURUSD)
             .test()
             .assertNoValues();
 
-        maybeCrossInstrument(instrumentEURUSD, instrumentGBPJPY)
+        maybeCross(instrumentEURUSD, instrumentGBPJPY)
             .test()
             .assertNoValues();
     }
 
     @Test
     public void testMaybeCrossInstrumentIsCorrect() {
-        assertThat(maybeCrossInstrument(instrumentEURUSD, instrumentGBPUSD).blockingGet(), equalTo(instrumentEURGBP));
-        assertThat(maybeCrossInstrument(instrumentEURUSD, instrumentUSDJPY).blockingGet(), equalTo(instrumentEURJPY));
-        assertThat(maybeCrossInstrument(instrumentUSDJPY, instrumentGBPUSD).blockingGet(), equalTo(instrumentGBPJPY));
-        assertThat(maybeCrossInstrument(instrumentGBPAUD, instrumentAUDJPY).blockingGet(), equalTo(instrumentGBPJPY));
+        assertThat(maybeCross(instrumentEURUSD, instrumentGBPUSD).blockingGet(), equalTo(instrumentEURGBP));
+        assertThat(maybeCross(instrumentEURUSD, instrumentUSDJPY).blockingGet(), equalTo(instrumentEURJPY));
+        assertThat(maybeCross(instrumentUSDJPY, instrumentGBPUSD).blockingGet(), equalTo(instrumentGBPJPY));
+        assertThat(maybeCross(instrumentGBPAUD, instrumentAUDJPY).blockingGet(), equalTo(instrumentGBPJPY));
     }
 }