From 8c8e23c880e678d2776625d4af2b6e1b5d04717b Mon Sep 17 00:00:00 2001 From: Eric Barnaba Date: Tue, 13 Feb 2018 14:58:00 -0500 Subject: [PATCH 1/6] saving while I take the test --- src/main/java/CurrencyConverter.java | 36 +++++++ src/main/java/DELETEME | 0 src/test/java/DELETEME | 0 src/test/java/TestCurrencyConverter.java | 90 ++++++++++++++++++ target/classes/CurrencyConverter.class | Bin 0 -> 1450 bytes .../test-classes/TestCurrencyConverter.class | Bin 0 -> 2491 bytes 6 files changed, 126 insertions(+) create mode 100644 src/main/java/CurrencyConverter.java delete mode 100644 src/main/java/DELETEME delete mode 100644 src/test/java/DELETEME create mode 100644 src/test/java/TestCurrencyConverter.java create mode 100644 target/classes/CurrencyConverter.class create mode 100644 target/test-classes/TestCurrencyConverter.class diff --git a/src/main/java/CurrencyConverter.java b/src/main/java/CurrencyConverter.java new file mode 100644 index 0000000..da5a113 --- /dev/null +++ b/src/main/java/CurrencyConverter.java @@ -0,0 +1,36 @@ + + +public class CurrencyConverter { + public static final double 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 = 6.92; + + public static double convertFromDollars(double denominationInDollars, double targetCurrency) { + double workingDollars = multiplyBy100(denominationInDollars); + return divideBy100(Math.round(workingDollars * targetCurrency)); + } + + public static double convertToDollars(double denominationInForeignCurrency, double oldCurrency){ + double workingForeignCurrency = multiplyBy100(denominationInForeignCurrency); + return divideBy100(Math.round(workingForeignCurrency / oldCurrency)); + } + + public static double multiplyBy100(double valueToMultiply) { + double multipliedValue = Math.round(valueToMultiply * 100); + return multipliedValue; + } + + public static double divideBy100(double valueToDivide) { + double dividedValue = valueToDivide / 100; + return dividedValue; + } + +} diff --git a/src/main/java/DELETEME b/src/main/java/DELETEME deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/java/DELETEME b/src/test/java/DELETEME deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/java/TestCurrencyConverter.java b/src/test/java/TestCurrencyConverter.java new file mode 100644 index 0000000..93d765c --- /dev/null +++ b/src/test/java/TestCurrencyConverter.java @@ -0,0 +1,90 @@ +import org.junit.Assert; +//import org.junit.Before; +import org.junit.Test; + +public class TestCurrencyConverter { + + @Test + public void testMultiplyBy100(){ + double expectedNumber = 6832; + double actual = CurrencyConverter.multiplyBy100(CurrencyConverter.INDIAN_RUPEE); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testDivideBy100(){ + double expectedNumber = 68.32; + double actual = CurrencyConverter.divideBy100(CurrencyConverter.multiplyBy100(CurrencyConverter.INDIAN_RUPEE)); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testConvertFromDollars(){ + double expectedNumber = 68.32; + double actual = CurrencyConverter.convertFromDollars(1, CurrencyConverter.INDIAN_RUPEE); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testConvertFromDollarsWithDecimal(){ + double expectedNumber = 102.48; + double actual = CurrencyConverter.convertFromDollars(1.5, CurrencyConverter.INDIAN_RUPEE); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + + @Test + public void testConvertFromDollarsWithDecimal2(){ + double expectedNumber = 136.3; + double actual = CurrencyConverter.convertFromDollars(100.96, CurrencyConverter.AUSTRALIAN_DOLLAR); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testConvertToDollars(){ + double expectedNumber = 1; + double actual = CurrencyConverter.convertToDollars(68.32, CurrencyConverter.INDIAN_RUPEE); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testConvertToDollarsWithDecimal(){ + double expectedNumber = 14.56; + double actual = CurrencyConverter.convertToDollars(100.76, CurrencyConverter.CHINESE_YUAN); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testConvertToDollarsWithDecimal2(){ + double expectedNumber = 9531.84; + double actual = CurrencyConverter.convertToDollars(12582.03, CurrencyConverter.CANADIAN_DOLLAR); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testDollarToEuro(){ + double expectedNumber = 94; + double actual = CurrencyConverter.convertFromDollars(100,CurrencyConverter.EURO); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + @Test + public void testEuroToDollar(){ + double expectedNumber = 106.38; + double actual = CurrencyConverter.convertToDollars(100,CurrencyConverter.EURO); + System.out.println(actual); + Assert.assertTrue(actual == expectedNumber); + } + + + +} diff --git a/target/classes/CurrencyConverter.class b/target/classes/CurrencyConverter.class new file mode 100644 index 0000000000000000000000000000000000000000..3886b8640a7edf8a59f61f26298cbe1ff7bda736 GIT binary patch literal 1450 zcmaJ>&rj2E6n`C~gHe8L@=FnfXmA)6@Hg^fE9*9jqr-K>keHCNHBcxmDIEsxUc7kL zt9Ohii3blJ{RcdA)x>y#qw&+O8%3f$wEevIKA-pbzP|12?@ynJXq<9kYNAw_LX-|u zhUT0%kxeWki7Q0&A$r0PE9A0SKF<&%Fw~kfjU8Jt>?K97sBHXKwU(h^s+iBQ@t>Xh zN12086wcE%o@R&>B|+q+m3(nAm0}Z5YlH}2lnZ%2>*T5( z+4%7r=X%Rfdy=96tT=@(M#8vM6Qv#aupBr=2(!_Kz59k)MgOypqoIQW9Qc z$6sDQA7Lo6z-Reo*>wSOMl7(2NR7kI^NYNcl2a?oDTz%ycQ~;V_)gA=)o_tVywB;7 zIly?PG()pz7;1=(EMX2wv#i2!Rx?zovbCyO1!Yx7B$_o#ioT>+nuEPy&|cSe7`l*6 zRxC?3N_!aZu4>t;H3>$k3euLjC78OdSSW3b3Bm|IL|0ig%q`7OY|S)8qn>ZG6>Ckk zYkCZ|y)dm!%~-2fba=7_vmWX{E0#7bRa-MoHCjx)e2Tg~#dBq?TNT~bw)MT)z45Uz z%p&GmZQpfvrC=_2Sxm<()YP)ONBB}@ZC5L+9yXhO(=0bdzpzG)2=P%5t^lnkh^;0Z@QA;5Hv_2afn~6u8reyMTLqxEJ`65BCB0`|tqp zpbrlLU-jW@z{5U#9eBitZ%`w=Vl=qlhT~B@89WYkYfH2qkBoCg z>496rqR&IT1<~Qre>#}|=+KQ0J!d*h)H^(`cbN1#U@g2e2~Hsd zU|n{#yWP`pG~;SJXN$Yq&CYIliV07#$x$@Vs|~{GkWa0Ncvp>u+N`U_P!f&;B>Vv% Ck{e_I literal 0 HcmV?d00001 diff --git a/target/test-classes/TestCurrencyConverter.class b/target/test-classes/TestCurrencyConverter.class new file mode 100644 index 0000000000000000000000000000000000000000..999181aba81cb94ad95e42b91c6c15fe2a84ea6a GIT binary patch literal 2491 zcmbW1%~Kn77{|YxgpDNOJy1*AG(=RuLMVMv%S#p#Xr+M`5`y6C5_Z~UlHIu3FyhHe z{{jzMX6nU*w~l(yOb;GBIsOBlJ$J@iXFNH6f14!@8m5sw{Pwrc?|J#`_jz`I`}@hy z04^gRz&Ms<<;iz^1pK%uD{JA;{D4A}i+}JGErxmq$+@ zM5^nu^6M8~=P2>)$a(W~CqJ{gbrOHp0A*$SD-uMieysbEks#0LhHlSE@Q#e;B>0l% zt|p-?tsB~ErMRP6S#_sCOK;lDtA(6u>EhWn`t199S;CogRx8`die+g={vc@@`fdFGbJJ1;FLA%`7bszAIlznfd_MU3zu5TthrdROxGl~N3|pbGG@ifYfHN5 z%wSf$@V~{M*i-k_5GD|37yfe^LKYi-@L>oaVIzc(!T24h z68f7~AepEUFQ~@7_??|S_EbVg@p!X+BdJlgx4|=WP`0%q=gq9pzd!Bd(9QT=OE>I{ zZE0$eeeG*vmf$Z5r-H#bWnPYJ_w#|6FPAxW)JAnSS*t>Ad?VY!Ex6k_A-(z9gdUrY zwvkkg)IB^ByNn@R;`c7DAS59u*GWE!yTp6j*iVqY=f=Z-10dIonBqRY10)Hem+7PE za0*4?70FO5>MSLfB_>$9992TCk(_1ZAoVy$mh;r%LIX*xP7-lRLMM>S z)=3&v>7XkAi)Dx`F{&c;80PwF154|w%r#@_AxmEv{Z+K6%NSYSAj>7PjFV;JR4j=) zOT9x~Vpg0EooTH@Qyly&?9f$q=o&k8y@BMYLmtjfZEjEMkWwdU=+Mh#84Tlm6)m#d zpeoZ;WrnKEQkA&|mexBo-;5 Date: Tue, 13 Feb 2018 17:29:11 -0500 Subject: [PATCH 2/6] wrapping up tests --- src/main/java/CurrencyConverter.java | 4 + src/test/java/TestCurrencyConverter.java | 216 ++++++++++++++---- target/classes/CurrencyConverter.class | Bin 1450 -> 1646 bytes .../test-classes/TestCurrencyConverter.class | Bin 2491 -> 3724 bytes 4 files changed, 180 insertions(+), 40 deletions(-) diff --git a/src/main/java/CurrencyConverter.java b/src/main/java/CurrencyConverter.java index da5a113..fd7214a 100644 --- a/src/main/java/CurrencyConverter.java +++ b/src/main/java/CurrencyConverter.java @@ -13,6 +13,10 @@ public class CurrencyConverter { public static final double JAPANESE_YEN = 115.84; public static final double CHINESE_YUAN = 6.92; + public static double convertFromForeignAToForiegnB (double denomination, double originalCurrency, double newCurrency){ + return convertFromDollars(convertToDollars(denomination,originalCurrency), newCurrency); + } + public static double convertFromDollars(double denominationInDollars, double targetCurrency) { double workingDollars = multiplyBy100(denominationInDollars); return divideBy100(Math.round(workingDollars * targetCurrency)); diff --git a/src/test/java/TestCurrencyConverter.java b/src/test/java/TestCurrencyConverter.java index 93d765c..d9ad538 100644 --- a/src/test/java/TestCurrencyConverter.java +++ b/src/test/java/TestCurrencyConverter.java @@ -6,85 +6,221 @@ public class TestCurrencyConverter { @Test public void testMultiplyBy100(){ - double expectedNumber = 6832; - double actual = CurrencyConverter.multiplyBy100(CurrencyConverter.INDIAN_RUPEE); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 68.32; + + //When + double actual = CurrencyConverter.multiplyBy100(initialValue); + + //Then + double expectedValue = 6832; + Assert.assertTrue(actual == expectedValue); + + } @Test public void testDivideBy100(){ - double expectedNumber = 68.32; - double actual = CurrencyConverter.divideBy100(CurrencyConverter.multiplyBy100(CurrencyConverter.INDIAN_RUPEE)); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = CurrencyConverter.multiplyBy100(CurrencyConverter.INDIAN_RUPEE); + + //When + double actual = CurrencyConverter.divideBy100(initialValue); + + //Then + double expectedValue = 68.32; + Assert.assertTrue(actual == expectedValue); } @Test public void testConvertFromDollars(){ - double expectedNumber = 68.32; - double actual = CurrencyConverter.convertFromDollars(1, CurrencyConverter.INDIAN_RUPEE); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 1; + + //When + double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.INDIAN_RUPEE); + + //Then + double expectedValue = 68.32; + Assert.assertTrue(actual == expectedValue); } @Test public void testConvertFromDollarsWithDecimal(){ - double expectedNumber = 102.48; - double actual = CurrencyConverter.convertFromDollars(1.5, CurrencyConverter.INDIAN_RUPEE); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 1.5; + + //When + double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.INDIAN_RUPEE); + + //Then + double expectedValue = 102.48; + Assert.assertTrue(actual == expectedValue); } @Test public void testConvertFromDollarsWithDecimal2(){ - double expectedNumber = 136.3; - double actual = CurrencyConverter.convertFromDollars(100.96, CurrencyConverter.AUSTRALIAN_DOLLAR); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 100.96; + + //When + double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.AUSTRALIAN_DOLLAR); + + //Then + double expectedValue =136.3; + Assert.assertTrue(actual == expectedValue); + } @Test public void testConvertToDollars(){ - double expectedNumber = 1; - double actual = CurrencyConverter.convertToDollars(68.32, CurrencyConverter.INDIAN_RUPEE); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 68.32; + + //When + double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.INDIAN_RUPEE); + + //Then + double expectedValue = 1; + Assert.assertTrue(actual == expectedValue); } @Test public void testConvertToDollarsWithDecimal(){ - double expectedNumber = 14.56; - double actual = CurrencyConverter.convertToDollars(100.76, CurrencyConverter.CHINESE_YUAN); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 100.76; + + //When + double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.CHINESE_YUAN); + + //Then + double expectedValue = 14.56; + Assert.assertTrue(actual == expectedValue); } @Test public void testConvertToDollarsWithDecimal2(){ - double expectedNumber = 9531.84; - double actual = CurrencyConverter.convertToDollars(12582.03, CurrencyConverter.CANADIAN_DOLLAR); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 12582.03; + + //When + double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.CANADIAN_DOLLAR); + + //Then + double expectedValue = 9531.84; + Assert.assertTrue(actual == expectedValue); } @Test public void testDollarToEuro(){ - double expectedNumber = 94; - double actual = CurrencyConverter.convertFromDollars(100,CurrencyConverter.EURO); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.EURO); + + //Then + double expectedValue =94; + Assert.assertTrue(actual == expectedValue); } @Test public void testEuroToDollar(){ - double expectedNumber = 106.38; - double actual = CurrencyConverter.convertToDollars(100,CurrencyConverter.EURO); - System.out.println(actual); - Assert.assertTrue(actual == expectedNumber); + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.EURO); + + //Then + double expectedValue = 106.38; + Assert.assertTrue(actual == expectedValue); + } + + @Test + public void testEuroToBritishPound(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.EURO, CurrencyConverter.BRITISH_POUND); + + //Then + double expectedValue = 87.23; + Assert.assertTrue(actual == expectedValue); + } + + @Test + public void testBritishPoundToIndianRupee(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.BRITISH_POUND, CurrencyConverter.INDIAN_RUPEE); + + //Then + double expectedValue = 8331.62; + Assert.assertTrue(actual == expectedValue); + } + + @Test + public void testIndianRupeeToCanadianDollar(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.INDIAN_RUPEE, CurrencyConverter.CANADIAN_DOLLAR); + + //Then + double expectedValue = 1.93; + Assert.assertTrue(actual == expectedValue);; + } + + @Test + public void testCanadianDollarToSingaporeDollar(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.CANADIAN_DOLLAR, CurrencyConverter.SINGAPORE_DOLLAR); + + //Then + double expectedValue = 108.34; + Assert.assertTrue(actual == expectedValue);; } + @Test + public void testSingaporeDollarToSwissFranc(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.SINGAPORE_DOLLAR, CurrencyConverter.SWISS_FRANC); + + //Then + double expectedValue = 70.63; + Assert.assertTrue(actual == expectedValue);; + } + + @Test + public void testSwissFrancToMalaysianRinggit(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.SWISS_FRANC, CurrencyConverter.MALAYSIAN_RINGGIT); + + //Then + double expectedValue = 442.57; + Assert.assertTrue(actual == expectedValue);; + } } diff --git a/target/classes/CurrencyConverter.class b/target/classes/CurrencyConverter.class index 3886b8640a7edf8a59f61f26298cbe1ff7bda736..4b59398fe6cc20dfca29cb651b9eb6fd7090f1cd 100644 GIT binary patch delta 898 zcmZ{i%Wl&^7=_QcuH7U9YC{NZp-KeQa=DjVDc7VmX;W@31PV)3tSExol2t&6MfPlY z2NvB_6$>mDJOB^F6ClKy(KH%BSjs>1#lOEZGxm1rhn)NV>+3fFvv^uW5qFCy;GQb? zRe4avD%RBOq1SlEHeNm+`RMGPelOOiHqzuxoNcwTbhDLaaj%;+J1J+qxSK2pcwrPp zGm(IN5hv+pFL}PzOA~=nc63Rv7GGysoNT-kC?)aRJ^K7fG)3(U&Pv?EHHoXLEF$vp zSmFuRC6*9<{OPRp3tTc#!UTU30{ch~_LD~~9wQ&HxI(U4e26?@@g(Vp#Z%;(#dY#g z#eEZajDJj94FNf{c!qq^;#2UrSZWGhgnwD1PtLktJ)nKZ~+%N z7H|odRla(<4VSGvh9J!0jJr98c8Ct&>7HXuJL+_))0(4AT_s%M%+a%X&RlwV)=W~` zj?tEb9PYe3?uIXO41dVs4eWg$zk2*2^Q%@w8P`oj88>u<$9mI5@SXlQBKK(xpzpS{yP&=} jV{91XNKk3OPyf{&=US&N-3XSo&ZE4obpk8YJGk>3sFPW^ delta 702 zcmZ{i%TB^T7==$Sv`{7*8g7ajhz5~}ct=zO6;bfEapN0kT<`!c*t_*D+!*3Q;=%{; zVSEJRnXw_G#4e`uP5(LHKW#t7Q?&H)_4W>61(zPeIP&14<>447a@KYl*L=v!MaRWy zzjAN9M9sR9SVT!+7d01W0_V68XrT6ZYjt`qV}K|o5P=7SGr)u(k7+zkj%nYo8_@MF0th@?*{Lo;wy~4IzySG zqZTbJb1r@g`0iFo5v*Zd`sMB`*enJ7`~YUvPTPgM0j!4s>}Rf;Ob6X2#~AB;6_i)i@MYIJ2qPl8S!}U1jKvDw0&BekrO$#r9CK6Dasm14WZcn~jKk93jD90%~mBjdF#8<@c|L%I+aOI5clIy>} z|I_Dw|KHudzO`_fh}vi_Krwofj}3*7U+=jX4$wU$@UewU=p+iz6eazXVo{M@p5mi_ z8$HCw4xP^r-8fl?#=guuKLz&j(WSHObB>P*=-&`zKSs3%|2L{GZlAmTc;vbe2 zNq>Z+vPjbyN8U~~C2|z%mlW|pZgxu462g>>$eMmNDad1jCb8dE(5p{NS&r`OPl#E) zGpA{ylAP~Ul{rz_(2 zzy_Fma*T}QY!y7G)NhegLIU%AZ6J_ zryNIBD=v$qvV~h@K}oj^PR*bIQHit5tJWKdH=$B1Zr5CUHj6R`Tre65ja9QZGQl3B zRVil?u1T7Y#IgePMdId)R%hWnQJXc6@!iO?lvdgkDq515Ryy#wU@GQP14Z$AW1mXm zSXyxH#IF{7bNKc(e@@)TXm}`&D{ls=3+2u`wULbE-p8U60T}M8Q4q(=5DyIs%7nm9f8@n_kij~OR#Y@$+pZc&{ zIaSf4Xq91f1@)ulqXCR$!UOo`Xwde|Tb>4ZpkbtPkUXxW4Y-X>xY0U*>hag$AT?Md zzfB6-q{VdP@M(xAa`bt0yZdA1T_wt#u`}gA@m;2c%w* z`bs2?*d+VdjLJ3+uBtEO3K|4x7@$!c+Zc{*+yN>ao0m3P#}=fuR%sVIwuB9G9NRi} zZ0qw>g&bA8k|seq0@4(6lthkF4$}WQw$YVHn;5CqB-Oi;B#>l~RFE4xyn9->?6o7LG}q`pF;LoiL%2* zW%y^j%RJ2oTxAQ8eF52J$i9MX5wa^K$|j4-c7Jy9(JikbMi;HORh)?1vI% mj~A8g4%1#!w$D}eBV<2A_6uacLiQVEzn3U`0#BBQj{F0CCX?R) literal 2491 zcmbW1%~Kn77{|YxgpDNOJy1*AG(=RuLMVMv%S#p#Xr+M`5`y6C5_Z~UlHIu3FyhHe z{{jzMX6nU*w~l(yOb;GBIsOBlJ$J@iXFNH6f14!@8m5sw{Pwrc?|J#`_jz`I`}@hy z04^gRz&Ms<<;iz^1pK%uD{JA;{D4A}i+}JGErxmq$+@ zM5^nu^6M8~=P2>)$a(W~CqJ{gbrOHp0A*$SD-uMieysbEks#0LhHlSE@Q#e;B>0l% zt|p-?tsB~ErMRP6S#_sCOK;lDtA(6u>EhWn`t199S;CogRx8`die+g={vc@@`fdFGbJJ1;FLA%`7bszAIlznfd_MU3zu5TthrdROxGl~N3|pbGG@ifYfHN5 z%wSf$@V~{M*i-k_5GD|37yfe^LKYi-@L>oaVIzc(!T24h z68f7~AepEUFQ~@7_??|S_EbVg@p!X+BdJlgx4|=WP`0%q=gq9pzd!Bd(9QT=OE>I{ zZE0$eeeG*vmf$Z5r-H#bWnPYJ_w#|6FPAxW)JAnSS*t>Ad?VY!Ex6k_A-(z9gdUrY zwvkkg)IB^ByNn@R;`c7DAS59u*GWE!yTp6j*iVqY=f=Z-10dIonBqRY10)Hem+7PE za0*4?70FO5>MSLfB_>$9992TCk(_1ZAoVy$mh;r%LIX*xP7-lRLMM>S z)=3&v>7XkAi)Dx`F{&c;80PwF154|w%r#@_AxmEv{Z+K6%NSYSAj>7PjFV;JR4j=) zOT9x~Vpg0EooTH@Qyly&?9f$q=o&k8y@BMYLmtjfZEjEMkWwdU=+Mh#84Tlm6)m#d zpeoZ;WrnKEQkA&|mexBo-;5 Date: Tue, 13 Feb 2018 17:44:42 -0500 Subject: [PATCH 3/6] turning in --- src/test/java/TestCurrencyConverter.java | 28 ++++++++++++++++++ .../test-classes/TestCurrencyConverter.class | Bin 3724 -> 4126 bytes 2 files changed, 28 insertions(+) diff --git a/src/test/java/TestCurrencyConverter.java b/src/test/java/TestCurrencyConverter.java index d9ad538..b4a06d1 100644 --- a/src/test/java/TestCurrencyConverter.java +++ b/src/test/java/TestCurrencyConverter.java @@ -222,5 +222,33 @@ public void testSwissFrancToMalaysianRinggit(){ Assert.assertTrue(actual == expectedValue);; } + @Test + public void testMalaysianRinggitToJapaneseYen(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.MALAYSIAN_RINGGIT, CurrencyConverter.JAPANESE_YEN); + + //Then + double expectedValue = 2591.34; + Assert.assertTrue(actual == expectedValue);; + } + + @Test + public void testJapaneseYenToChineseYuan(){ + //Given + double initialValue = 100; + + //When + double actual = CurrencyConverter.convertFromForeignAToForiegnB + (initialValue,CurrencyConverter.JAPANESE_YEN, CurrencyConverter.CHINESE_YUAN); + + //Then + double expectedValue = 5.95; + Assert.assertTrue(actual == expectedValue);; + } + } diff --git a/target/test-classes/TestCurrencyConverter.class b/target/test-classes/TestCurrencyConverter.class index 4ebcc729db9f546f68d4b7804bf58b50088b4f8e..49325adc0e27136fee1b3f77825203f9c969883c 100644 GIT binary patch literal 4126 zcmbu=eQXnT7zgm@y7uZyu^V)}4A=`0=oVlgQGyeCV`Ypv7#n31nBuKHyPMrzxn2k5 zEhGjL^bbui;U$s8S2Qt*QDZ|QQTT@_ivFX~L=B0FM${OS5nmGG_jh+aZn$#BcFFbE z=lAxx=l9(0qnqb15YY-c6rc_o=7rwyzH1xKh68jL$-Hp>96E^tG(wO2Db1pz?4t0| zKa3vYh3%&cz1NS_qp>FQ(wBiXe02OI`<&thvC?R;87lghv+muzFz2kX2`?Q`4jUm}*l_|I*A@8aPv*{SpA0W-`_x+XgY{Pj zBjcC&=uLJ@`>yfP8&*TuS#$B3!N?6h`defittQ;~Yvy7?b#cu8*9{CW46-2@EWEsy zEz`*hGq14ECw|)PCygWi0a=mtwH#GMn)*5NwyQ~rqfoc3NSkw`Ly{I3hth~l>sAwD zx?j{}_S*`2^7(ai3+l-1jFnkFfUe7mZQNt!NctsGVB=-8A?>vATYUzcC8d^tx! zwxP_{O6RaJ7Xv~}=s7XX(Nt+~MoQ>X((0Vums50kRO*+rGPZ3~6jc{>SyixWRky08 zT1IkMt%dE6?Lut3m^>yYC2O-8EMkc|G<7tlrqiN^*^QHT49NO$OiIY3Of%ng%sm{1 z9fRVky?*^<;R&lZxQxKsRcwg4WL#aJ(^Mll#S}%*&vfEg zT5#QnUoH6N@a=1UkGQwc@K6`7ycwhi(GFVeZrX%j9BsyAk1=_SyyQo$E=-=z#Rc+q zg~_+t*EGv_{1o}UXUJPoApfmZXOIu01DG|HDyfR@rfQl;VPltOM6nW?yLhRVdT0xF ztE3w0MXLg%tEdkxA8o}*CXC~oqiwb)Z+RNwfrgPPLGrkgX5%*I;zsKMYQSHkgVbn| z{5C0Qld4OQ`fbu4i&P)#Tx_TU{|U4R8E!(RmQaY6A}h-rpn41BLGH{P1#D2L1Zcnp zIdU|`L7M8Cqm{Um`;ep6$kF}CQLBSg%#qh7x##Gi$w)?)std%jG~Jcd22u>94Ip)b z)Kw;FyG^o>&8TeS;A*-;uAm-(`T*L7W9!GU4LCr>WAoA+>)3*L7R}Nwb!?;)|E5}(k_sOkfQ{0lys2(&#~>Cj5L>#>P%9DD@g_^4U!5{2Bh6(k_IOu z&1a;AW+g3hC9yYI9;5>x9R%r6nWTsBL}CXQaV0$g(vu(^1?ee}o-UL0h)p_-mnVB| zFAS5Jr7$%YXbDtH@1Uy1ETU(jI!06IIaK&@yt+@&0y^oCEwo?Y4OW$h?3Yux#LH<{ zNm;Y;Dr9HMls#Hf<}vD>$yT_^-hk{)$j(9bHe~NW_HLOn zv7`+Dj8~ecd9SPNJY?@fb^)>vA-f3Kr7~qhC1oqaw91sNc9mU*>|@BTKz0?f&mjA} zOj)9&Y*mcZ{{Te2<}3gJ literal 3724 zcmbu=ZEO>D90%~mBjdF#8<@c|L%I+aOI5clIy>} z|I_Dw|KHudzO`_fh}vi_Krwofj}3*7U+=jX4$wU$@UewU=p+iz6eazXVo{M@p5mi_ z8$HCw4xP^r-8fl?#=guuKLz&j(WSHObB>P*=-&`zKSs3%|2L{GZlAmTc;vbe2 zNq>Z+vPjbyN8U~~C2|z%mlW|pZgxu462g>>$eMmNDad1jCb8dE(5p{NS&r`OPl#E) zGpA{ylAP~Ul{rz_(2 zzy_Fma*T}QY!y7G)NhegLIU%AZ6J_ zryNIBD=v$qvV~h@K}oj^PR*bIQHit5tJWKdH=$B1Zr5CUHj6R`Tre65ja9QZGQl3B zRVil?u1T7Y#IgePMdId)R%hWnQJXc6@!iO?lvdgkDq515Ryy#wU@GQP14Z$AW1mXm zSXyxH#IF{7bNKc(e@@)TXm}`&D{ls=3+2u`wULbE-p8U60T}M8Q4q(=5DyIs%7nm9f8@n_kij~OR#Y@$+pZc&{ zIaSf4Xq91f1@)ulqXCR$!UOo`Xwde|Tb>4ZpkbtPkUXxW4Y-X>xY0U*>hag$AT?Md zzfB6-q{VdP@M(xAa`bt0yZdA1T_wt#u`}gA@m;2c%w* z`bs2?*d+VdjLJ3+uBtEO3K|4x7@$!c+Zc{*+yN>ao0m3P#}=fuR%sVIwuB9G9NRi} zZ0qw>g&bA8k|seq0@4(6lthkF4$}WQw$YVHn;5CqB-Oi;B#>l~RFE4xyn9->?6o7LG}q`pF;LoiL%2* zW%y^j%RJ2oTxAQ8eF52J$i9MX5wa^K$|j4-c7Jy9(JikbMi;HORh)?1vI% mj~A8g4%1#!w$D}eBV<2A_6uacLiQVEzn3U`0#BBQj{F0CCX?R) From 2b8bb9af1fadb193859b6d9ee036fe9f0b4ca0f5 Mon Sep 17 00:00:00 2001 From: Eric Barnaba Date: Thu, 15 Feb 2018 15:54:19 -0500 Subject: [PATCH 4/6] refactored to be object oriented --- src/main/java/AustralianDollar.java | 7 ++ src/main/java/BritishPound.java | 7 ++ src/main/java/CanadianDollar.java | 7 ++ src/main/java/ChineseYuan.java | 7 ++ src/main/java/Currency.java | 41 ++++++++ src/main/java/CurrencyConverter.java | 40 -------- src/main/java/Dollar.java | 8 ++ src/main/java/Euro.java | 7 ++ src/main/java/IndianRupee.java | 7 ++ src/main/java/JapaneseYen.java | 7 ++ src/main/java/MalaysianRinggit.java | 7 ++ src/main/java/SingaporeDollar.java | 7 ++ src/main/java/SwissFranc.java | 7 ++ ...encyConverter.java => TestCurrencies.java} | 93 ++++++++++++------ target/classes/AustralianDollar.class | Bin 0 -> 308 bytes target/classes/BritishPound.class | Bin 0 -> 311 bytes target/classes/CanadianDollar.class | Bin 0 -> 302 bytes target/classes/ChineseYuan.class | Bin 0 -> 293 bytes target/classes/Currency.class | Bin 0 -> 1375 bytes target/classes/CurrencyConverter.class | Bin 1646 -> 0 bytes target/classes/Dollar.class | Bin 0 -> 278 bytes target/classes/Euro.class | Bin 0 -> 286 bytes target/classes/IndianRupee.class | Bin 0 -> 293 bytes target/classes/JapaneseYen.class | Bin 0 -> 293 bytes target/classes/MalaysianRinggit.class | Bin 0 -> 308 bytes target/classes/SingaporeDollar.class | Bin 0 -> 305 bytes target/classes/SwissFranc.class | Bin 0 -> 290 bytes target/test-classes/TestCurrencies.class | Bin 0 -> 5452 bytes .../test-classes/TestCurrencyConverter.class | Bin 4126 -> 0 bytes 29 files changed, 183 insertions(+), 69 deletions(-) create mode 100644 src/main/java/AustralianDollar.java create mode 100644 src/main/java/BritishPound.java create mode 100644 src/main/java/CanadianDollar.java create mode 100644 src/main/java/ChineseYuan.java create mode 100644 src/main/java/Currency.java delete mode 100644 src/main/java/CurrencyConverter.java create mode 100644 src/main/java/Dollar.java create mode 100644 src/main/java/Euro.java create mode 100644 src/main/java/IndianRupee.java create mode 100644 src/main/java/JapaneseYen.java create mode 100644 src/main/java/MalaysianRinggit.java create mode 100644 src/main/java/SingaporeDollar.java create mode 100644 src/main/java/SwissFranc.java rename src/test/java/{TestCurrencyConverter.java => TestCurrencies.java} (61%) create mode 100644 target/classes/AustralianDollar.class create mode 100644 target/classes/BritishPound.class create mode 100644 target/classes/CanadianDollar.class create mode 100644 target/classes/ChineseYuan.class create mode 100644 target/classes/Currency.class delete mode 100644 target/classes/CurrencyConverter.class create mode 100644 target/classes/Dollar.class create mode 100644 target/classes/Euro.class create mode 100644 target/classes/IndianRupee.class create mode 100644 target/classes/JapaneseYen.class create mode 100644 target/classes/MalaysianRinggit.class create mode 100644 target/classes/SingaporeDollar.class create mode 100644 target/classes/SwissFranc.class create mode 100644 target/test-classes/TestCurrencies.class delete mode 100644 target/test-classes/TestCurrencyConverter.class diff --git a/src/main/java/AustralianDollar.java b/src/main/java/AustralianDollar.java new file mode 100644 index 0000000..c56d098 --- /dev/null +++ b/src/main/java/AustralianDollar.java @@ -0,0 +1,7 @@ +public class AustralianDollar extends Currency{ + private double exchangeRate; + + public AustralianDollar(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/BritishPound.java b/src/main/java/BritishPound.java new file mode 100644 index 0000000..1f88d16 --- /dev/null +++ b/src/main/java/BritishPound.java @@ -0,0 +1,7 @@ +public class BritishPound extends Currency{ + private double exhcangeRate; + + public BritishPound(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/CanadianDollar.java b/src/main/java/CanadianDollar.java new file mode 100644 index 0000000..f9847c5 --- /dev/null +++ b/src/main/java/CanadianDollar.java @@ -0,0 +1,7 @@ +public class CanadianDollar extends Currency{ + private double exchangeRate; + + public CanadianDollar(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/ChineseYuan.java b/src/main/java/ChineseYuan.java new file mode 100644 index 0000000..7622876 --- /dev/null +++ b/src/main/java/ChineseYuan.java @@ -0,0 +1,7 @@ +public class ChineseYuan extends Currency { + private double exchangeRate; + + public ChineseYuan(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/Currency.java b/src/main/java/Currency.java new file mode 100644 index 0000000..f782bad --- /dev/null +++ b/src/main/java/Currency.java @@ -0,0 +1,41 @@ +public abstract class Currency { + private double exchangeRate; + + public Currency(double exchangeRate){ + this.exchangeRate = exchangeRate; + } + + protected void changeRate(double newRate){ + this.exchangeRate = newRate; + } + + protected double getRate(){ + return this.exchangeRate; + } + + protected double convertToNewCurrency(double denomination, Currency newCurrency) { + return newCurrency.convertFromDollars(this.convertToDollars(denomination)); + } + + protected double convertFromDollars(double denominationInDollars) { + double workingDollars = multiplyBy100(denominationInDollars); + return divideBy100(Math.round(workingDollars * this.getRate())); + } + + protected double convertToDollars(double denominationInForeignCurrency) { + double workingForeignCurrency = multiplyBy100(denominationInForeignCurrency); + return divideBy100(Math.round(workingForeignCurrency / this.getRate())); + } + + + protected double multiplyBy100(double valueToMultiply) { + double multipliedValue = Math.round(valueToMultiply * 100); + return multipliedValue; + } + + protected double divideBy100(double valueToDivide) { + double dividedValue = valueToDivide / 100; + return dividedValue; + } + +} diff --git a/src/main/java/CurrencyConverter.java b/src/main/java/CurrencyConverter.java deleted file mode 100644 index fd7214a..0000000 --- a/src/main/java/CurrencyConverter.java +++ /dev/null @@ -1,40 +0,0 @@ - - -public class CurrencyConverter { - public static final double 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 = 6.92; - - public static double convertFromForeignAToForiegnB (double denomination, double originalCurrency, double newCurrency){ - return convertFromDollars(convertToDollars(denomination,originalCurrency), newCurrency); - } - - public static double convertFromDollars(double denominationInDollars, double targetCurrency) { - double workingDollars = multiplyBy100(denominationInDollars); - return divideBy100(Math.round(workingDollars * targetCurrency)); - } - - public static double convertToDollars(double denominationInForeignCurrency, double oldCurrency){ - double workingForeignCurrency = multiplyBy100(denominationInForeignCurrency); - return divideBy100(Math.round(workingForeignCurrency / oldCurrency)); - } - - public static double multiplyBy100(double valueToMultiply) { - double multipliedValue = Math.round(valueToMultiply * 100); - return multipliedValue; - } - - public static double divideBy100(double valueToDivide) { - double dividedValue = valueToDivide / 100; - return dividedValue; - } - -} diff --git a/src/main/java/Dollar.java b/src/main/java/Dollar.java new file mode 100644 index 0000000..28da954 --- /dev/null +++ b/src/main/java/Dollar.java @@ -0,0 +1,8 @@ +public class Dollar extends Currency { +private double exchangeRate; + + + public Dollar(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/Euro.java b/src/main/java/Euro.java new file mode 100644 index 0000000..082f8bb --- /dev/null +++ b/src/main/java/Euro.java @@ -0,0 +1,7 @@ +public class Euro extends Currency { + private double exhangeRate; + + public Euro(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/IndianRupee.java b/src/main/java/IndianRupee.java new file mode 100644 index 0000000..5b9ddfd --- /dev/null +++ b/src/main/java/IndianRupee.java @@ -0,0 +1,7 @@ +public class IndianRupee extends Currency{ + private double exchangeRate; + + public IndianRupee(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/JapaneseYen.java b/src/main/java/JapaneseYen.java new file mode 100644 index 0000000..82b1e20 --- /dev/null +++ b/src/main/java/JapaneseYen.java @@ -0,0 +1,7 @@ +public class JapaneseYen extends Currency { + private double exchangeRate; + + public JapaneseYen(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/MalaysianRinggit.java b/src/main/java/MalaysianRinggit.java new file mode 100644 index 0000000..e98be99 --- /dev/null +++ b/src/main/java/MalaysianRinggit.java @@ -0,0 +1,7 @@ +public class MalaysianRinggit extends Currency{ + private double exchangeRate; + + public MalaysianRinggit(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/SingaporeDollar.java b/src/main/java/SingaporeDollar.java new file mode 100644 index 0000000..ddcbb7a --- /dev/null +++ b/src/main/java/SingaporeDollar.java @@ -0,0 +1,7 @@ +public class SingaporeDollar extends Currency { + private double exchangeRate; + + public SingaporeDollar(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/main/java/SwissFranc.java b/src/main/java/SwissFranc.java new file mode 100644 index 0000000..a58bb82 --- /dev/null +++ b/src/main/java/SwissFranc.java @@ -0,0 +1,7 @@ +public class SwissFranc extends Currency { + private double exchangeRate; + + public SwissFranc(double exchangeRate) { + super(exchangeRate); + } +} diff --git a/src/test/java/TestCurrencyConverter.java b/src/test/java/TestCurrencies.java similarity index 61% rename from src/test/java/TestCurrencyConverter.java rename to src/test/java/TestCurrencies.java index b4a06d1..79cf9b4 100644 --- a/src/test/java/TestCurrencyConverter.java +++ b/src/test/java/TestCurrencies.java @@ -1,16 +1,59 @@ import org.junit.Assert; //import org.junit.Before; +import org.junit.Before; import org.junit.Test; -public class TestCurrencyConverter { +public class TestCurrencies { + + Dollar dollar; + AustralianDollar australianDollar; + BritishPound britishPound; + CanadianDollar canadianDollar; + ChineseYuan chineseYuan; + Euro euro; + IndianRupee indianRupee; + JapaneseYen japaneseYen; + MalaysianRinggit malaysianRinggit; + SingaporeDollar singaporeDollar; + SwissFranc swissFranc; + + @Before + public void setUp() { + dollar = new Dollar(1.00); + australianDollar = new AustralianDollar(1.35); + britishPound = new BritishPound(0.82); + canadianDollar = new CanadianDollar(1.32); + chineseYuan = new ChineseYuan(6.92); + euro = new Euro(0.94); + indianRupee = new IndianRupee(68.32); + japaneseYen = new JapaneseYen(115.84); + malaysianRinggit = new MalaysianRinggit(4.47); + singaporeDollar = new SingaporeDollar(1.43); + swissFranc = new SwissFranc(1.01); + } + + @Test + public void testChangeRate(){ + //Given + indianRupee.changeRate(1000); + + //When + double actual = indianRupee.getRate(); + + //Then + double expectedValue = 1000; + Assert.assertTrue(actual == expectedValue); + + + } @Test public void testMultiplyBy100(){ //Given - double initialValue = 68.32; + double initialValue = this.indianRupee.getRate(); //When - double actual = CurrencyConverter.multiplyBy100(initialValue); + double actual = indianRupee.multiplyBy100(initialValue); //Then double expectedValue = 6832; @@ -22,10 +65,10 @@ public void testMultiplyBy100(){ @Test public void testDivideBy100(){ //Given - double initialValue = CurrencyConverter.multiplyBy100(CurrencyConverter.INDIAN_RUPEE); + double initialValue = indianRupee.multiplyBy100(indianRupee.getRate()); //When - double actual = CurrencyConverter.divideBy100(initialValue); + double actual = indianRupee.divideBy100(initialValue); //Then double expectedValue = 68.32; @@ -38,7 +81,7 @@ public void testConvertFromDollars(){ double initialValue = 1; //When - double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.INDIAN_RUPEE); + double actual = indianRupee.convertFromDollars(initialValue); //Then double expectedValue = 68.32; @@ -51,7 +94,7 @@ public void testConvertFromDollarsWithDecimal(){ double initialValue = 1.5; //When - double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.INDIAN_RUPEE); + double actual = indianRupee.convertFromDollars(initialValue); //Then double expectedValue = 102.48; @@ -65,7 +108,7 @@ public void testConvertFromDollarsWithDecimal2(){ double initialValue = 100.96; //When - double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.AUSTRALIAN_DOLLAR); + double actual = australianDollar.convertFromDollars(initialValue); //Then double expectedValue =136.3; @@ -79,7 +122,7 @@ public void testConvertToDollars(){ double initialValue = 68.32; //When - double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.INDIAN_RUPEE); + double actual = indianRupee.convertToDollars(initialValue); //Then double expectedValue = 1; @@ -92,7 +135,7 @@ public void testConvertToDollarsWithDecimal(){ double initialValue = 100.76; //When - double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.CHINESE_YUAN); + double actual = chineseYuan.convertToDollars(initialValue); //Then double expectedValue = 14.56; @@ -105,7 +148,7 @@ public void testConvertToDollarsWithDecimal2(){ double initialValue = 12582.03; //When - double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.CANADIAN_DOLLAR); + double actual = canadianDollar.convertToDollars(initialValue); //Then double expectedValue = 9531.84; @@ -118,7 +161,7 @@ public void testDollarToEuro(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromDollars(initialValue, CurrencyConverter.EURO); + double actual = euro.convertFromDollars(initialValue); //Then double expectedValue =94; @@ -131,7 +174,7 @@ public void testEuroToDollar(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertToDollars(initialValue, CurrencyConverter.EURO); + double actual = euro.convertToDollars(initialValue); //Then double expectedValue = 106.38; @@ -144,8 +187,7 @@ public void testEuroToBritishPound(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.EURO, CurrencyConverter.BRITISH_POUND); + double actual = euro.convertToNewCurrency(initialValue, britishPound); //Then double expectedValue = 87.23; @@ -158,8 +200,7 @@ public void testBritishPoundToIndianRupee(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.BRITISH_POUND, CurrencyConverter.INDIAN_RUPEE); + double actual = britishPound.convertToNewCurrency(initialValue, indianRupee); //Then double expectedValue = 8331.62; @@ -172,8 +213,7 @@ public void testIndianRupeeToCanadianDollar(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.INDIAN_RUPEE, CurrencyConverter.CANADIAN_DOLLAR); + double actual = indianRupee.convertToNewCurrency(initialValue, canadianDollar); //Then double expectedValue = 1.93; @@ -186,8 +226,7 @@ public void testCanadianDollarToSingaporeDollar(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.CANADIAN_DOLLAR, CurrencyConverter.SINGAPORE_DOLLAR); + double actual = canadianDollar.convertToNewCurrency(initialValue, singaporeDollar); //Then double expectedValue = 108.34; @@ -200,8 +239,7 @@ public void testSingaporeDollarToSwissFranc(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.SINGAPORE_DOLLAR, CurrencyConverter.SWISS_FRANC); + double actual = singaporeDollar.convertToNewCurrency(initialValue, swissFranc); //Then double expectedValue = 70.63; @@ -214,8 +252,7 @@ public void testSwissFrancToMalaysianRinggit(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.SWISS_FRANC, CurrencyConverter.MALAYSIAN_RINGGIT); + double actual = swissFranc.convertToNewCurrency(initialValue, malaysianRinggit); //Then double expectedValue = 442.57; @@ -228,8 +265,7 @@ public void testMalaysianRinggitToJapaneseYen(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.MALAYSIAN_RINGGIT, CurrencyConverter.JAPANESE_YEN); + double actual = malaysianRinggit.convertToNewCurrency(initialValue, japaneseYen); //Then double expectedValue = 2591.34; @@ -242,8 +278,7 @@ public void testJapaneseYenToChineseYuan(){ double initialValue = 100; //When - double actual = CurrencyConverter.convertFromForeignAToForiegnB - (initialValue,CurrencyConverter.JAPANESE_YEN, CurrencyConverter.CHINESE_YUAN); + double actual = japaneseYen.convertToNewCurrency(initialValue, chineseYuan); //Then double expectedValue = 5.95; diff --git a/target/classes/AustralianDollar.class b/target/classes/AustralianDollar.class new file mode 100644 index 0000000000000000000000000000000000000000..df9976d8ef0a6242a9b1feb2cfeb265f7bfa7931 GIT binary patch literal 308 zcmZ8d%SyvQ6g@YlNsZCgLc4e6Vdxu!GB3a!=)hm`?PgDk)?*Mtc6 ZTkIxeXN``~K}y9wy3F_w=urje{{k;!Jd^+c literal 0 HcmV?d00001 diff --git a/target/classes/CanadianDollar.class b/target/classes/CanadianDollar.class new file mode 100644 index 0000000000000000000000000000000000000000..f937ee0c5b10655754b6ae3886d0bd94a5883109 GIT binary patch literal 302 zcmY*UyH3ME5S%rR9gImrkm#ub6iC#dG`6TL3P9;M&WT)P&eCBc_$;bODfj?B3Nf~5 z((F9%wEOeB`v!1>X@UccV@zV42vYM=uGPJmM{SHiazS)woo(iV@FKrl5VCs3Xk1ul z9@^KX@z1)f=uC^c)M}yLcKY88o3(utOo~jMuB^Jet}6Ang5;@geQEA(_x5x@zTW7& zric&=M*ERqn6=&;SAOCg0hb4a7-G;fE{vGYkZR7f%cHB=7V6V!!{5=i`_vz~~Rj#W`gF literal 0 HcmV?d00001 diff --git a/target/classes/ChineseYuan.class b/target/classes/ChineseYuan.class new file mode 100644 index 0000000000000000000000000000000000000000..96605992dc8a5a92574cc8db27d8cedbaab3474f GIT binary patch literal 293 zcmYjMJx{_=6g{_;7D^FhaCbr(NSrk+B~Fcl8WP4wd7;n1Yw~D~{wyXE2Y&!Rig?;M zu-x_KjP3+!+v}k9NbjCqg&P`U8M+HYorA literal 0 HcmV?d00001 diff --git a/target/classes/Currency.class b/target/classes/Currency.class new file mode 100644 index 0000000000000000000000000000000000000000..b7360a522f730832c29dee6ad197633cddf2a05d GIT binary patch literal 1375 zcmaKqZBG+H5Xb-9Ua#$OEe}#u5CIk1ooB1J1yz4El!SIl(4_R;rfw>9Zx8lp5W3Jigm$ zA8>!qK5!{Au`L?5yKnoBT&tiK96BEujP0$C?{lwlx=xE>iL}R0BC&Lf2a%U7l}UKA zA-pd4gFUg!Px|Ey`BHTNll#mj_e9(A?7$Ho!w3NfyC)Q+=8JY!xUTI}H*yjxEDRUE z^x|~>MEJ*!*NOvUaVK$T_TSo?@VV3S2D(#rE|Y8aIBhfaU9@kVs~2Cq5tPICQ@R*vkhZDJIUP2`X_ zaRYNEu1m8h%@tftKAxq>zP< zOB9=;9PP#=3iOqpq>>tC`piwm)X(sYur^CHV~C~4EFG5>i;hC|SD_k4Iw|Wb5}(P5 zTGPW|F2tD828GcujTu$^g4)t#lgn1Ihhz`hS;BZon2(MiZp6T~un{@lEDf3@3f+^U zzNG)XQfFn5Q#X7-F0804A0~wj8vm*z{}_yRO(7 e$rk6ii`4Vd5H}NZGbpQ`6R<)q!|m|q@B9T-W!u>R literal 0 HcmV?d00001 diff --git a/target/classes/CurrencyConverter.class b/target/classes/CurrencyConverter.class deleted file mode 100644 index 4b59398fe6cc20dfca29cb651b9eb6fd7090f1cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1646 zcmZ`(O>@&$6uoj3g*ZxxO>p^Wn)HK=(soGFPbdUiv1~`FBRiHHni*y?imfpMMPh^; zChXaC!y2~i>9E4nMHgN22fAk4&UCtgWvAyo%eH6+&G_n_`|dsG-us^X>fc{~Bce6> zDNSjrrfHJ4nK78DrKwIkY}JqodkDibLFNQm0!dn}T2&hY37SCD#lXKG*?zQZdtFD$ z|I?2ZNGvrQH7Wo1+{4$E=W__$Xy}%1ZtmA>O+%CNf3Dwq_D6bMAXzswT{ZR_&3dUM z6?O&*8MSFz4YkVl`ifHi%@g)K73g$PHB_E9-1?}u^Vg#Vfo4tJsHpW?qclu=%Sw3o zTA(TOrf!=1<%Vh$QLFOi_s6%E1pMpG@W2Tz`@n-ITMb&a zw`+$k!?9D0ZoBsdI#Vrn!_e_t#~AOC6Gl#WO`!Q!AC$x3upESr+woN^z{+(x{sxp4 zP1BZfD018JgG1N1BRB9d5kz!=ya6c&;X4mTD4QVG0?)HU)G!VgT54&FE-t&$(j@MRKF=U08 zdisc6LMzygcQN)j&~@7Uf}-=bd*rsAIB`18(72OLjxPqmX*1}CEvM|V1IrBx8=lGK zJNA(+(`8zbDNomA`hl4uX%p0xX_s!wR3VHob0QOm!g5zU+wZK@4(>RuNT8XKYuk=) z;|Ri_>$m&uZPCa08q@f^rszC=GU1y7O3@7PYyxM1&m{01a4vyA06w3<7l1xY;CbMM z1YQLGB!NE#zLdaAz)Auy1AmdgUy_7cF(lYkRLtH2-s7LYB;f^bVGWiA5slGTu&g-* z(AV@0-jnn#eFqOq)=5MphOngcD0NQk(bzA5Dg2KOC^DR45mane--C=jQ*;HZ6klD% zN(3#AE2gz#+U!z~#H->tQMucr@t=Dnjo8yX`z+*h356_Oj}@}C&J`rs8?gdz#d{Tk z_b6O|!o_zK3PS~TsIU<$;I_pI8hQ}XpS(0j6TEy~`G55bxIv4YJIA|`sl>TiZ)MIs n$*ye7Scn-0((fOaa5sIWsH)ZPc=<)6c^35s0CD)ir%7)?$+_b)jgw7}a LG=39TbOHJ&>lH8} literal 0 HcmV?d00001 diff --git a/target/classes/Euro.class b/target/classes/Euro.class new file mode 100644 index 0000000000000000000000000000000000000000..80244239b3b573f5c05986d2a1b2c813685fb57d GIT binary patch literal 286 zcmYjMyKcfj5S%r}24f(Als;7+MWob3G(ajV1t9ll=M*j?wsf&0@>!{nQt$zM6v~{H zBF)XtL$iCQ^Uo2$111q#xCk){F&6aneyfUCy;7AH$U+c2n!;2wfq%2OO$qbzh1M`J zg?_HzGi^62+ff-OWv+Iqvc~a0(XY1VgC)tbw&he1>wW%jL9{Mwo9idz3c4ufm@gqO4Nk}xgSjCz@M zIYvPNPiL4Fx!Es`x3&H^!*Xk11>Nkyt*vp3>P7WdkUSQZ&-LEc5Bo>i_0GJR z6cJ)U=g1edr^HyhYILaroc#fE>NXJo literal 0 HcmV?d00001 diff --git a/target/classes/JapaneseYen.class b/target/classes/JapaneseYen.class new file mode 100644 index 0000000000000000000000000000000000000000..71b721918c59ce4a81cf54d81b227dd663aa4d38 GIT binary patch literal 293 zcmYjMJx{_=6g{_=7E2LiaCh=!AYs<9KpaTJpoYZpQE%iKcqNb4=+AO8Vekj|ql~AG z1Is<1@8#Z~-~Bg$5e5m4(2LQJaVkjlJzp93qW7j$flLL_t#!5>3&P9k)q*f7o*DHr z>vUdimg*nPa!qHD6}ee2jJLJ^H^XvecY`CBY@;qW3$2VmW`gM6I$KQy;nnPVMVOW^jQVry z%v1fgHvU=H1)b5n%(Pgkw~hWc!)jx$~9d;A4 U^HxVVK}yAb`x-w1J*ohwf1b%aeE0<04OVLuY-ADypT&g4&=26F5GN5+ z7oX>~ul)1-y#a8ANroMaQXHlj3v%;bt<|l}y*5T5g&?`H&Nfp)d{&$<2s8i4XjEEf z?%L<22@krg=}byrX}!>3JN<9Q&Dy>S#^v0)mA?333SZY6t_9iLx1ln(wi`a$$}gYv zO>-nj`P5b>7|z-djH^Cyf{6PALX0u!8FxlXXGk?=+U3c`=@;aaEW$3&j0pAz>}F)g Uy-u))oQnPaHvRzisUjTw0b8XzGXMYp literal 0 HcmV?d00001 diff --git a/target/classes/SwissFranc.class b/target/classes/SwissFranc.class new file mode 100644 index 0000000000000000000000000000000000000000..50aac6ea9f87a17e489cff83b445a7d271883674 GIT binary patch literal 290 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 ayj)e}sv*}ra@CTnZiZYx;P<@%PyHXzC6kQ+ literal 0 HcmV?d00001 diff --git a/target/test-classes/TestCurrencyConverter.class b/target/test-classes/TestCurrencyConverter.class deleted file mode 100644 index 49325adc0e27136fee1b3f77825203f9c969883c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4126 zcmbu=eQXnT7zgm@y7uZyu^V)}4A=`0=oVlgQGyeCV`Ypv7#n31nBuKHyPMrzxn2k5 zEhGjL^bbui;U$s8S2Qt*QDZ|QQTT@_ivFX~L=B0FM${OS5nmGG_jh+aZn$#BcFFbE z=lAxx=l9(0qnqb15YY-c6rc_o=7rwyzH1xKh68jL$-Hp>96E^tG(wO2Db1pz?4t0| zKa3vYh3%&cz1NS_qp>FQ(wBiXe02OI`<&thvC?R;87lghv+muzFz2kX2`?Q`4jUm}*l_|I*A@8aPv*{SpA0W-`_x+XgY{Pj zBjcC&=uLJ@`>yfP8&*TuS#$B3!N?6h`defittQ;~Yvy7?b#cu8*9{CW46-2@EWEsy zEz`*hGq14ECw|)PCygWi0a=mtwH#GMn)*5NwyQ~rqfoc3NSkw`Ly{I3hth~l>sAwD zx?j{}_S*`2^7(ai3+l-1jFnkFfUe7mZQNt!NctsGVB=-8A?>vATYUzcC8d^tx! zwxP_{O6RaJ7Xv~}=s7XX(Nt+~MoQ>X((0Vums50kRO*+rGPZ3~6jc{>SyixWRky08 zT1IkMt%dE6?Lut3m^>yYC2O-8EMkc|G<7tlrqiN^*^QHT49NO$OiIY3Of%ng%sm{1 z9fRVky?*^<;R&lZxQxKsRcwg4WL#aJ(^Mll#S}%*&vfEg zT5#QnUoH6N@a=1UkGQwc@K6`7ycwhi(GFVeZrX%j9BsyAk1=_SyyQo$E=-=z#Rc+q zg~_+t*EGv_{1o}UXUJPoApfmZXOIu01DG|HDyfR@rfQl;VPltOM6nW?yLhRVdT0xF ztE3w0MXLg%tEdkxA8o}*CXC~oqiwb)Z+RNwfrgPPLGrkgX5%*I;zsKMYQSHkgVbn| z{5C0Qld4OQ`fbu4i&P)#Tx_TU{|U4R8E!(RmQaY6A}h-rpn41BLGH{P1#D2L1Zcnp zIdU|`L7M8Cqm{Um`;ep6$kF}CQLBSg%#qh7x##Gi$w)?)std%jG~Jcd22u>94Ip)b z)Kw;FyG^o>&8TeS;A*-;uAm-(`T*L7W9!GU4LCr>WAoA+>)3*L7R}Nwb!?;)|E5}(k_sOkfQ{0lys2(&#~>Cj5L>#>P%9DD@g_^4U!5{2Bh6(k_IOu z&1a;AW+g3hC9yYI9;5>x9R%r6nWTsBL}CXQaV0$g(vu(^1?ee}o-UL0h)p_-mnVB| zFAS5Jr7$%YXbDtH@1Uy1ETU(jI!06IIaK&@yt+@&0y^oCEwo?Y4OW$h?3Yux#LH<{ zNm;Y;Dr9HMls#Hf<}vD>$yT_^-hk{)$j(9bHe~NW_HLOn zv7`+Dj8~ecd9SPNJY?@fb^)>vA-f3Kr7~qhC1oqaw91sNc9mU*>|@BTKz0?f&mjA} zOj)9&Y*mcZ{{Te2<}3gJ From 3ce2dbf5db33c48178a1151346c815b8fe202cea Mon Sep 17 00:00:00 2001 From: Eric Barnaba Date: Thu, 15 Feb 2018 16:58:47 -0500 Subject: [PATCH 5/6] refactored to support currency symbol functionality --- src/main/java/AustralianDollar.java | 3 ++- src/main/java/BritishPound.java | 3 ++- src/main/java/CanadianDollar.java | 3 ++- src/main/java/ChineseYuan.java | 3 ++- src/main/java/Currency.java | 18 +++++++++++++++++- src/main/java/Dollar.java | 5 +++-- src/main/java/Euro.java | 3 ++- src/main/java/IndianRupee.java | 3 ++- src/main/java/JapaneseYen.java | 3 ++- src/main/java/MalaysianRinggit.java | 3 ++- src/main/java/SingaporeDollar.java | 3 ++- src/main/java/SwissFranc.java | 3 ++- src/test/java/TestCurrencies.java | 21 +++++++++++++++++++-- target/classes/AustralianDollar.class | Bin 308 -> 390 bytes target/classes/BritishPound.class | Bin 311 -> 392 bytes target/classes/CanadianDollar.class | Bin 302 -> 385 bytes target/classes/ChineseYuan.class | Bin 293 -> 375 bytes target/classes/Currency.class | Bin 1375 -> 2192 bytes target/classes/Dollar.class | Bin 278 -> 358 bytes target/classes/Euro.class | Bin 286 -> 368 bytes target/classes/IndianRupee.class | Bin 293 -> 375 bytes target/classes/JapaneseYen.class | Bin 293 -> 374 bytes target/classes/MalaysianRinggit.class | Bin 308 -> 389 bytes target/classes/SingaporeDollar.class | Bin 305 -> 386 bytes target/classes/SwissFranc.class | Bin 290 -> 372 bytes target/test-classes/TestCurrencies.class | Bin 5452 -> 6180 bytes 26 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/main/java/AustralianDollar.java b/src/main/java/AustralianDollar.java index c56d098..f6d08b7 100644 --- a/src/main/java/AustralianDollar.java +++ b/src/main/java/AustralianDollar.java @@ -1,7 +1,8 @@ public class AustralianDollar extends Currency{ private double exchangeRate; + private String currencySymbol; public AustralianDollar(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "AU$"); } } diff --git a/src/main/java/BritishPound.java b/src/main/java/BritishPound.java index 1f88d16..f13aacc 100644 --- a/src/main/java/BritishPound.java +++ b/src/main/java/BritishPound.java @@ -1,7 +1,8 @@ public class BritishPound extends Currency{ private double exhcangeRate; + private String currencySymbol; public BritishPound(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "\u00A3"); } } diff --git a/src/main/java/CanadianDollar.java b/src/main/java/CanadianDollar.java index f9847c5..4df5e04 100644 --- a/src/main/java/CanadianDollar.java +++ b/src/main/java/CanadianDollar.java @@ -1,7 +1,8 @@ public class CanadianDollar extends Currency{ private double exchangeRate; + private String currencySymbol; public CanadianDollar(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "CAN$"); } } diff --git a/src/main/java/ChineseYuan.java b/src/main/java/ChineseYuan.java index 7622876..9d84fdc 100644 --- a/src/main/java/ChineseYuan.java +++ b/src/main/java/ChineseYuan.java @@ -1,7 +1,8 @@ public class ChineseYuan extends Currency { private double exchangeRate; + private String currencySymbol; public ChineseYuan(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "\u5706"); } } diff --git a/src/main/java/Currency.java b/src/main/java/Currency.java index f782bad..5f55c2b 100644 --- a/src/main/java/Currency.java +++ b/src/main/java/Currency.java @@ -1,8 +1,16 @@ public abstract class Currency { private double exchangeRate; + private String currencySymbol; - public Currency(double exchangeRate){ + + public Currency(double exchangeRate, String currencySymbol){ this.exchangeRate = exchangeRate; + this.currencySymbol = currencySymbol; + } + + @Deprecated + public Currency(double exchangeRate){ + this(exchangeRate, null); } protected void changeRate(double newRate){ @@ -38,4 +46,12 @@ protected double divideBy100(double valueToDivide) { return dividedValue; } + protected String displayWithSymbol (double amount){ + StringBuilder builder = new StringBuilder(); + builder.append(String.format("%4s", this.currencySymbol)).append(" " + amount + "\n"); + return builder.toString(); + } + + + } diff --git a/src/main/java/Dollar.java b/src/main/java/Dollar.java index 28da954..f7a4a85 100644 --- a/src/main/java/Dollar.java +++ b/src/main/java/Dollar.java @@ -1,8 +1,9 @@ public class Dollar extends Currency { -private double exchangeRate; + private double exchangeRate; + private String currencySymbol; public Dollar(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "$"); } } diff --git a/src/main/java/Euro.java b/src/main/java/Euro.java index 082f8bb..d278294 100644 --- a/src/main/java/Euro.java +++ b/src/main/java/Euro.java @@ -1,7 +1,8 @@ public class Euro extends Currency { private double exhangeRate; + private String currencySymbol; public Euro(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "\u20AC"); } } diff --git a/src/main/java/IndianRupee.java b/src/main/java/IndianRupee.java index 5b9ddfd..e430e96 100644 --- a/src/main/java/IndianRupee.java +++ b/src/main/java/IndianRupee.java @@ -1,7 +1,8 @@ public class IndianRupee extends Currency{ private double exchangeRate; + private String currencySymbol; public IndianRupee(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "\u20A8"); } } diff --git a/src/main/java/JapaneseYen.java b/src/main/java/JapaneseYen.java index 82b1e20..f4838d8 100644 --- a/src/main/java/JapaneseYen.java +++ b/src/main/java/JapaneseYen.java @@ -1,7 +1,8 @@ public class JapaneseYen extends Currency { private double exchangeRate; + private String currencySymbol; public JapaneseYen(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "\u00A5"); } } diff --git a/src/main/java/MalaysianRinggit.java b/src/main/java/MalaysianRinggit.java index e98be99..c0c8f37 100644 --- a/src/main/java/MalaysianRinggit.java +++ b/src/main/java/MalaysianRinggit.java @@ -1,7 +1,8 @@ public class MalaysianRinggit extends Currency{ private double exchangeRate; + private String currencySymbol; public MalaysianRinggit(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "RM"); } } diff --git a/src/main/java/SingaporeDollar.java b/src/main/java/SingaporeDollar.java index ddcbb7a..32fecf7 100644 --- a/src/main/java/SingaporeDollar.java +++ b/src/main/java/SingaporeDollar.java @@ -1,7 +1,8 @@ public class SingaporeDollar extends Currency { private double exchangeRate; + private String currencySymbol; public SingaporeDollar(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "S$"); } } diff --git a/src/main/java/SwissFranc.java b/src/main/java/SwissFranc.java index a58bb82..238ad5d 100644 --- a/src/main/java/SwissFranc.java +++ b/src/main/java/SwissFranc.java @@ -1,7 +1,8 @@ public class SwissFranc extends Currency { private double exchangeRate; + private String currencySymbol; public SwissFranc(double exchangeRate) { - super(exchangeRate); + super(exchangeRate, "\u20A3"); } } diff --git a/src/test/java/TestCurrencies.java b/src/test/java/TestCurrencies.java index 79cf9b4..fe1615c 100644 --- a/src/test/java/TestCurrencies.java +++ b/src/test/java/TestCurrencies.java @@ -42,6 +42,7 @@ public void testChangeRate(){ //Then double expectedValue = 1000; + System.out.printf(indianRupee.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); @@ -57,6 +58,7 @@ public void testMultiplyBy100(){ //Then double expectedValue = 6832; + System.out.printf(indianRupee.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); @@ -72,6 +74,7 @@ public void testDivideBy100(){ //Then double expectedValue = 68.32; + System.out.printf(indianRupee.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -85,6 +88,7 @@ public void testConvertFromDollars(){ //Then double expectedValue = 68.32; + System.out.printf(indianRupee.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -98,6 +102,7 @@ public void testConvertFromDollarsWithDecimal(){ //Then double expectedValue = 102.48; + System.out.printf(indianRupee.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -112,6 +117,7 @@ public void testConvertFromDollarsWithDecimal2(){ //Then double expectedValue =136.3; + System.out.printf(australianDollar.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -126,6 +132,7 @@ public void testConvertToDollars(){ //Then double expectedValue = 1; + System.out.printf(dollar.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -139,6 +146,7 @@ public void testConvertToDollarsWithDecimal(){ //Then double expectedValue = 14.56; + System.out.printf(chineseYuan.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -152,6 +160,7 @@ public void testConvertToDollarsWithDecimal2(){ //Then double expectedValue = 9531.84; + System.out.printf(canadianDollar.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -165,6 +174,7 @@ public void testDollarToEuro(){ //Then double expectedValue =94; + System.out.printf(euro.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -178,6 +188,7 @@ public void testEuroToDollar(){ //Then double expectedValue = 106.38; + System.out.printf(dollar.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -191,6 +202,7 @@ public void testEuroToBritishPound(){ //Then double expectedValue = 87.23; + System.out.printf(euro.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -204,6 +216,7 @@ public void testBritishPoundToIndianRupee(){ //Then double expectedValue = 8331.62; + System.out.printf(britishPound.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue); } @@ -217,6 +230,7 @@ public void testIndianRupeeToCanadianDollar(){ //Then double expectedValue = 1.93; + System.out.printf(indianRupee.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue);; } @@ -230,6 +244,7 @@ public void testCanadianDollarToSingaporeDollar(){ //Then double expectedValue = 108.34; + System.out.printf(canadianDollar.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue);; } @@ -243,6 +258,7 @@ public void testSingaporeDollarToSwissFranc(){ //Then double expectedValue = 70.63; + System.out.printf(singaporeDollar.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue);; } @@ -256,6 +272,7 @@ public void testSwissFrancToMalaysianRinggit(){ //Then double expectedValue = 442.57; + System.out.printf(swissFranc.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue);; } @@ -269,6 +286,7 @@ public void testMalaysianRinggitToJapaneseYen(){ //Then double expectedValue = 2591.34; + System.out.printf(malaysianRinggit.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue);; } @@ -282,8 +300,7 @@ public void testJapaneseYenToChineseYuan(){ //Then double expectedValue = 5.95; + System.out.printf(japaneseYen.displayWithSymbol(expectedValue)); Assert.assertTrue(actual == expectedValue);; } - - } diff --git a/target/classes/AustralianDollar.class b/target/classes/AustralianDollar.class index df9976d8ef0a6242a9b1feb2cfeb265f7bfa7931..56e23dcf7d41ac178c4a9ca1b61a4fc7d32173e8 100644 GIT binary patch delta 247 zcmZWiKM%oh6ue)HR#j2dCXq<|S;TB1FRG^Q4*#948ETMO2}qnIQt_rhC9{xm tjhLb8(ff$?3=9m03_@HC%nbbO3TJ{to!0}qe~R1Y={XdeSFkjKQp2LSt!5Ul_J diff --git a/target/classes/BritishPound.class b/target/classes/BritishPound.class index 811b20e9888aaf4b08aec807080b87d947761a05..3282c3130de89446c7a034c0b22707b95b2db0f0 100644 GIT binary patch delta 268 zcmdna)WIBh>ff$?3=9m03=$j+!dwh23?l3dqU;P}j0`-f6&cBidFiP^i6yCw42&*} z41CF@MMbH3$(6yCxk>psj0{3PS&3zd`Z+*l`oSednR)5f6E)iE85x)kE#_h1WDo}$ z<5ZMcl3AP)kYAdY!pOkk3^jt0K}^F1Q@dsugCYYn&>aj6OhCxWzy@ZqGjITDpeule zasf$hAkP7)iWx|AXsHV^Zf9WH2v*6%z+ePa!UW{7F|Y$6FOVe$=5sLcG4KOff$?3=9m048mLt%nSnT41(+oLW~SNsTCQ?iFxU%L5U@)j0}t}69d~= zc^KFj*e5=e%3@GtU;?UUU|TJ{to!0}qe~RL{T*lmptwzz5_pG4KNb1+oyz diff --git a/target/classes/CanadianDollar.class b/target/classes/CanadianDollar.class index f937ee0c5b10655754b6ae3886d0bd94a5883109..6a8a60ae69d17a3c55f10e742de423f8b89378da 100644 GIT binary patch delta 248 zcmZWi&k6x?7@XfOcCEEotc#0M{#@kjLiQ+ya$no#PpsMyImjb;3n%5I96W%BlCf8P zHSfZ=X~!1LY1=&+is zmjY&Q;q08olD5WZ6U_Z->ry@H0+DW~U)B+ab-5N#0#?=jx7NleL1rf)aiWNYn*x>0 wM#eQ_f~rlIOjhd^Q#>HuL#IyEm;{pwC&|qUwF(0%Dkcy$c>cXhQ%cBu0c;K?WdHyG delta 164 zcmZoff$?3=9m03_@HC%nbbO3TJ{to!0}qe~R1Y={XdeSFkjKQp2LSM$5Sah~ diff --git a/target/classes/ChineseYuan.class b/target/classes/ChineseYuan.class index 96605992dc8a5a92574cc8db27d8cedbaab3474f..53db5f84c0647bffa709820d5ebbb59412c44b05 100644 GIT binary patch delta 268 zcmZ3=^qnd2)W2Q(7#J7~8N@jlgt!=37=+mwMA#Wb85wv|E0Qx3^U_m;5=&AU85ms{ z8TgV*i;7b7k}HENbCdFO7#W0ovJ%S@^>cvA^n*)^GV{`{Cu)?|Gcqtgozup{z{w!S z$iVHKk(rlToEll0n8(P#;S4o`kwHwu1yj3b7=t1MGteCj3`{`C%D@I@u`_T0X`m~B zW^w^ZZXnMAsEQd#b7-jxF>YsI+6Y$3!@yt!RKf)0uraU$Auo_62Ig}x@GKxl83foF1Q{84QY(@(67$kigAz+p85tN|CI*(W z@-VP5uur@wnZ=;Uzywsyz`zKkSr}NsEJlzlP=o`>vjfV4}s2*$@&^`uUAdiWG4*)Lm5cL26 diff --git a/target/classes/Currency.class b/target/classes/Currency.class index b7360a522f730832c29dee6ad197633cddf2a05d..0adfe7d882212a47d5bfc72893c3e5250a1cad77 100644 GIT binary patch literal 2192 zcmaJ?YgZdp6x~BYCQOF_kxE?xQq{829VncPfLQiR31=iYPA-sg3PfByaBZvfX}8yLpY04|~=;$wqiS;QwI z9*TG*V#UCxSQTw8aetSt{L!&)U=T}5Jl64ix zTJhW?+Yh$9b^Ev-2MfXs+q*)|jwW9AUG{w2*>gL*V+y0kFj#NY0_UK1vUqZRZjKE(vT6-` z%Ue^&JW)3sySgnlrc`x~oT{xn29-xCJe2%HrG0s%>Kq=_tdkul*l*8Fh6#6dqcb*E z-D3ka=;ek}tJ*$0+H-HQWs=5idJVr~FFP_fgY9HzWFAdi!mf$eF>c}wyeZoW6E`tu zVphcaB67&<_{zi+d~M=3nEl1Gv#iK8#IDV=Q^OtmVCJ!Sm}D%W^y0Q;p)2uA^2= z#dB(Va9|5h;T0gg9-S&*dR4PJ=49Zt;~dTQ;uPao`288?m#2@v>_@1vC0q??(ih6h z-0dQUIM<>4DYX3bbM)m4&k_4Aba;z09hwuAItGwLigJ?YlXRpTuHY(H(S$||H6ek+K3VBe+N(f#2a8$26v>3;bPz z3w$EX;4JzG`kBTg?Je{~gq}b)3_31Tsjy}lfuzx&{~dk5Q0arzL1=+Y2xGP`D400j z#e2&6A;Xe#8io9H6a7sj&LWJ52(9WFQ6L5is(J=ySW#&TpNvA?VFLZaE};5KK9_GI z`RoM-es03(5VUGJ!B8)Ekz^v04F8KsixO;!2{LsK$$Ug|OOf#1 zE0T3mN+#y?C@zE}eo3il2c6z)&-lb$a8iNW1dq}B`Rq4-}I-i>iWVw*28(nMO>(yvixlSb1S xDou=0?i9HGN`TfNrNT+Q!KZYSNz8Wzv=9Zfz=@VlC2@;S=RQ3&JO~jM{{x-|oU8x< literal 1375 zcmaKqZBG+H5Xb-9Ua#$OEe}#u5CIk1ooB1J1yz4El!SIl(4_R;rfw>9Zx8lp5W3Jigm$ zA8>!qK5!{Au`L?5yKnoBT&tiK96BEujP0$C?{lwlx=xE>iL}R0BC&Lf2a%U7l}UKA zA-pd4gFUg!Px|Ey`BHTNll#mj_e9(A?7$Ho!w3NfyC)Q+=8JY!xUTI}H*yjxEDRUE z^x|~>MEJ*!*NOvUaVK$T_TSo?@VV3S2D(#rE|Y8aIBhfaU9@kVs~2Cq5tPICQ@R*vkhZDJIUP2`X_ zaRYNEu1m8h%@tftKAxq>zP< zOB9=;9PP#=3iOqpq>>tC`piwm)X(sYur^CHV~C~4EFG5>i;hC|SD_k4Iw|Wb5}(P5 zTGPW|F2tD828GcujTu$^g4)t#lgn1Ihhz`hS;BZon2(MiZp6T~un{@lEDf3@3f+^U zzNG)XQfFn5Q#X7-F0804A0~wj8vm*z{}_yRO(7 e$rk6ii`4Vd5H}NZGbpQ`6R<)q!|m|q@B9T-W!u>R diff --git a/target/classes/Dollar.class b/target/classes/Dollar.class index d6c83b45354480fb39bee2e2ba65b148b61ff696..d4aba5cff49b994c879d41aabeb9491a4d59ab38 100644 GIT binary patch delta 261 zcmbQn^o%L+)W2Q(7#J7~8N@jlgt!=37=+mwMA#Wb85wv|E0Qx3^U_m;5=&AU85ms{ z8TgV*i;7b7k}HENbCdFO7#W0ovJ%S@^>cvA^n*)^GV{`{Cu(HZ168Z=FmN)6F*2~Z z~u8WKjxt)lOcY#}k+_h^WzZ^c;Od?2p+dE!KXO?!Cbzm*w^x6W|O%vdi_8PC diff --git a/target/classes/Euro.class b/target/classes/Euro.class index 80244239b3b573f5c05986d2a1b2c813685fb57d..c0929242c6aa3138e9005ffd66d2fbc56b42258a 100644 GIT binary patch delta 260 zcmbQo^noeh)W2Q(7#J7~86-Fugt-`47)00^MA;d{7#X-zD>4%E(o=&HOHvsb7+n|{ z_>xPDic<5ED}yU@lk#&I8H9YY63Y_xbAZb9gG-7s^U|#+s+ZL>GB7`CTEoM@$so?i zz~Wk3l+Vb(;SANw$RMWSf~ik4j6sos8E8KP0}~LkGO&SJ>77VUTcvA^n*)^GV{`{Cu)?|GcqtgYFfd=z{w!S z$iVHHmy(&77gSo13N(hp8EOP0gP4X3rgqIR21N#DpgR~Cn1GO#fep-JXW#(RKvw|G zh%;#X>W8eq!fLg!? MgNzdZ@|YL|0fpBtR{#J2 delta 164 zcmey)w3JEX)W2Q(7#J7~8HBhPm>Kxl83foF1Q{84QY(@(67$kigAz+p85tN|CI*(W z@-VP5uur@wnZ=;Uzywsyz`zKkSr}NsEJlzlP=o`>vjfV4}s2*$@&^`uUAdiWG4*)Lm5cL26 diff --git a/target/classes/JapaneseYen.class b/target/classes/JapaneseYen.class index 71b721918c59ce4a81cf54d81b227dd663aa4d38..ba1984867963f1e2ee02966a6d2293a6b0c53517 100644 GIT binary patch delta 267 zcmZWjyG{a86r6Kc-0QL;uDaAzf(@ajF@cKE2nmVhb#sFdxRT`&sQd;$f)B7Vv7n&j zgDefhhK`(M9?8t)Y}B86+5i7;0n|~_hyq;T&d0rv2SI38$-8j_+ck45kd~m3EYj4v zWZhd&-af{Hs53H4QyVi@>&?@l8#KNui%)^tZ9-fj7UbJzYMh!-&^exSayWJs(Btb$dacTE*%UZa2;I##mb K<6MzW;r0OduPv?s delta 164 zcmeyyw3JEX)W2Q(7#J7~8HBhPm>Kxl83foF1Q{84QY(@(67$kigAz+p85tN|CI*(W z@-VP5uur@onZ=;Uzywsyz`zKkSr}NsEJlzlP=o`>vjfV4}s2*$@&^`uUAdiWG4*)IU5c2>4 diff --git a/target/classes/MalaysianRinggit.class b/target/classes/MalaysianRinggit.class index 120a5f415dcd5a914e061caea79e7621eeaa34da..771a77d8b63a6858891b7aa8ec8bccd5eddd2f64 100644 GIT binary patch delta 246 zcmZWizYf807`)%FXjK(OZ4#3|iwQWkw_#458$E1=_+4x z_g%ib@9y%fOx~a83qTJw4VI1+$|@=29CE41jJCl^mlO_ME=n|u4kK- zfHhird#}5qt?O>%MHKcgt&=Vwow0!|?8~)&60lpte`9-!1{5{|l9NUz*;Hs`_A#y# sb5sMm6tdQ7TH*nDOPmH#XA(@RoIE!>(Hcw?sF*<7ff$?3=9m03_@HC%nbbO3TJ{to!0}qe~R1Y={XdeSFkjKQp2LSqi5UT(H diff --git a/target/classes/SingaporeDollar.class b/target/classes/SingaporeDollar.class index 14022542f0802e9b910348b93b8a62e41ade8ee5..5fdf424f6f4c492e248b09fab0ca57b7d81243e6 100644 GIT binary patch delta 246 zcmZWiy$-=(6g}Tp)v79rnhX+&pGC|TgV910do_)pP)Sq5AQErjHEbq{!2@_GadefN zoO4g^IrrSvnHBDzqU?>fOH!sGH|Z9+F8J94gZbpDe6$z2uO~Kbh2sC$?Rj? tAZDosbSY%L)3n6{@}4+NqQNAX)HpeAPNH>K$Wt)^)#Ca0u0SbK`~vcmCF=kH delta 164 zcmZo--pHhJ>ff$?3=9m03_@HC%nbbO3TJ{to!0}qe~R1Y={XdeSFkjKQp2LSYa5TF16 diff --git a/target/classes/SwissFranc.class b/target/classes/SwissFranc.class index 50aac6ea9f87a17e489cff83b445a7d271883674..e472dcaa2ba15d6bb83ba5c2f78c479a76eae42d 100644 GIT binary patch delta 247 zcmZWiO%B0e6rArXT2)0+wpM;NVr^q#X@kVRn#ND4q<+Fm;s$OYoWM$A;Q)@|4Ax?F zD=(ROlQ;9`EZ?&G{M;V^8YpP6bVQI!XbYI`ItV=9-Sv0# z;bJCWb*9e7sn2Mu_gBHhA2pAaWkNuC9WDmqu#czWUcj!j|DDwVN>Eq{NKO>7a8sd? wS;)9fOi;DxQpj4ZY>6A>HFO$8ok=jMa+2KaP-`%eqGAG3ljq;NG^Ir53rglE#sB~S delta 164 zcmeyuw1`RL)W2Q(7#J7~8HBhPm>Kxl83foF1Q{84QY(@(67$kigAz+p85tN|CI%L> z@-VP5uunWMk;S0Mzywsyz`zKkSr}NsEJlzlP=o`>vjfV4}s2*$@&^`uUAdiWG4*)3e5b6K` diff --git a/target/test-classes/TestCurrencies.class b/target/test-classes/TestCurrencies.class index 75f242c3358b8baabf2445ce5766d6aded8f08fc..a0b1dd09b2f3ed197670c7d415ad8c4937d03e64 100644 GIT binary patch literal 6180 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 ayj)e}sv*}ra@CTnZiZYx;P<@%PyHXzC6kQ+ From 6745af0c8ec45fad5e18b735585c074eadc8dd91 Mon Sep 17 00:00:00 2001 From: Eric Barnaba Date: Fri, 16 Feb 2018 11:36:50 -0500 Subject: [PATCH 6/6] refactored to remove redundancy --- src/main/java/AustralianDollar.java | 2 -- src/main/java/BritishPound.java | 2 -- src/main/java/CanadianDollar.java | 2 -- src/main/java/ChineseYuan.java | 2 -- src/main/java/Dollar.java | 3 --- src/main/java/Euro.java | 2 -- src/main/java/IndianRupee.java | 2 -- src/main/java/JapaneseYen.java | 2 -- src/main/java/MalaysianRinggit.java | 2 -- src/main/java/SingaporeDollar.java | 2 -- src/main/java/SwissFranc.java | 2 -- target/classes/AustralianDollar.class | Bin 390 -> 336 bytes target/classes/BritishPound.class | Bin 392 -> 323 bytes target/classes/CanadianDollar.class | Bin 385 -> 331 bytes target/classes/ChineseYuan.class | Bin 375 -> 321 bytes target/classes/Dollar.class | Bin 358 -> 304 bytes target/classes/Euro.class | Bin 368 -> 300 bytes target/classes/IndianRupee.class | Bin 375 -> 321 bytes target/classes/JapaneseYen.class | Bin 374 -> 320 bytes target/classes/MalaysianRinggit.class | Bin 389 -> 335 bytes target/classes/SingaporeDollar.class | Bin 386 -> 332 bytes target/classes/SwissFranc.class | Bin 372 -> 318 bytes 22 files changed, 23 deletions(-) diff --git a/src/main/java/AustralianDollar.java b/src/main/java/AustralianDollar.java index f6d08b7..0c7bdc1 100644 --- a/src/main/java/AustralianDollar.java +++ b/src/main/java/AustralianDollar.java @@ -1,6 +1,4 @@ public class AustralianDollar extends Currency{ - private double exchangeRate; - private String currencySymbol; public AustralianDollar(double exchangeRate) { super(exchangeRate, "AU$"); diff --git a/src/main/java/BritishPound.java b/src/main/java/BritishPound.java index f13aacc..b43ead6 100644 --- a/src/main/java/BritishPound.java +++ b/src/main/java/BritishPound.java @@ -1,6 +1,4 @@ public class BritishPound extends Currency{ - private double exhcangeRate; - private String currencySymbol; public BritishPound(double exchangeRate) { super(exchangeRate, "\u00A3"); diff --git a/src/main/java/CanadianDollar.java b/src/main/java/CanadianDollar.java index 4df5e04..ed15cac 100644 --- a/src/main/java/CanadianDollar.java +++ b/src/main/java/CanadianDollar.java @@ -1,6 +1,4 @@ public class CanadianDollar extends Currency{ - private double exchangeRate; - private String currencySymbol; public CanadianDollar(double exchangeRate) { super(exchangeRate, "CAN$"); diff --git a/src/main/java/ChineseYuan.java b/src/main/java/ChineseYuan.java index 9d84fdc..444fbf5 100644 --- a/src/main/java/ChineseYuan.java +++ b/src/main/java/ChineseYuan.java @@ -1,6 +1,4 @@ public class ChineseYuan extends Currency { - private double exchangeRate; - private String currencySymbol; public ChineseYuan(double exchangeRate) { super(exchangeRate, "\u5706"); diff --git a/src/main/java/Dollar.java b/src/main/java/Dollar.java index f7a4a85..114b91e 100644 --- a/src/main/java/Dollar.java +++ b/src/main/java/Dollar.java @@ -1,7 +1,4 @@ public class Dollar extends Currency { - private double exchangeRate; - private String currencySymbol; - public Dollar(double exchangeRate) { super(exchangeRate, "$"); diff --git a/src/main/java/Euro.java b/src/main/java/Euro.java index d278294..f5ff639 100644 --- a/src/main/java/Euro.java +++ b/src/main/java/Euro.java @@ -1,6 +1,4 @@ public class Euro extends Currency { - private double exhangeRate; - private String currencySymbol; public Euro(double exchangeRate) { super(exchangeRate, "\u20AC"); diff --git a/src/main/java/IndianRupee.java b/src/main/java/IndianRupee.java index e430e96..d5fcdd6 100644 --- a/src/main/java/IndianRupee.java +++ b/src/main/java/IndianRupee.java @@ -1,6 +1,4 @@ public class IndianRupee extends Currency{ - private double exchangeRate; - private String currencySymbol; public IndianRupee(double exchangeRate) { super(exchangeRate, "\u20A8"); diff --git a/src/main/java/JapaneseYen.java b/src/main/java/JapaneseYen.java index f4838d8..a8549fe 100644 --- a/src/main/java/JapaneseYen.java +++ b/src/main/java/JapaneseYen.java @@ -1,6 +1,4 @@ public class JapaneseYen extends Currency { - private double exchangeRate; - private String currencySymbol; public JapaneseYen(double exchangeRate) { super(exchangeRate, "\u00A5"); diff --git a/src/main/java/MalaysianRinggit.java b/src/main/java/MalaysianRinggit.java index c0c8f37..5ab71e3 100644 --- a/src/main/java/MalaysianRinggit.java +++ b/src/main/java/MalaysianRinggit.java @@ -1,6 +1,4 @@ public class MalaysianRinggit extends Currency{ - private double exchangeRate; - private String currencySymbol; public MalaysianRinggit(double exchangeRate) { super(exchangeRate, "RM"); diff --git a/src/main/java/SingaporeDollar.java b/src/main/java/SingaporeDollar.java index 32fecf7..5371e15 100644 --- a/src/main/java/SingaporeDollar.java +++ b/src/main/java/SingaporeDollar.java @@ -1,6 +1,4 @@ public class SingaporeDollar extends Currency { - private double exchangeRate; - private String currencySymbol; public SingaporeDollar(double exchangeRate) { super(exchangeRate, "S$"); diff --git a/src/main/java/SwissFranc.java b/src/main/java/SwissFranc.java index 238ad5d..2094aec 100644 --- a/src/main/java/SwissFranc.java +++ b/src/main/java/SwissFranc.java @@ -1,6 +1,4 @@ public class SwissFranc extends Currency { - private double exchangeRate; - private String currencySymbol; public SwissFranc(double exchangeRate) { super(exchangeRate, "\u20A3"); diff --git a/target/classes/AustralianDollar.class b/target/classes/AustralianDollar.class index 56e23dcf7d41ac178c4a9ca1b61a4fc7d32173e8..4179ffd2c9e72b01a84a917c7d50d1e4dd0e6936 100644 GIT binary patch delta 152 zcmZo;zQ81L>ff$?3=9m045Azi0$dC%41(+oLhKB}69Z!ec~UEqGZORCQ-cyqQW+T- zT_ WoBg%nRweFnt=f*z`)AD1|->m1~>qvCfovuQ4j{<|q#1y+ g>_F9=K$aMo&jA$Y2J(P97j*gBlgQd>FTE?MT$W$?~DMLLtCW(rJ%+L0#L&RXu zw(=z1h-|K(CYv~%`ohw5Sn_;lO4O@LS=u c2u(_Wk~&?DKBv$Ebu>s(qUim%HA!)_epiYf)c^nh diff --git a/target/classes/BritishPound.class b/target/classes/BritishPound.class index 3282c3130de89446c7a034c0b22707b95b2db0f0..53de2f4bea80fda694545e9e1fea9c962588c260 100644 GIT binary patch delta 137 zcmeBRKFlO>>ff$?3=9m045Azi0$dC%41(+oLhKB}69dzk7+ofA(_m(05SjSUCYphP z5eQis*nlKEP=^ChEi;hj&{7v-+|IzX5y)m@-~f_bK$-z4%MMh{31o?Z`5ZuTZXge+ RgMo*E7i=0IkjKQp4**w~4OIXD delta 207 zcmW+vI}UkP!T0LeNNUW6M2ktV}Fy>^zilB%93a zWM_8X@~X{0-{%X!5M70afgGATS~}VSrhi^}ZW#CrH}(a@RG{J=qsR}v#7Xwc!%o1O zZQPSff$?3=9m045Azi0$dC%41(+oLhKB}69c0Jc~UEqGZORCQ-cyqQW+T- zT_VP<6znRvr4nt=f*z`)AD1|->m1~>qvCfovuQ4j{<|q#1y+ g>_F9=K$aMo&jA$Y2J(P97ff$?3=9m04B{LNLR<_i48rUTBJ2#J6AMID_>xPDic<5ED}yU@lk#&I z8H9YY63Y_xa}x8?^@B@_GV{`{CrU(3Y}I1sWDuLU$xfDufr){YfemON69YQ~2ask2 zLQV!QAjv)PucRptP>2gC$pBQu4urfwmKd1N!NAAB59BcbwSkNPX%qnRm>2{B^u!tt diff --git a/target/classes/ChineseYuan.class b/target/classes/ChineseYuan.class index 53db5f84c0647bffa709820d5ebbb59412c44b05..6f70f79f281c9e2bb50262cd61748fcc1c8bb984 100644 GIT binary patch delta 152 zcmey)bdX8n)W2Q(7#J7~8ALf41h^Pj7zEiFgxDE`CkBQK@}yQIXC&sOrv@dKq%txv zx=dWA!OY4aGV!8yGy?-rfPs~P4M?&B4R8QzWd_n5TIxcK+ZmWP0@+Lq96*u_NHYLs g*@3D#fh;jFp93h)4delJFz_(&f=%NC@|YO-0THwkdjJ3c delta 207 zcmW+vy$-=p7(MqEy{#&W@&qK7#%wVdEp#wn%}xDOB~6L0-k{H6GD!>)s~56~PxB?` zd?z_SFaF{4_xJGxFhWc@LS=u c2u(_Wk~&?DKDW>UHtM7(QS|=X8l*UyKbOrP7ytkO diff --git a/target/classes/Dollar.class b/target/classes/Dollar.class index d4aba5cff49b994c879d41aabeb9491a4d59ab38..49425b6f549d142ec7d4e73ba2fba5f314794eb7 100644 GIT binary patch delta 152 zcmaFHw1G+D)W2Q(7#J7~8ALf41h^Pj7zEiFgxDE`Ck6%y@}yQIXC&sOrv@dKq%txv zx=dWC$jr(hGV!QcGy?-rfPs~P4M?&B4R8QzWd_n5TIxcK+ZmWP0@+Lq96*u_NHYLs g*@3D#fh;jFp93h)4delJFz_(&f=%NC@|YO-0q{%`Hvj+t delta 207 zcmdnM^o%L+)W2Q(7#J7~8N@jlgt!=37=+mwMA#Wb85wv|E0Qx3^U_m;5=&AU85ms{ z8TgV*i;7b7k}HENbCdFO7#W0ovJ%S@^>cvA^n*)^GV{`{CrSiOtd(cxWDuJ;-z=Mn zfr){YfemN_69YQ~2apDu#K6hG1thtFJO`kS%s`q$OI?U@I|I{3uu2{v$pzHG0MrB0 d#S3JKf%zN^d<^_R9#99^T##u3Kpqo=AOLN$9@YQ= diff --git a/target/classes/Euro.class b/target/classes/Euro.class index c0929242c6aa3138e9005ffd66d2fbc56b42258a..55969ec2ba56bab082531198f7f7b7c67d12856b 100644 GIT binary patch delta 137 zcmeysw1!FI)W2Q(7#J7~8ALf41h^Pj7zEiFgxDE`CkDhbF}h4#tH{jCATsfyNi+ik zBM`DOumMSSpbiJ1T4o^4p`|XwxSfG%BaqF+zyTz=fHVV8mK~^?6UY(+^ErUx+&~^s R2LlfSFW59bAdiWG9{_L54Rini delta 185 zcmZ3(^noeh)W2Q(7#J7~86-Fugt-`47)00^MA;d{7#X-zD>4%E(o=&HOHvsb7+n|{ z_>xPDic<5ED}yU@lk#&I8H9YY63Y_xbAZb9gG-7s^U|#+O2kjBmS^T<5T7{LM3#wx ziGh`Y4QK%q13Lo;kOrE>z{$V`B)KQvlQiW43UL7?8Gwq|fshx-5(D!&82A|YfjkDF QHUXe4NTVQ-$HX860I8%M-v9sr diff --git a/target/classes/IndianRupee.class b/target/classes/IndianRupee.class index 42d253721de546450c2ba2171d8acc1d280c4ac7..2ce54f5c825f5abef5d721fa151b9fb1f1b3f611 100644 GIT binary patch delta 152 zcmey)bdX8n)W2Q(7#J7~8ALf41h^Pj7zEiFgxDE`CkBQK@}yQIXC&sOrv@dKq%txv zx=dWA!OY4aGV!8yGy?-rfPs~P4M?&B4R8QzWd_n5TIxcK+ZmWP0@+Lq96*u_NHYLs g*@3D#fh;jFp93h)4delJFz_(&f=%NC@|YO-0THwkdjJ3c delta 207 zcmW+vy$-=p7(MqEy{#&W@&qK7#%wVdEp#wn%}xDOB~6L0-k{H6GD!>)s~56~PxB?` zd?z_SFaF{4_xJGxFhWc@LS=u c2u(_Wk~&?DKDW>UHtM7(QS|=X8l*UyKbOrP7ytkO diff --git a/target/classes/JapaneseYen.class b/target/classes/JapaneseYen.class index ba1984867963f1e2ee02966a6d2293a6b0c53517..4c7bc303a1744cac08ee070f64c8f04934744a80 100644 GIT binary patch delta 152 zcmeyybbv|X)W2Q(7#J7~8ALf41h^Pj7zEiFgxDE`CkBQK@}yQIXC&sOrv@dKq%txv zx=dWA&dkanGVy|SGy?-rfPs~P4M?&B4R8QzWd_n5TIxcK+ZmWP0@+Lq96*u_NHYLs g*@3D#fh;jFp93h)4delJFz_(&f=%NC@|YO-0T09ycK`qY delta 207 zcmW+vy$-=p7(MqEy{#&W@&Y2UG-ivzXrY7oYHsSMDrrh|^#*+nn@M62vj;MYPxB?` zd?z_SFaF{4_xJGxFhWc@LS=u c2u(_Wk~&?DKDW>UHtM7(QS|=X8l*UyKb21(6aWAK diff --git a/target/classes/MalaysianRinggit.class b/target/classes/MalaysianRinggit.class index 771a77d8b63a6858891b7aa8ec8bccd5eddd2f64..82009c0420bc4892c229580ac108a0f04713e908 100644 GIT binary patch delta 152 zcmZo=KF=g^>ff$?3=9m045Azi0$dC%41(+oLhKB}69Z!ec~UEqGZORCQ-cyqQW+T- zT_ VP<6znRv?~nt=f*z`)AD1|->m1~>qvCfovuQ4j{<|q#1y+ g>_F9=K$aMo&jA$Y2J(P97ff$?3=9m04B{LNLR<_i48rUTBJ2#Jj0`-f70DTidFiP^i6yCw42&*} z41CF@MMbH3$(6yCxk>psj0{3PS&3zd`Z+*l`oSednR)5f6D49MwreqSGKfvw;vmb! zz{J4Hzy`E|iGiJg14si+V&G)p0+QU585t!_d4OVEKv@Q$Ds~{`1+v7zd=3Ua27Vxq R0jLjT21us>kjKOz2mrOc9Y+8F diff --git a/target/classes/SingaporeDollar.class b/target/classes/SingaporeDollar.class index 5fdf424f6f4c492e248b09fab0ca57b7d81243e6..1cc16a49f59d4c5a1a58bcc4beb8fbd302d04af2 100644 GIT binary patch delta 152 zcmZo-KEot&>ff$?3=9m045Azi0$dC%41(+oLhKB}69c0Kc~UEqGZORCQ-cyqQW+T- zT_W@cp&nRvrKnt=f*z`)AD1|->m1~>qvCfovuQ4j{<|q#1y+ g>_F9=K$aMo&jA$Y2J(P97ff$?3=9m04B{LNLR<_i48rUTBJ2#J6AMLE_>xPDic<5ED}yU@lk#&I z8H9YY63Y_xa}x8?^@B@_GV{`{CrU(5Y|~`sWDuLU$zGO;fr){YfemON69YQ~2ask2 zLQV!QAjv)PpQI@dP>2gC$pBQu4urfwmKd1N!NAAB59BcbwSkNPX%qnRm>2{B_mUbE diff --git a/target/classes/SwissFranc.class b/target/classes/SwissFranc.class index e472dcaa2ba15d6bb83ba5c2f78c479a76eae42d..748b053fe630c5deceb5bf60dc98848115176999 100644 GIT binary patch delta 152 zcmeyuw2w*R)W2Q(7#J7~8ALf41h^Pj7zEiFgxDE`CkBQI@}yQIXC&sOrv@dKq%txv zx=dWE&dkanGV#1sGy?-rfPs~P4M?&B4R8QzWd_n5TIxcK+ZmWP0@+Lq96*u_NHYLs g*@3D#fh;jFp93h)4delJFz_(&f=%NC@|YO-0SnI(ZvX%Q delta 186 zcmdnT^o1$#)W2Q(7#J7~8N@jlgt!=37=+mwMA#Wb85wv|E0Qx3^U_m;5=&AU85ms{ z8TgV*i;7b7k}HENbCdFO7#W0ovJ%S@^>cvA^n*)^GV{`{CrX4(Y*c0DWDuLU(n^+z zfr){YfemN_69YQ~2apDu#K6hG1thsAevmZf0Sa*eB^iK<*nyB2$PxqdIT-jD_<=kI Qpf->ZAdLb*9utEg00WI4ZU6uP