From f00f3baa166a4e18b947a2de5b5b4467bba040cc Mon Sep 17 00:00:00 2001 From: Jessica Campbell Date: Thu, 15 Feb 2018 14:56:59 -0500 Subject: [PATCH 1/2] to be continued w/more tests --- pom.xml | 6 +++- src/main/java/DELETEME | 0 src/main/java/WuTangFinancial.java | 32 ++++++++++++++++++ src/test/java/DELETEME | 0 src/test/java/WuTangFinancial.java | 18 ++++++++++ src/test/java/WuTangFinancialTest.java | 27 +++++++++++++++ target/test-classes/WuTangFinancialTest.class | Bin 0 -> 1007 bytes 7 files changed, 82 insertions(+), 1 deletion(-) delete mode 100644 src/main/java/DELETEME create mode 100644 src/main/java/WuTangFinancial.java delete mode 100644 src/test/java/DELETEME create mode 100644 src/test/java/WuTangFinancial.java create mode 100644 src/test/java/WuTangFinancialTest.java create mode 100644 target/test-classes/WuTangFinancialTest.class diff --git a/pom.xml b/pom.xml index 682d6db..5057755 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,10 @@ 1.0-SNAPSHOT - + + junit + junit + RELEASE + \ No newline at end of file diff --git a/src/main/java/DELETEME b/src/main/java/DELETEME deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/WuTangFinancial.java b/src/main/java/WuTangFinancial.java new file mode 100644 index 0000000..a1e7e1e --- /dev/null +++ b/src/main/java/WuTangFinancial.java @@ -0,0 +1,32 @@ +import java.text.NumberFormat; +import java.util.TreeMap; + +public class WuTangFinancial { + + + public TreeMap convertList; + + public WuTangFinancial () { + convertList = new TreeMap(); + //initialization of object TreeMap + convertList.put("USD", 1.00); + convertList.put("Euro", 0.94); + convertList.put("Pound", 0.82); + convertList.put("Rupee", 68.32); + convertList.put("Australian Dollar", 1.35); + convertList.put("Canadian Dollar", 1.32); + convertList.put("Singapore Dollar", 1.43); + convertList.put("Swiss Franc", 1.01); + convertList.put("Malaysian Ringgit", 4.47); + convertList.put("Japanese Yen", 115.84); + convertList.put("Chinese Yuan Renminbi", 6.92); + } + + public String currencyConverter(String beginning, String ending, Double amountToConvert) { + DecimalFormat df = new DecimalFormat("#.##"); + String result = df.format(Double.toString(this.convertList.get(ending)/ this.convertList.get(beginning) * amountToConvert)); + + return result; + } + + } 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/WuTangFinancial.java b/src/test/java/WuTangFinancial.java new file mode 100644 index 0000000..9ecd1ff --- /dev/null +++ b/src/test/java/WuTangFinancial.java @@ -0,0 +1,18 @@ +//import javax.xml.bind.annotation.XmlAnyAttribute; +//import +// +//public class WuTangFinancial { +// private WuTangFinancial conversionRatesTest; +// +//} +//@Before +// +// +//@Test +//String beginning "USD"; +//String ending "Euro"; +//Double amountToConvert 5.00; +//Double expected 4.70; +//WuTangFinancial wutangFinancial = new WuTangFinancial(amountToConvert); +//Double actual wutangFinancial.convertionRateMethod(amountToConvert, beginningCurrency, endingCurrency);; +//Assert.assertEquals(expected, actual, delta); \ No newline at end of file diff --git a/src/test/java/WuTangFinancialTest.java b/src/test/java/WuTangFinancialTest.java new file mode 100644 index 0000000..55b73b9 --- /dev/null +++ b/src/test/java/WuTangFinancialTest.java @@ -0,0 +1,27 @@ +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.TreeMap; + +public class WuTangFinancialTest { + + public WuTangFinancial test = new WuTangFinancial(); + + @Before + public void setUp() { + + } + +@Test + public void testCurrencyConverter() { + String expected = "470.00"; + String actual = test.currencyConverter("USD","Euro",500.00); + + Assert.assertEquals(expected,actual); +} + + + + +} \ No newline at end of file diff --git a/target/test-classes/WuTangFinancialTest.class b/target/test-classes/WuTangFinancialTest.class new file mode 100644 index 0000000000000000000000000000000000000000..63a7f35e2c072d89017fe18b19ed23980cb3ae97 GIT binary patch literal 1007 zcmaJIq6zU&C(Vysa!*&WAsEw!bCX>JS{5!BQILKAruIRC)8 ziBaUpzqH(_H5xQ)Z>LGKHhtGIP&d)QqKSuiWMIj}V>}TU8(;_&*jK;l?fqkp@>ir)o>5wD(4WD??}8kNAe3&pLmwQ zIM?7o0|rtUMv;+8BA|-D# PO5l(DbSOW=HG$dRmDbyf literal 0 HcmV?d00001 From e8f3f855adf19c18c219a5898c86e0363b9fc1b6 Mon Sep 17 00:00:00 2001 From: Jessica Campbell Date: Thu, 15 Feb 2018 15:31:34 -0500 Subject: [PATCH 2/2] final --- src/main/java/WuTangFinancial.java | 6 +- src/test/java/WuTangFinancialTest.java | 74 +++++++++++++++++- target/classes/WuTangFinancial.class | Bin 0 -> 1686 bytes target/test-classes/WuTangFinancialTest.class | Bin 1007 -> 2795 bytes 4 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 target/classes/WuTangFinancial.class diff --git a/src/main/java/WuTangFinancial.java b/src/main/java/WuTangFinancial.java index a1e7e1e..079b228 100644 --- a/src/main/java/WuTangFinancial.java +++ b/src/main/java/WuTangFinancial.java @@ -1,5 +1,6 @@ import java.text.NumberFormat; import java.util.TreeMap; +import java.text.DecimalFormat; public class WuTangFinancial { @@ -23,9 +24,8 @@ public WuTangFinancial () { } public String currencyConverter(String beginning, String ending, Double amountToConvert) { - DecimalFormat df = new DecimalFormat("#.##"); - String result = df.format(Double.toString(this.convertList.get(ending)/ this.convertList.get(beginning) * amountToConvert)); - + DecimalFormat df=new DecimalFormat("###.##"); + String result = df.format(this.convertList.get(ending)/ this.convertList.get(beginning) * amountToConvert); return result; } diff --git a/src/test/java/WuTangFinancialTest.java b/src/test/java/WuTangFinancialTest.java index 55b73b9..6c864e0 100644 --- a/src/test/java/WuTangFinancialTest.java +++ b/src/test/java/WuTangFinancialTest.java @@ -15,12 +15,84 @@ public void setUp() { @Test public void testCurrencyConverter() { - String expected = "470.00"; + String expected = "470"; String actual = test.currencyConverter("USD","Euro",500.00); Assert.assertEquals(expected,actual); } + public void dollarToEuro() { + String expected = "470"; + String actual = test.currencyConverter("USD", "Euro", 500.00); + Assert.assertEquals(expected, actual); + } + + + @Test + public void britishPoundToDollar() { + String expected = "609.76"; + String actual = test.currencyConverter("Pound", "USD", 500.00); + Assert.assertEquals(expected, actual); + } + + + @Test + public void euroToBritishPound() { + String expected = "436.17"; + String actual = test.currencyConverter("Euro", "Pound", 500.00); + Assert.assertEquals(expected, actual); + } + + + @Test + public void britishPoundToIndianRupee() { + String expected = "41658.54"; + String actual = test.currencyConverter("Pound", "Rupee", 500.00); + Assert.assertEquals(expected, actual); + } + + @Test + public void rupeeToCanadianDollar() { + String expected = "9.66"; + String actual = test.currencyConverter("Rupee", "Canadian Dollar", 500.00); + Assert.assertEquals(expected, actual); + } + + + @Test + public void canadianDollarToSingaporeDollar() { + String expected = "541.67"; + String actual = test.currencyConverter("Canadian Dollar", "Singapore Dollar", 500.00); + Assert.assertEquals(expected, actual); + } + + @Test + public void SingaporeDollarToSwissFranc() { + String expected = "353.15"; + String actual = test.currencyConverter("Singapore Dollar", "Swiss Franc", 500.00); + Assert.assertEquals(expected, actual); + } + + @Test + public void SwissFrancToMalaysianRinggit() { + String expected = "2212.87"; + String actual = test.currencyConverter("Swiss Franc", "Malaysian Ringgit", 500.00); + Assert.assertEquals(expected, actual); + } + + @Test + public void MalaysianRinggitToJapaneseYen() { + String expected = "12957.49"; + String actual = test.currencyConverter("Malaysian Ringgit", "Japanese Yen", 500.00); + Assert.assertEquals(expected, actual); + } + + @Test + public void JapaneseYenToChineseYuanRenminbi() { + String expected = "29.87"; + String actual = test.currencyConverter("Japanese Yen", "Chinese Yuan Renminbi", 500.00); + Assert.assertEquals(expected, actual); + } diff --git a/target/classes/WuTangFinancial.class b/target/classes/WuTangFinancial.class new file mode 100644 index 0000000000000000000000000000000000000000..379f49f5dde70a6a868dd09d84891cc7ddea829c GIT binary patch literal 1686 zcmaJ>&u<%55dPLb)*E|?V|POu(zL0Jg5xGJg+ki=a*ACCg3~myn-EBWXZyw3u->)S zyMb2X$PsY{#ECOikszt4s1Qf~0nWXGgt)Xv#Jsf|HnoH;KfiC@%)D>Dncd(1`RO5m zi`b818pQ~fqX?kbhbg?N;H@Y!SP_=D6_n)MU)r5V%Xc*et8(s-h1R#fM;8=amzUO` z+SlaV<1fYMD+M=bfA;?RpP!vmurBAGh{!vS6l}=3ztfL@{bFZAL0Mi(JhfNkr5#~T zKT&W~UK$bJ%XcH#RInArINlLFwj+2~ka|y8b|SbH!TS{-ip}{dYt2dME9(uDIj+qmTGP9;L zgYqV7u5EL(c01pxh1(KV(moEota>e7o)f)cBtVrnbkn5D1UXM4f3;K@H|ySMoHZ@i zbShSt%1Qt39TEcdT?xaTOb-9V$rgA`Z!)83*-hpMschbM4eCg=Y`J!g7j+?w_Dt>5 zf{Kb)afw9e>70rzUM8_`mJ2FAz=tXrswDe0*R~{tZxGQs{cpG}PPr3T-L_*hLuck# z!7>a+BF6K~WOct~piE`5mSyu}r&#%8z1An4P3?*LK5Yh>nMe<5r#~*nFko(PQG-6^lWI@ z(`oV$6TcvHhzmle3&+TsBGX5Qn4Ap{hwo8n0D@vag0zkh!86o`QSaKtPU`NpbP48( kvS`c<7HJpob~!9jYz&jQiZ`glON8=t8Ya&Ic?59nU;pl@Fh5XL`&u@%SRB5=YbDJE$fE~&xBHaH{{FpxmG1&j%8E|tv*h%pkCCEEPe zXX;GbWZIcNKp(2pPm*uAo;u_4jC{_X-Tm!;+M~b!`QtADF%*Ir#nS*5gXqB18~6-g z%UF`JEMvvL^z#y(fFLqhbsW}$SjRIN&t+`L*p%^&j4c`4GInI_%Gi_fLdL#~0~uKv zhca?9j%2(H;5dM9CHO2+vLy6v9obn`KV8>!RWE32aY2IriKc7TqJ+-zi5xvM#)**7 zv!&@`$G*r5Gppu{v?yCfK`rJ~Q*-uZqt80iN)p12d9%bZcUMVRhnEtD_HEtLE<{c% zX$)T0b;D9E&CnUkyyofjxy>S`SHwHR6buYI^=53-6nf!(#?Y^XX$ez;EPlEa1xuVb zap&rlI$dNt(+8HR>8DOJYQeJAqJ-YMtmR@tCq}WTnptDbHVp{_c~i5r(%GJ2>nB-b z)jecd!PBg%AF=OIKe#-T~f&G316u*%VKgbm=k z5MJSR2ygH`s^&7`AqDUO7zHw}r|R5UinSDJ{WlJn7If@ft(ed%b5u00h= zBNfH`$wVxgVo+~Yy4u-nayA-EO1S9?7b(jah{t2`=saWks)|LbD$22VIyo0jq$PwZ zf<;{Yy5ea!DqNN>;%FDCiPztthocwks?FqX{+yF~&9rLR?o|q0sYP4tzT@zWuTIp> zvFE@!?koIv_BY4tJj)aRzm{^gdO-D}^wuuja;e1IMFCWIvGxNm5bx!~dYsqHLLIJb znaE*`AFok3j++0)cp0--B-*xV;3uNtX;3S=$Q!nUIHHknMO9DoeuC2*m z;ZyudU;y$*1b@fP?Wso}5vrwESQVf!pdVrWhH=|PMZ6ScR3`@U6{3WNiJa!D0~P#? zTXU?cM;rJ-!iHS- z$BCaHevtn%&ON~v#mZ3hnw^i_5(GR z8Qk3(wmp0r9y{zBnjU-XKfPKBRfx+npyY^Km?cc&1v9~Cq&&=q%VWiz*vDM)L>b e=F-n#5@1R5JVhzUNzH;V&2Q*p7+Mn4l)nMRAS4q2