From 70a0b82dbde7670eeba44791be52dca6c937f5c6 Mon Sep 17 00:00:00 2001 From: April Rivera Date: Thu, 15 Feb 2018 14:45:56 -0500 Subject: [PATCH 1/2] first commit --- pom.xml | 10 +++++++ src/main/java/DELETEME | 0 src/main/java/ExchangeRates.java | 41 ++++++++++++++++++++++++++++ src/test/java/DELETEME | 0 src/test/java/TestExchangeRates.java | 12 ++++++++ 5 files changed, 63 insertions(+) delete mode 100644 src/main/java/DELETEME create mode 100644 src/main/java/ExchangeRates.java delete mode 100644 src/test/java/DELETEME create mode 100644 src/test/java/TestExchangeRates.java diff --git a/pom.xml b/pom.xml index 682d6db..f7e57e3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,5 +10,15 @@ + + junit + junit + RELEASE + + + 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/ExchangeRates.java b/src/main/java/ExchangeRates.java new file mode 100644 index 0000000..bbbe1e8 --- /dev/null +++ b/src/main/java/ExchangeRates.java @@ -0,0 +1,41 @@ +import java.util.Locale; +import java.util.Currency; +import java.math.RoundingMode; +import java.text.DecimalFormat; + + + + +public class ExchangeRates { + + public ExchangeRates() { + double USDollar = (1.00); + double BritishPound = (0.94); + double IndianRupee = (68.32); + double AustralianDollar = (1.35); + double CanadianDollar = (1.32); + double SingaporeDollar = (1.43); + double SwissFranc = (1.01); + double MalaysianRinggit = (4.47); + double JapaneseYen = (115.84); + double ChineseYuanRenminbi = (6.92); + } + + DecimalFormat decimalFormat = new DecimalFormat("#.##"); + + + +} + + + + + + + + + + + + + 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/TestExchangeRates.java b/src/test/java/TestExchangeRates.java new file mode 100644 index 0000000..cb59bc6 --- /dev/null +++ b/src/test/java/TestExchangeRates.java @@ -0,0 +1,12 @@ +import org.junit.Test; +import java.text.DecimalFormat; + +public class TestExchangeRates { + + + + + @Test + + +} From 512ab37f896230cc8af98c347c64265f1d185f4a Mon Sep 17 00:00:00 2001 From: April Rivera Date: Sun, 18 Feb 2018 11:49:36 -0500 Subject: [PATCH 2/2] first and last... i hope --- src/main/java/Converter.java | 14 ++++ src/main/java/ExchangeRates.java | 34 +++------ src/test/java/ConverterTest.java | 90 ++++++++++++++++++++++++ src/test/java/TestExchangeRates.java | 12 ---- target/classes/Converter.class | Bin 0 -> 481 bytes target/classes/ExchangeRates.class | Bin 0 -> 684 bytes target/test-classes/ConverterTest.class | Bin 0 -> 2251 bytes 7 files changed, 115 insertions(+), 35 deletions(-) create mode 100644 src/main/java/Converter.java create mode 100644 src/test/java/ConverterTest.java delete mode 100644 src/test/java/TestExchangeRates.java create mode 100644 target/classes/Converter.class create mode 100644 target/classes/ExchangeRates.class create mode 100644 target/test-classes/ConverterTest.class diff --git a/src/main/java/Converter.java b/src/main/java/Converter.java new file mode 100644 index 0000000..1328ffa --- /dev/null +++ b/src/main/java/Converter.java @@ -0,0 +1,14 @@ +public class Converter { + + + static double convertCurrency(double from, double to){ + return convertToDollar(from) * to; + } + static double convertToDollar(double from){ + return ExchangeRates.USDollar / from; + } +// static double convertFromDollar(double to){ +// double targetAmount = to / ExchangeRates.USDollar; +// return targetAmount; +// } +} diff --git a/src/main/java/ExchangeRates.java b/src/main/java/ExchangeRates.java index bbbe1e8..4269216 100644 --- a/src/main/java/ExchangeRates.java +++ b/src/main/java/ExchangeRates.java @@ -1,29 +1,16 @@ -import java.util.Locale; -import java.util.Currency; -import java.math.RoundingMode; -import java.text.DecimalFormat; - - - public class ExchangeRates { - public ExchangeRates() { - double USDollar = (1.00); - double BritishPound = (0.94); - double IndianRupee = (68.32); - double AustralianDollar = (1.35); - double CanadianDollar = (1.32); - double SingaporeDollar = (1.43); - double SwissFranc = (1.01); - double MalaysianRinggit = (4.47); - double JapaneseYen = (115.84); - double ChineseYuanRenminbi = (6.92); - } - - DecimalFormat decimalFormat = new DecimalFormat("#.##"); - - + final static double USDollar = 1.00; + final static double Euro = 0.94; + final static double BritishPound = 0.82; + final static double IndianRupee = 68.32; + final static double CanadianDollar = 1.32; + final static double SingaporeDollar = 1.43; + final static double SwissFranc = 1.01; + final static double MalaysianRinggit = 4.47; + final static double JapaneseYen = 115.84; + final static double ChineseYuanRenminbi = 6.92; } @@ -39,3 +26,4 @@ public ExchangeRates() { + diff --git a/src/test/java/ConverterTest.java b/src/test/java/ConverterTest.java new file mode 100644 index 0000000..fbdfdcc --- /dev/null +++ b/src/test/java/ConverterTest.java @@ -0,0 +1,90 @@ +import org.junit.Test; +import org.omg.CORBA.CODESET_INCOMPATIBLE; + +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertTrue; + +public class ConverterTest { + + @Test + public void convertToDollarTest(){ + //Euro to Dollar + double expected = 1.06; + double actual = Converter.convertToDollar(ExchangeRates.Euro); + assertEquals(expected, actual, 0.5); + } +// @Test +// public void convertFromDollarTest(){ +// double expected = 0.94; +// double actual = Converter.convertFromDollar(ExchangeRates.Euro); +// assertEquals(expected, actual); +// } + @Test + public void convertCurrencyTest2(){ + //Dollar to Euro + double expected = 0.94; + double actual = Converter.convertCurrency(ExchangeRates.USDollar, ExchangeRates.Euro); + assertEquals(expected, actual); + } + @Test + public void convertCurrencyTest3(){ + //Euro to BritishPound + double expected = 0.86; + double actual = Converter.convertCurrency(ExchangeRates.Euro, ExchangeRates.BritishPound); + assertEquals(expected, actual, 0.5); + } + @Test + public void convertCurrencyTest4(){ + //British Pound to Indian Rupee + double expected = 83.32; + double actual = Converter.convertCurrency(ExchangeRates.BritishPound, ExchangeRates.IndianRupee); + assertEquals(expected, actual, 0.5); + } + @Test + public void convertCurrencyTest5(){ + //Indian Rupee to Canadian Dollar + double expected = 0.02; + double actual = Converter.convertCurrency(ExchangeRates.IndianRupee, ExchangeRates.CanadianDollar); + assertEquals(expected, actual, 0.5); + } + @Test + public void convertCurrencyTest6(){ + //Canadian Dollar to Singapore Dollar + double expected = 1.08; + double actual = Converter.convertCurrency(ExchangeRates.CanadianDollar, ExchangeRates.SingaporeDollar); + assertEquals(expected,actual, 0.5); + } + @Test + public void convertCurrencyTest7(){ + //Singapore Dollar to Swiss Franc + double expected = 0.71; + double actual = Converter.convertCurrency(ExchangeRates.SingaporeDollar, ExchangeRates.SwissFranc); + assertEquals(expected, actual,0.5); + } + @Test + public void convertCurrencyTest8(){ + //Swiss Franc to Malaysian Ringgit + double expected= 4.43; + double actual = Converter.convertCurrency(ExchangeRates.SwissFranc, ExchangeRates.MalaysianRinggit); + assertEquals(expected, actual,0.5); + } + @Test + public void convertCurrencyTest9(){ + //Malaysian Ringgit to Japanese Yen + double expected = 25.91; + double actual = Converter.convertCurrency(ExchangeRates.MalaysianRinggit, ExchangeRates.JapaneseYen); + assertEquals(expected, actual,0.5); + } + @Test + public void convertCurrencyTest10(){ + //Japanese Yen to Chinese Yuan Renminbi + double expected = 0.06; + double actual = Converter.convertCurrency(ExchangeRates.JapaneseYen, ExchangeRates.ChineseYuanRenminbi); + assertEquals(expected, actual,0.5); + } + + + + + +} diff --git a/src/test/java/TestExchangeRates.java b/src/test/java/TestExchangeRates.java deleted file mode 100644 index cb59bc6..0000000 --- a/src/test/java/TestExchangeRates.java +++ /dev/null @@ -1,12 +0,0 @@ -import org.junit.Test; -import java.text.DecimalFormat; - -public class TestExchangeRates { - - - - - @Test - - -} diff --git a/target/classes/Converter.class b/target/classes/Converter.class new file mode 100644 index 0000000000000000000000000000000000000000..b4908f1ae97d30bf510e1f8452dd123d0fb136a6 GIT binary patch literal 481 zcmZ8dO;5r=6r3$Bh4LvXex1A!@BkNY7%x;$L=z?4m%2)^bd$9Z{Z+=3#)Ch=A7z{Z zLE>fKyxE!A_xAhe^9#T!jyyQ1d$6(RV&BDqi$j6zSr~`Oxj?4b8VcAweWwH}{V-Nn zv*}2gfgD9-YJDBZXedpX_AAm(#^IAdq2JT-T$x0fF1^9B>CKE$aquGGG=0D2GyLA@ zsemA~68)zfXkSN>G*mPfLhn}3OrS2q^yTt8ygiX~Swt3Y5jAWJlrElwv5X(ojZ72= z$*-jX)l}Sxc-y%iO;nKJn5#Sd3Lpb64wq++U58b$Iw$WCZv+vbxnfe!WJ9tnhD`tXxcg+WL7iBQRXorcK=-R6Xg^PB=an z$kz{a6s?D3JWf))_6U=`OD<2T0fN+63HQo5PI8s3+~b;Wr4 zc(A(u^s!?6IsfpxUla36I`>PkSV^zfTomKmK=@iQo(HjSD#qV*-#;Yvh2-oXD#q{9 zWw6RTbeTv}NuLUp^rbjn9`Htt(yF2TZ?x%Jt zOfnUkYoU3jQYzVQ;VUU$5{Qy7N6S~D<%wu{GFqOBmZziT8G$z<@*W=(NNjqQQo&ww zf_;8vD@S*%Jxj$H#sxYS9~B;0?tOd1^6hdQITg2%kK?wA5AdOikMMCETPi-m9jScE z6|Z=4FQr?mNRQOo_6|ECaIzl4Hir2fHI1i1H*A0WQxOA9XZt^{J7A2*=Z0x*F|js&K- zxFuM8hjDGxGz~2)8rrIeuMQ_QoTwu4(yIrtz$Jzb!aLE6uE2K)t#WPX8$&myF+=}$ zoW#3)YsD<*WhQfc3e4BJ+jNxNell0O0&x54a20BjzbZQZ%Ra;Sv#jGB`Y>>e-Ct*G zAzNis6nml0w!)hGG<3?EHFQ@&`fJJ_BKkawzJSws>lnJPj_wW7ov$g|h(h-e-K{}u zgdQeZCpt;=NK@!^6#6vLY80S!Zq&~rr36TLvR(G)rpg}y-akcNwm&>5mlq8Eu?Y6@*eq2DI@q6WPYdX?zw lL}!V<(G+?y3Oz!!uHl_V=yjquh~6YR*A#k*{~|3|{ui)Fk0$^C literal 0 HcmV?d00001