From 1f324e63d853fff829099df64c9df0130183eacd Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Tue, 13 Feb 2018 14:56:10 -0500 Subject: [PATCH 1/3] 255pm all tests worked, on 0213 --- pom.xml | 7 +- src/main/java/CurrencyExchange.java | 23 ++++ src/test/java/CurrencyExchangeTest.java | 102 ++++++++++++++++++ target/classes/CurrencyExchange.class | Bin 0 -> 934 bytes .../test-classes/CurrencyExchangeTest.class | Bin 0 -> 2807 bytes 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 src/main/java/CurrencyExchange.java create mode 100644 src/test/java/CurrencyExchangeTest.java create mode 100644 target/classes/CurrencyExchange.class create mode 100644 target/test-classes/CurrencyExchangeTest.class diff --git a/pom.xml b/pom.xml index 682d6db..55d5fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,12 @@ wu-tang-financial 1.0-SNAPSHOT - + + + junit + junit + RELEASE + \ No newline at end of file diff --git a/src/main/java/CurrencyExchange.java b/src/main/java/CurrencyExchange.java new file mode 100644 index 0000000..cd253c8 --- /dev/null +++ b/src/main/java/CurrencyExchange.java @@ -0,0 +1,23 @@ +public class CurrencyExchange { + + public static final double US_DOLLAR = 1.00; + public static final double EURO = 0.94; + public static final double BRITISH_POUND = 0.82; + public static final double INDIAN_RUPEE = 68.32; + public static final double AUSTRALIAN_DOLLAR = 1.35; + public static final double CANADIAN_DOLLAR = 1.32; + public static final double SINGAPORE_DOLLAR = 1.43; + public static final double SWISS_FRANC = 1.01; + public static final double MALAYSIAN_RINGGIT = 4.47; + public static final double JAPANESE_YEN = 115.84; + public static final double CHINESE_YUAN_RENMINBI = 6.92; + + public static double convertFromTo(double fromAmount, double fromCurrencyRate, double toCurrencyRate) { + + double toAmount = toCurrencyRate * (fromAmount / fromCurrencyRate); + return toAmount; + } + + + +} diff --git a/src/test/java/CurrencyExchangeTest.java b/src/test/java/CurrencyExchangeTest.java new file mode 100644 index 0000000..f1fd944 --- /dev/null +++ b/src/test/java/CurrencyExchangeTest.java @@ -0,0 +1,102 @@ +import org.junit.Assert; +import org.junit.Test; +import org.junit.Before; + +/** + * Created by Luis J. Romero on 2/13/2018. + */ + +public class CurrencyExchangeTest { + + CurrencyExchange ce = new CurrencyExchange(); + + @Test + public void testConvertDollarToEuro() { + double fromAmount = 1.00; + double expected = ce.convertFromTo(fromAmount, ce.US_DOLLAR, ce.EURO); + double actual = 0.94; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertEuroToDollar() { + double fromAmount = 0.94; + double expected = ce.convertFromTo(fromAmount, ce.EURO, ce.US_DOLLAR); + double actual = 1.00; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertEuroToBritishPound() { + double fromAmount = 0.94; + double expected = ce.convertFromTo(fromAmount, ce.EURO, ce.BRITISH_POUND); + double actual = 0.82; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertBritishPoundToIndianRupee() { + double fromAmount = 0.82; + double expected = ce.convertFromTo(fromAmount, ce.BRITISH_POUND, ce.INDIAN_RUPEE); + double actual = 68.32; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertRupeeToCanadianDollar() { + double fromAmount = 68.32; + double expected = ce.convertFromTo(fromAmount, ce.INDIAN_RUPEE, ce.CANADIAN_DOLLAR); + double actual = 1.32; + Assert.assertEquals(expected, actual, 0.001); + } + + // Added Australian Dollar to Canadian Dollar, to include Australian Dollar in tests + @Test + public void testConvertAustralianDollarToCanadianDollar() { + double fromAmount = 1.35; + double expected = ce.convertFromTo(fromAmount, ce.AUSTRALIAN_DOLLAR, ce.CANADIAN_DOLLAR); + double actual = 1.32; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertCanadianDollarToSingaporeDollar() { + double fromAmount = 1.32; + double expected = ce.convertFromTo(fromAmount, ce.CANADIAN_DOLLAR, ce.SINGAPORE_DOLLAR); + double actual = 1.43; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertSingaporeDollarToSwissFranc() { + double fromAmount = 1.43; + double expected = ce.convertFromTo(fromAmount, ce.SINGAPORE_DOLLAR, ce.SWISS_FRANC); + double actual = 1.01; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertSwissFrancToMalaysianRinggit() { + double fromAmount = 1.01; + double expected = ce.convertFromTo(fromAmount, ce.SWISS_FRANC, ce.MALAYSIAN_RINGGIT); + double actual = 4.47; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertMalaysianRinggitToJapaneseYen() { + double fromAmount = 4.47; + double expected = ce.convertFromTo(fromAmount, ce.MALAYSIAN_RINGGIT, ce.JAPANESE_YEN); + double actual = 115.84; + Assert.assertEquals(expected, actual, 0.001); + } + + @Test + public void testConvertJapaneseYenToChineseYuanRenminbi() { + double fromAmount = 115.84; + double expected = ce.convertFromTo(fromAmount, ce.JAPANESE_YEN, ce.CHINESE_YUAN_RENMINBI); + double actual = 6.92; + Assert.assertEquals(expected, actual, 0.001); + } + +} diff --git a/target/classes/CurrencyExchange.class b/target/classes/CurrencyExchange.class new file mode 100644 index 0000000000000000000000000000000000000000..a4ac89bc48c4a35ba74d2aa2895329186490fa07 GIT binary patch literal 934 zcmZ9L&rcIU6vyARWq`H_tzaM+2*w{RD)?K8Vmow~vZidyZVMqHX_mT5vFw^8;%P6VoiYD~BQLCsb&o6ZZDN!@4hA7G0aYvpzd?VLeM*Rh$i$Hdg z8vC^L^VK+`0aMe9qEa^06WNipu)EJFVXkPVS)VtAUVzuk;n&w|Sw^WvQ4*_W-~!^J zR^|CrN0WRcDneIHwZ5wAJijJ2nIlF+g$3<6T$AoqeNofrG@c)ot%`e$_=Bd?^dB;c zX0po|NWpz1dJB8_jK*E3`e&b{a3$7mW?e zd1~LsC>yS`V|)I*=WbP9G|DK7lEse^e}ahEa@&rNIY{WJ4a-NTQ@;CepvQMR<#E$( zdkuTODJ>0k$~s-AHmw~iNtY;ti~mm|B-7I^_?s@TZ`uu?CMbf>hA2TJ6r(PD5F8Yt zZg6jiT9y;xpjk5RZUILwpuI7UFU6M2OFU&xiN|JTm#7cxK^v z8au<@HTjX)hu{?^@#H~}(Pf;I#|3nSu7Y}LDiBHW3hH{WCx&AeGw!n)KFr?(BP6eg rV<$?XARSyYi8;x6U4t9B68P_R1vLq}fl~~XQM!qfY<>$B5xV^c3#_?s literal 0 HcmV?d00001 diff --git a/target/test-classes/CurrencyExchangeTest.class b/target/test-classes/CurrencyExchangeTest.class new file mode 100644 index 0000000000000000000000000000000000000000..9c51cca91e3d10987300d886c34da634ec53172d GIT binary patch literal 2807 zcmbu=No*Tc7zgn0InKECB0IHH*GaRqDUI!rx@lROX0aVROG64-Mu9*MJWqyXB74Tn zQrg})^voHqoVZj%qG|*Z2aX)MaPAc(1c&y75dZN^(y`+jBuC0D?|t*W-+b>I`R9MW z|B;BMXeCI)G!vlNAo*zKEDh0|kpCm`@Y(X?ggrDb@U{q)0ULjKS6^Pj%h%?O1)ccidu52RlRg+V)F z`Eh`X0a{?>lVnEc)=HMH%c}HX@xFAx)qQz}kua;MiaF1yC!N`5@E7iusn#8NyTvzOSchGMhCa>mv)eLr_- z0iSD=&CVifPEJNc9)~ltpev?g9IOL?j8{DK-WgH5qwXnO-L&d5YB1^vYYd56iL2a> zIL@MK)n z?(!;sVA!vNrS}ySKJAHYofWlJUgxT8$UCyi$opcR3B1z*S_MHC)|J(oqE-}a@0Moi zlDwqYt&?hPI}u%R?U3K&VY)<@v6rm@VH%;)FqNnrpv5pP(K4e%YmmJPp0(G>Rng74 z_bP|zAVv|%>9{4dn225z(&chFgC2{$Y?-2ApeGrHdE;X7Q#2g9$_d>DYX~1M5yL+y zIEHZzERJKio2Q<}TrB&PSoR0af~*O3Fu0uyDMQFpJb!)J^C^+6-lpcmVMexavW4kY2}CFHIs+z}z*Q8RbsX0Px~)>mY4h zv;!>(#09!YDI^;JZLkf^k1>aKks|*=yM97@ucuq{eRvq@TS4L4c-iRvt9DuXvb^%W)pP$)yAFb z#XD?n0lXr33*eQ&D|g9zvmGzqT)ntky?%$+-+{LR-W~8(!Fvb1wJv#Ywd3_S^ZH$0 z(%~gL@YccG0B;k#E%3xHd2hGlC7XFkmzQ#QsSdmkz}o@uL-0NVZ?{X{t#-UrGcV=x c1|8mD2j0ivaqueON#N~u$(zRShL3Ll3m=c-+5i9m literal 0 HcmV?d00001 From c149e0cbee3d807b7439505e3929adefe4da3272 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Tue, 13 Feb 2018 15:32:15 -0500 Subject: [PATCH 2/3] minor space change --- src/main/java/CurrencyExchange.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/CurrencyExchange.java b/src/main/java/CurrencyExchange.java index cd253c8..738439d 100644 --- a/src/main/java/CurrencyExchange.java +++ b/src/main/java/CurrencyExchange.java @@ -1,6 +1,6 @@ public class CurrencyExchange { - public static final double US_DOLLAR = 1.00; + public static final double US_DOLLAR = 1.00; public static final double EURO = 0.94; public static final double BRITISH_POUND = 0.82; public static final double INDIAN_RUPEE = 68.32; From ac22d3ee493c976368ba1ff6fd8e7803c8467fee Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Wed, 14 Feb 2018 08:11:16 -0500 Subject: [PATCH 3/3] Swapped values of previous expected/actual variables --- src/test/java/CurrencyExchangeTest.java | 44 ++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/test/java/CurrencyExchangeTest.java b/src/test/java/CurrencyExchangeTest.java index f1fd944..ce892da 100644 --- a/src/test/java/CurrencyExchangeTest.java +++ b/src/test/java/CurrencyExchangeTest.java @@ -13,40 +13,40 @@ public class CurrencyExchangeTest { @Test public void testConvertDollarToEuro() { double fromAmount = 1.00; - double expected = ce.convertFromTo(fromAmount, ce.US_DOLLAR, ce.EURO); - double actual = 0.94; + double expected = 0.94; + double actual = ce.convertFromTo(fromAmount, ce.US_DOLLAR, ce.EURO); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertEuroToDollar() { double fromAmount = 0.94; - double expected = ce.convertFromTo(fromAmount, ce.EURO, ce.US_DOLLAR); - double actual = 1.00; + double expected = 1.00; + double actual = ce.convertFromTo(fromAmount, ce.EURO, ce.US_DOLLAR); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertEuroToBritishPound() { double fromAmount = 0.94; - double expected = ce.convertFromTo(fromAmount, ce.EURO, ce.BRITISH_POUND); - double actual = 0.82; + double expected = 0.82; + double actual = ce.convertFromTo(fromAmount, ce.EURO, ce.BRITISH_POUND); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertBritishPoundToIndianRupee() { double fromAmount = 0.82; - double expected = ce.convertFromTo(fromAmount, ce.BRITISH_POUND, ce.INDIAN_RUPEE); - double actual = 68.32; + double expected = 68.32; + double actual = ce.convertFromTo(fromAmount, ce.BRITISH_POUND, ce.INDIAN_RUPEE); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertRupeeToCanadianDollar() { double fromAmount = 68.32; - double expected = ce.convertFromTo(fromAmount, ce.INDIAN_RUPEE, ce.CANADIAN_DOLLAR); - double actual = 1.32; + double expected = 1.32; + double actual = ce.convertFromTo(fromAmount, ce.INDIAN_RUPEE, ce.CANADIAN_DOLLAR); Assert.assertEquals(expected, actual, 0.001); } @@ -54,48 +54,48 @@ public void testConvertRupeeToCanadianDollar() { @Test public void testConvertAustralianDollarToCanadianDollar() { double fromAmount = 1.35; - double expected = ce.convertFromTo(fromAmount, ce.AUSTRALIAN_DOLLAR, ce.CANADIAN_DOLLAR); - double actual = 1.32; + double expected = 1.32; + double actual = ce.convertFromTo(fromAmount, ce.AUSTRALIAN_DOLLAR, ce.CANADIAN_DOLLAR); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertCanadianDollarToSingaporeDollar() { double fromAmount = 1.32; - double expected = ce.convertFromTo(fromAmount, ce.CANADIAN_DOLLAR, ce.SINGAPORE_DOLLAR); - double actual = 1.43; + double expected = 1.43; + double actual = ce.convertFromTo(fromAmount, ce.CANADIAN_DOLLAR, ce.SINGAPORE_DOLLAR); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertSingaporeDollarToSwissFranc() { double fromAmount = 1.43; - double expected = ce.convertFromTo(fromAmount, ce.SINGAPORE_DOLLAR, ce.SWISS_FRANC); - double actual = 1.01; + double expected = 1.01; + double actual = ce.convertFromTo(fromAmount, ce.SINGAPORE_DOLLAR, ce.SWISS_FRANC); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertSwissFrancToMalaysianRinggit() { double fromAmount = 1.01; - double expected = ce.convertFromTo(fromAmount, ce.SWISS_FRANC, ce.MALAYSIAN_RINGGIT); - double actual = 4.47; + double expected = 4.47; + double actual = ce.convertFromTo(fromAmount, ce.SWISS_FRANC, ce.MALAYSIAN_RINGGIT); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertMalaysianRinggitToJapaneseYen() { double fromAmount = 4.47; - double expected = ce.convertFromTo(fromAmount, ce.MALAYSIAN_RINGGIT, ce.JAPANESE_YEN); - double actual = 115.84; + double expected = 115.84; + double actual = ce.convertFromTo(fromAmount, ce.MALAYSIAN_RINGGIT, ce.JAPANESE_YEN); Assert.assertEquals(expected, actual, 0.001); } @Test public void testConvertJapaneseYenToChineseYuanRenminbi() { double fromAmount = 115.84; - double expected = ce.convertFromTo(fromAmount, ce.JAPANESE_YEN, ce.CHINESE_YUAN_RENMINBI); - double actual = 6.92; + double expected = 6.92; + double actual = ce.convertFromTo(fromAmount, ce.JAPANESE_YEN, ce.CHINESE_YUAN_RENMINBI); Assert.assertEquals(expected, actual, 0.001); }