From c4639f425e02a19624df00721c87e13b0ca7bc30 Mon Sep 17 00:00:00 2001 From: Lawrence Wu Date: Tue, 13 Feb 2018 22:40:53 -0500 Subject: [PATCH 1/2] need help with enums testing --- pom.xml | 5 ++ src/main/java/DELETEME | 0 .../ExchangeRate/ExchangeRate.java | 43 ++++++++++++++++++ src/test/java/DELETEME | 0 .../ExchangeRate/ExchangeRateTest.java | 40 ++++++++++++++++ .../ExchangeRate/ExchangeRate.class | Bin 0 -> 2368 bytes .../ExchangeRate/ExchangeRateTest.class | Bin 0 -> 1403 bytes 7 files changed, 88 insertions(+) delete mode 100644 src/main/java/DELETEME create mode 100644 src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java delete mode 100644 src/test/java/DELETEME create mode 100644 src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java create mode 100644 target/classes/com/zipcodewilmington/ExchangeRate/ExchangeRate.class create mode 100644 target/test-classes/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.class diff --git a/pom.xml b/pom.xml index 682d6db..956fa2e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,5 +10,10 @@ + + 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/com/zipcodewilmington/ExchangeRate/ExchangeRate.java b/src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java new file mode 100644 index 0000000..333540e --- /dev/null +++ b/src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java @@ -0,0 +1,43 @@ +package com.zipcodewilmington.ExchangeRate; + +public enum ExchangeRate { + USD(1.00), + GBP(0.82), + EUR(0.94), + INR(68.32), + AUD(1.35), + CAD(1.32), + SGD(1.43), + CHF(1.01), + MYR(4.47), + JPY(115.84), + CNY(6.92); + + public double rate; + + public double getRate() { + return rate; + } + + public void setRate(double rate) { + this.rate = rate; + } + + ExchangeRate(double rate) { + this.rate = rate; + } + + public double conversion (double beginningCurrencyAmount, ExchangeRate beginningCurrency, ExchangeRate endingCurrency){ + double fromExchangeRate = beginningCurrency.getRate(); //USD + double toExchangeRate = endingCurrency.getRate(); //Euro + double conversionRate = toExchangeRate/fromExchangeRate; //Euro/USD + double convertedCurrency = conversionRate * beginningCurrencyAmount; + + return convertedCurrency; + + } + + + + +} 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/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java b/src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java new file mode 100644 index 0000000..fb9911e --- /dev/null +++ b/src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java @@ -0,0 +1,40 @@ +package com.zipcodewilmington.ExchangeRate; + + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + + +public class ExchangeRateTest { + +// private ExchangeRate testExchangeRate; + double currentCurrency = 100; + ExchangeRate USD = ExchangeRate.USD; + ExchangeRate GBP = ExchangeRate.GBP; + ExchangeRate EUR = ExchangeRate.EUR; + ExchangeRate INR = ExchangeRate.INR; + ExchangeRate AUD = ExchangeRate.AUD; + ExchangeRate CAD = ExchangeRate.CAD; + ExchangeRate SGD = ExchangeRate.SGD; + ExchangeRate CHF = ExchangeRate.CHF; + ExchangeRate MYR = ExchangeRate.MYR; + ExchangeRate JPY = ExchangeRate.JPY; + ExchangeRate CNY = ExchangeRate.CNY; + +// @Before +// public void createExchangeRate(){ +// this.testExchangeRate = new ExchangeRate(); +// } + +@Test +public void testUSDtoEuro(){ + + double expected = 94.0; + double actual = ExchangeRateTest.conversion(currentCurrency, USD, EUR); + Assert.assertEquals(expected, actual, 0.1); +} + + + +} diff --git a/target/classes/com/zipcodewilmington/ExchangeRate/ExchangeRate.class b/target/classes/com/zipcodewilmington/ExchangeRate/ExchangeRate.class new file mode 100644 index 0000000000000000000000000000000000000000..bb6929fc6b3d81cc01b9f25b715c31fdafa47237 GIT binary patch literal 2368 zcmbVM-*XdX6g}H)b~ituX^FH@NeD7#$tPNB;qzdDR)m7kG3$_iJcV@TDX(_kQ>6z3034>`i|E_orV0 zbmQX?bS#A7V9~^giKQ@la7{p0PS?Xc-LP<6d_mx%g_B15&w-oY{1F}yz_W15NdFyQ zeLQwIE`V>L*T`Jl0B%}1ZKR)kA)hZL;{ywQ1ol3>_}8Z$0+cND8|kOQu=-elWeWpF z`k%y;-#)vN6rgNj(8x4xWK=Aqjm#BENIaE{6$=?7(*UHyuaYwatlS*TPpirYV>ygTFzT?W^!d`Q_#oCu`|=Oqq8%#2zGBglu=o z%ato7l7;iWx8jtRUEkBNm>AjeC|fR&=3C~SCD-#P-f*QDWzmJh9?qF3zYKuR&D8}(&6hk-@g^iD*n8cKvE=6%1 zC!#nh=9HLTF{j1!iRl+JAZAcZT1*BfDBi|O%g`Ev`GW7U_jn>%C&<+Nbthlue8=lo zYq*eGUhb<)TmMyTW@X*Z`np=$cycb&&3~XC{>5&~?2-`xdQPD{2T`80D9>?}=S0eL zDCIeq@*GWhPNzHvB(o-R0kPd8J!2CgjN&ZuF-EV_%O_lgb{`Fo5crOfhI6!rdKO^* zIL_Ddd(fcJaI@a^5Wz>#CBI=){+mRiYgw4U1;xh~Rbxoi7=m3t!1(sL;vLv14r01C zz(vf|iU$$km#uYm{s`my_3AK5fffYOsu*^v*r+kcC?bMJl*>XZqn{&FkUrXVXwL(f zUCB+1+toe0S=ojN_SCUP*ICsjGH+J(AwACFty-sF@x^W<-hTK#tlr=*U7Xo!wg&y) zP;033MsK7wvN8Tn)k+7i+sCr~i1W?t#zA%M3@jm9zqTE3t6>DoQX&zg9q;g@v%UqF z`7}tD7_RVSk}HIFc?yv+fU7)3$oL-KUu#txV--JI;AiOB=1`#V0mAnXQBhQnW1ET_ zRU8Y((WK%XDvld*yrSY36}Osk>{4-?iuYJ?w5zy7#rt9`*sp*C3OE>J#cK-aR6rue zlB5C-Dd6>3D2~GlNGafrSU8Su1ssb-eqqyrDk64PucFb;2CLX%XN@Xa?5tTuo1L|) z=&-XfLI>!GbHN?VfYmB Y6XtwQp}%IyI4cg+v`p5D48`hG2oZxN(KK~>@;CG^9OCrg z2l!Dg_qnn}AKR|%z0bW#&ajjG{Pq0@fN?xb<0wkTWP=fZ-8h0<-LOy=MX*p2MX)d> zieO<{6v4ubD1wDqQ3MNfq6ijliy~O4iXvFJBZ^?5CaPvkuDto1`)-=+^Ty3@Z{_zc zjeA%~VKIdzg-qnOqRLC>vF)$B3wGoxj8~mtv-sM3>I7@<3$MB9`Rh^O7ymu$zhFY4 z*J+2L>qnL*=aqsgE9_Wa6r8>_Ppm925NB(GrDa*SN`i~iTF*>T-)YG1+FzypPI9hxcyu?H!s*yO`eyt}%=?iGq1-bf+s1pae3Y;i0K zk4DR#`Z3Y*1$jPFneFM9S}iwZ>87nk4^$sZ%HkUK@SBmt9QygS7{Dc7W&SA=mvM!W!c{hq&<#9+ zft_3%&f&mJ;S&z>Nb)dvq(9@(+(}SA Date: Tue, 13 Feb 2018 23:30:01 -0500 Subject: [PATCH 2/2] Nvm got it done. Need to work on the delta though --- .../ExchangeRate/ExchangeRate.java | 77 +++++++++--------- .../ExchangeRate/ExchangeRateTest.java | 73 ++++++++++++++--- .../ExchangeRate/ExchangeRate.class | Bin 2368 -> 2357 bytes .../ExchangeRate/ExchangeRateTest.class | Bin 1403 -> 2464 bytes 4 files changed, 97 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java b/src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java index 333540e..2e93a08 100644 --- a/src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java +++ b/src/main/java/com/zipcodewilmington/ExchangeRate/ExchangeRate.java @@ -1,43 +1,40 @@ package com.zipcodewilmington.ExchangeRate; public enum ExchangeRate { - USD(1.00), - GBP(0.82), - EUR(0.94), - INR(68.32), - AUD(1.35), - CAD(1.32), - SGD(1.43), - CHF(1.01), - MYR(4.47), - JPY(115.84), - CNY(6.92); - - public double rate; - - public double getRate() { - return rate; - } - - public void setRate(double rate) { - this.rate = rate; - } - - ExchangeRate(double rate) { - this.rate = rate; - } - - public double conversion (double beginningCurrencyAmount, ExchangeRate beginningCurrency, ExchangeRate endingCurrency){ - double fromExchangeRate = beginningCurrency.getRate(); //USD - double toExchangeRate = endingCurrency.getRate(); //Euro - double conversionRate = toExchangeRate/fromExchangeRate; //Euro/USD - double convertedCurrency = conversionRate * beginningCurrencyAmount; - - return convertedCurrency; - - } - - - - -} + USD(1.00f), + GBP(0.82f), + EUR(0.94f), + INR(68.32f), + AUD(1.35f), + CAD(1.32f), + SGD(1.43f), + CHF(1.01f), + MYR(4.47f), + JPY(115.84f), + CNY(6.92f); + + public double rate; + + public double getRate() { + return rate; + } + + public void setRate(double rate) { + this.rate = rate; + } + + ExchangeRate(double rate) { + this.rate = rate; + } + + public static double conversion(double beginningCurrencyAmount, ExchangeRate beginningCurrency, ExchangeRate endingCurrency) { + double fromExchangeRate = beginningCurrency.getRate(); //USD + double toExchangeRate = endingCurrency.getRate(); //Euro + double conversionRate = toExchangeRate / fromExchangeRate; //Euro/USD + double convertedCurrency = conversionRate * beginningCurrencyAmount; + + return convertedCurrency; + + } + + } diff --git a/src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java b/src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java index fb9911e..c97e40d 100644 --- a/src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java +++ b/src/test/java/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.java @@ -5,11 +5,11 @@ import org.junit.Before; import org.junit.Test; - public class ExchangeRateTest { -// private ExchangeRate testExchangeRate; - double currentCurrency = 100; + // private ExchangeRate testExchangeRate; + double currentCurrency = 1; + public static final double delta = 0.01; ExchangeRate USD = ExchangeRate.USD; ExchangeRate GBP = ExchangeRate.GBP; ExchangeRate EUR = ExchangeRate.EUR; @@ -22,19 +22,66 @@ public class ExchangeRateTest { ExchangeRate JPY = ExchangeRate.JPY; ExchangeRate CNY = ExchangeRate.CNY; -// @Before -// public void createExchangeRate(){ -// this.testExchangeRate = new ExchangeRate(); -// } -@Test -public void testUSDtoEuro(){ + @Test + public void testUSDToEuro() { - double expected = 94.0; - double actual = ExchangeRateTest.conversion(currentCurrency, USD, EUR); - Assert.assertEquals(expected, actual, 0.1); -} + double expected = .94; + double actual = ExchangeRate.conversion(currentCurrency, USD, EUR); + Assert.assertEquals(expected, actual, delta); + + } + + @Test + public void testEuroToUSD() { + + double expected = 1.06; + double actual = ExchangeRate.conversion(currentCurrency, EUR, USD); + Assert.assertEquals(expected, actual, delta); + + } + + @Test + public void testEuroToGBP() { + + double expected = .87; + double actual = ExchangeRate.conversion(currentCurrency, EUR, GBP); + Assert.assertEquals(expected, actual, delta); + } + @Test + public void testCNYToJPY() { + + double expected = 16.73; + double actual = ExchangeRate.conversion(currentCurrency, CNY, JPY); + Assert.assertEquals(expected, actual, delta); + } + @Test + public void testJPYToCNY() { + + double expected = 0.05; + double actual = ExchangeRate.conversion(currentCurrency, JPY, CNY); + Assert.assertEquals(expected, actual, delta); + } + + @Test + public void testINRToCAD() { + double expected = .019; + double actual = ExchangeRate.conversion(currentCurrency, INR, CAD); + Assert.assertEquals(expected, actual, delta); + } + @Test + public void testAUDToSGD() { + double expected = 1.05; + double actual = ExchangeRate.conversion(currentCurrency, AUD, SGD); + Assert.assertEquals(expected, actual, delta); + } + @Test + public void testCHFToMYR() { + double expected = 4.42; + double actual = ExchangeRate.conversion(currentCurrency, CHF, MYR); + Assert.assertEquals(expected, actual, delta); + } } diff --git a/target/classes/com/zipcodewilmington/ExchangeRate/ExchangeRate.class b/target/classes/com/zipcodewilmington/ExchangeRate/ExchangeRate.class index bb6929fc6b3d81cc01b9f25b715c31fdafa47237..5fee982f36acc633dbdca0f8a57dafee73cc7682 100644 GIT binary patch delta 317 zcmX>gv{h(=bNvDa1_n+B7KS_y1`9U(cOq2}paS_E43=yTfe3*D4hAbW`>!)+!n71} zFjxZx8?+V8*}%W<>#6 q%nWP{VhqthS&#(+3^70!8_)z!hFBnr185F2LmZIBwfQD{IwJtxLo+V` delta 328 zcmdlgbUIwm??kE|x~~%f3FLDySh6_;A_NLJ7_8Xrzs>}K zSs)dK91PY#0l6K4uUq9o0!17QHf;9aKqgc@1PK&#Fxax$f6(}Ps6R#%Bv8V^V8`Yl zh)^L{%E4gI<`4r?q45o*q>O{Xfz3f0WQ6;=jSu|U3>g{17{VDC8Qd8d80G?1@B(RB z-E9mUmaLL2Ac|drU4k{=l2d|HJ=>C7f_rj2yI3+WgCc_ngA#)jg9?K;P)8602S^`7 z0D~Ej2C*U-oPef+Sdl<6W-u!X$YNn&V-RPE2FkJm?Gj*!0kYVEW^ppa0$H3u6PX#} MfGqCK=h)L30n55U&j0`b diff --git a/target/test-classes/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.class b/target/test-classes/com/zipcodewilmington/ExchangeRate/ExchangeRateTest.class index 2a2629dafcc5270f10a9618174171a0bf49fb65a..35c0b9c67a62a19559e204e199b6c192dfc30fe7 100644 GIT binary patch literal 2464 zcmbW1Piz}S6vn@`leOd8iQ_tHB1r!rXdSDHla{6}Y2u`@6E`?ci0v(b@@KQzI&19R zV6RJQB~IKqaDpo*E|rS1qN)%FjtI^@aN>-FxPZh3@y!IQL9#5xmi&G1&F;+n=Do3h z{O9TS0A^4RVG5-IyomAuG~5;uMZ=pSqG;F_5kL#4($YBsOe8-{xF1Hm}>fuKY#e_PU0^${oAw9 z{Qg(Z)Wzwi;{Ate`s**m=SwyHx%*x9lfQrA%Rh;8q_EhM2QN9Y1~O$-a%3@N$^tSKm6IteS#o3v59j7qN{*~zsOYpB zhPh&i@{Anqk6@Xq>i6_8(pU^5h3Nn)VO++mVO$Y1E99z>YeKFIc}>WikQ+kgg)9i! zgQei|F|UPS2%s9q2VfPWf+kht1xjt~R9RyMsbemvAY?f9J+skd@fF-nWRBbQxnob5 zWD}y#d%VUjB{;a3?rxM|pC8v(_4`vz)E;06Dg31<9 zA-W))jgZb>NM}2wvm?^k6zS}Xbhbu1yCa@oa|fZNG$p(KYq_>$ki z@1c*@??I&nJOpV29zwJe9>TPUhd~-AL}|kwVziSU;cS7si(Qk8TR0u+~6#$AjS_j=wmNdWiR4H z%`x)h7N4u!dX28&^-ch1+W;vNVEY$ z1Q_fFkR`wh0agi+>j_}96F{;J5GFvh8$g}_>jWqeV5291H#z}aYy-py5bp+1BtVG( PWddkD0c`Qd=tJ>eZ!yL_ delta 731 zcmYL{OK%cU9L0ZkKoG=6qS4qz#Y9*59cHB~ zzk=__!iDZ!_&waZH8Gz5)##A+5OT?!5OP_rX$+aS$@xTm<;lPB zD{0MNO-y}wYR9uQ*H}ohm}JS3?R6jYW*&9!tghYeF0A&tj%xJHO%x^_gPn)#>)o|p z=%w@6;Tn$E@?s;JbDv!=8VFj^mtb`1D91AFqnuFL!wdj8Adw)a^6E+jr62B)Uc~z2Eg?Uw;S4DbNs#gVjRkl~f zdsPFkD&bW7cxHzB0ova3}d%d`7ErTVR_Nl-RCsp{VC)DMf8Wclw(Wr@*9|Iju>lRasZh P>Uu&m=cJA)F`)h%I#pPE