From c87e33f7ba7cd081af08eb48cf6502cd5a6a5813 Mon Sep 17 00:00:00 2001 From: Kthomas Date: Thu, 15 Feb 2018 14:53:11 -0500 Subject: [PATCH 1/3] Just getting started --- src/main/java/Currensy.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/Currensy.java diff --git a/src/main/java/Currensy.java b/src/main/java/Currensy.java new file mode 100644 index 0000000..e1eb4f8 --- /dev/null +++ b/src/main/java/Currensy.java @@ -0,0 +1,7 @@ +import java.util.Scanner; + + +public class Currensy { + + +} \ No newline at end of file From 157dd4d398973a6bc2818fbed9708a4f2cd024ca Mon Sep 17 00:00:00 2001 From: Kthomas Date: Thu, 15 Feb 2018 16:14:20 -0500 Subject: [PATCH 2/3] updates to pom --- pom.xml | 6 +++++- src/main/java/Currency.java | 22 ++++++++++++++++++++++ src/main/java/Currensy.java | 7 ------- src/test/java/currencyTest.java | 6 ++++++ 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 src/main/java/Currency.java delete mode 100644 src/main/java/Currensy.java create mode 100644 src/test/java/currencyTest.java diff --git a/pom.xml b/pom.xml index 682d6db..38ae9ea 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,10 @@ 1.0-SNAPSHOT - + + junit + junit + 4.12 + \ No newline at end of file diff --git a/src/main/java/Currency.java b/src/main/java/Currency.java new file mode 100644 index 0000000..456e44e --- /dev/null +++ b/src/main/java/Currency.java @@ -0,0 +1,22 @@ +import java.util.Scanner; + + +public class Currency { + public static final double USD = 1.00; + public static final double EURO = 0.94; + public static final double POUND = 0.82; + public static final double RUPEE = 68.32; + public static final double AUSTRALIAN = 1.35; + public static final double CANADIAN = 1.32; + public static final double SINGAPORE = 1.43; + public static final double SWISS = 1.01; + public static final double MALAYSIAN = 4.47; + public static final double YEN = 115.84; + public static final double YUAN = 6.92; + + + public static double exchanger(double initialVal, double firstCurrency, double secondCurrency) { + return (initialVal / firstCurrency) * secondCurrency; + } + +} diff --git a/src/main/java/Currensy.java b/src/main/java/Currensy.java deleted file mode 100644 index e1eb4f8..0000000 --- a/src/main/java/Currensy.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.Scanner; - - -public class Currensy { - - -} \ No newline at end of file diff --git a/src/test/java/currencyTest.java b/src/test/java/currencyTest.java new file mode 100644 index 0000000..63ac539 --- /dev/null +++ b/src/test/java/currencyTest.java @@ -0,0 +1,6 @@ +import org.junit.Assert; +import org.junit.Test; + +public class currencyTest { + +} From 6aaaedd2c1b79662aa3d316a9e0c4a88d74bcca2 Mon Sep 17 00:00:00 2001 From: Kthomas Date: Sat, 17 Feb 2018 19:26:21 -0500 Subject: [PATCH 3/3] Basically done but my test are acting funky --- src/main/java/Currency.java | 12 ++-- src/test/java/CurrencyTest.java | 117 ++++++++++++++++++++++++++++++++ src/test/java/currencyTest.java | 6 -- target/classes/Currency.class | Bin 0 -> 924 bytes 4 files changed, 124 insertions(+), 11 deletions(-) create mode 100644 src/test/java/CurrencyTest.java delete mode 100644 src/test/java/currencyTest.java create mode 100644 target/classes/Currency.class diff --git a/src/main/java/Currency.java b/src/main/java/Currency.java index 456e44e..5786267 100644 --- a/src/main/java/Currency.java +++ b/src/main/java/Currency.java @@ -1,5 +1,4 @@ -import java.util.Scanner; - +import java.text.DecimalFormat; public class Currency { public static final double USD = 1.00; @@ -14,9 +13,12 @@ public class Currency { public static final double YEN = 115.84; public static final double YUAN = 6.92; - - public static double exchanger(double initialVal, double firstCurrency, double secondCurrency) { - return (initialVal / firstCurrency) * secondCurrency; + private static double exchangerCalculation (double initialVal, double firstCurrency, double secondCurrency, double exchanger) { + exchanger = secondCurrency * (initialVal / firstCurrency); + return exchanger; } + public double getExchanger(double exchanger){ + return exchanger; + } } diff --git a/src/test/java/CurrencyTest.java b/src/test/java/CurrencyTest.java new file mode 100644 index 0000000..02d9c5b --- /dev/null +++ b/src/test/java/CurrencyTest.java @@ -0,0 +1,117 @@ +import org.junit.Test; +import org.junit.Assert; + +public class CurrencyTest extends Currency{ + + @Test + private static double exchanger() { +//All deltas stopping withing 2 decimals + final CurrencyTest exchanger = new CurrencyTest(); + +//created to test currencyExchangeFormula() + public void USDToEURO(){ + currencyTest = new currencyTest(); + double initialVal = 1.00; + double expected = 0.94; + double actual = test.exchanger(initialVal, exchangeRate.USD, exchangeRate.EURO); + Assert.assertEquals(expected, actual, 0.01); + } + + + // created to test currencyExchangeFormula() +// @Test +// public void USDToEURO() { +// double initialVal = 1.00; +// double expected = 0.94; +// double actual = exchanger.currencyExchange(initialVal, exchangeRate.USD, exchangeRate.EURO); +// Assert.assertEquals(expected, actual, 0.01); //delta measures accuracy, within .01 +// } +// +// @Test +// public void EuroToUsdTest () { +// double initialVal = 0.94; +// double expected = 1.00; +// double actual = exchangeRate.currencyExchange(amountFrom, exchangeRate.EURO, exchangeRate.USD); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void EuroToPoundTest () { +// double initialVal = 0.94; +// double expected = 0.82; +// double actual = exchangeRate.currencyExchangeFormula(initialVal, exchangeRate.EURO, exchangeRate.POUND); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void PoundToRupeeTest () { +// double initialVal = 0.82; +// double expected = 68.32; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.POUND, exchangeRate.RUPEE); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void RupeeToCanadianTest () { +// double initialVal = 68.82; +// double expected = 1.32; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.RUPEE, exchangeRate.CANADIAN); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void CanadianToSingaporeTest () { +// double initialVal = 1.32; +// double expected = 1.43; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.CANADIAN, exchangeRate.SINGAPORE); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void SingaporeToSwissTest () { +// double initialVal = 1.43; +// double expected = 1.01; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.SINGAPORE, exchangeRate.SWISS); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void SwissToMalaysianTest () { +// double initialVal = 1.01; +// double expected = 4.47; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.SWISS, exchangeRate.MALAYSIAN); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public void malaysianToYenTest () { +// double initialVal = 4.47; +// double expected = 115.84; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.MALAYSIAN, exchangeRate.YEN); +// Assert.assertEquals(expected, actual, 0.01); +// } +// +// @Test +// public double yenToYuanTest () { +// double initialVal = 115.84; +// double expected = 6.92; +// double actual = exchangeRate.currencyExchange(initialVal, exchangeRate.YEN, exchangeRate.YUAN); +// Assert.assertEquals(expected, actual, 0.01); +// } + } + } + + + + +// 1. Convert Dollar to Euro +// 2. Convert Euro to Dollar +// 3. Convert Euro to British Pound +// 4. Convert British Pound to Indian Rupee +// 5. Convert Rupee to Canadian Dollar +// 6. Convert Canadian Dollar to Singapore Dollar +// 7. Convert Singapore Dollar to Swiss Franc +// 8. Convert Swiss Franc to Malaysian Ringgit +// 9. Convert Malaysian Ringgit to Japanese Yen +// 10. Convert Japanese Yen to Chinese Yuan Renminbi + diff --git a/src/test/java/currencyTest.java b/src/test/java/currencyTest.java deleted file mode 100644 index 63ac539..0000000 --- a/src/test/java/currencyTest.java +++ /dev/null @@ -1,6 +0,0 @@ -import org.junit.Assert; -import org.junit.Test; - -public class currencyTest { - -} diff --git a/target/classes/Currency.class b/target/classes/Currency.class new file mode 100644 index 0000000000000000000000000000000000000000..58a7a3aeb219df3985b28d8c96330a4c787580ec GIT binary patch literal 924 zcmYk5&uK8|`{YDEwS|{{Dx! zhCr*`ESH7#jd6x3x0TJ7T&v1;p>X_`k9UkFigH~p4P$ekH-5dIXB1Vc^@`kVw8}!^ zgv%csK~LGLDheD($KT#;XOZ<-uE|}6m#$Bbvx40+aGR${Cve$q^W#}AQ8{EJJTNT7 zeTWxI*$$42_KwbIvSwI%eekTOJDY0HL?l_WHP!5>j=^~p47qzopOIKA4jf0fv{$Q) zQu<46PqlV+r>L6Rz*JqswirdE5=Isc6#0b)*D}$~Cx+8^$K{O9^mWa)c1{D)|8k7t zySiH*tHY}_)Klz%qv?+fZZk2iT-sM(sBu~(iFb5lkI@tl=S}#_H+uWJ=F$QM@S%xf zG(#Z@<3kFd07bx2AB*6)j}zcYA5VdkK0XUR=i@Xu