From c3a6a5ed8dc0a3a02f90884889173d2e5442c56e Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Fri, 16 Feb 2018 06:20:16 -0500 Subject: [PATCH 1/5] the beginning of everything --- src/main/java/ConverterTest.java | 17 +++++++++++++++++ src/main/java/CurrencyConverter.java | 20 ++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/main/java/ConverterTest.java create mode 100644 src/main/java/CurrencyConverter.java diff --git a/src/main/java/ConverterTest.java b/src/main/java/ConverterTest.java new file mode 100644 index 0000000..23a4b06 --- /dev/null +++ b/src/main/java/ConverterTest.java @@ -0,0 +1,17 @@ +/* +* +* Created by amazing amy 2/16/18 +* +* have a nice day +* +* + */ + +public class ConverterTest { + + public static void main(String[] args) { + + } + + //last +} diff --git a/src/main/java/CurrencyConverter.java b/src/main/java/CurrencyConverter.java new file mode 100644 index 0000000..ad5526d --- /dev/null +++ b/src/main/java/CurrencyConverter.java @@ -0,0 +1,20 @@ +/* +* +* Created by amazing amy 2/16/18 +* +* have a nice day +* +* +* + */ + +public class CurrencyConverter { + + public static void main(String[] args) { + + } + + + + //last +} From fa768450cc286fe6eb08945dc9de48dd2dc830b4 Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Sun, 18 Feb 2018 19:38:57 -0500 Subject: [PATCH 2/5] created my testcase enum for getting the correct conversion rate, moving on to test cases now... --- ...onverterTest.java => (ConverterTest).java} | 14 +++ src/main/java/CurrencyConverter.java | 4 +- src/test/java/CurrencyConverterTest.java | 86 ++++++++++++++++++ target/classes/CurrencyConverter.class | Bin 0 -> 394 bytes 4 files changed, 101 insertions(+), 3 deletions(-) rename src/main/java/{ConverterTest.java => (ConverterTest).java} (69%) create mode 100644 src/test/java/CurrencyConverterTest.java create mode 100644 target/classes/CurrencyConverter.class diff --git a/src/main/java/ConverterTest.java b/src/main/java/(ConverterTest).java similarity index 69% rename from src/main/java/ConverterTest.java rename to src/main/java/(ConverterTest).java index 23a4b06..622fba4 100644 --- a/src/main/java/ConverterTest.java +++ b/src/main/java/(ConverterTest).java @@ -1,3 +1,4 @@ + /* * * Created by amazing amy 2/16/18 @@ -7,11 +8,24 @@ * */ +/* + +import org.junit.Before; + +import org.junit.Test; + + public class ConverterTest { public static void main(String[] args) { } + + + @Test + //last } + +*/ \ No newline at end of file diff --git a/src/main/java/CurrencyConverter.java b/src/main/java/CurrencyConverter.java index ad5526d..634b432 100644 --- a/src/main/java/CurrencyConverter.java +++ b/src/main/java/CurrencyConverter.java @@ -13,8 +13,6 @@ public class CurrencyConverter { public static void main(String[] args) { } - - - + public static //last } diff --git a/src/test/java/CurrencyConverterTest.java b/src/test/java/CurrencyConverterTest.java new file mode 100644 index 0000000..c981ab8 --- /dev/null +++ b/src/test/java/CurrencyConverterTest.java @@ -0,0 +1,86 @@ + +/* + * + * Created by amazing amy 2/16/18 + * + * have a nice day + * + * + */ + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + + +public class ConverterTest { + + enum testCurrencyEnum {USD,EUR,GBP, INR, AUD, CAD, SGD, CHF, MYR, JPY, CNY}; + + private double getExchangeRate (testCurrencyEnum theCurrency){ + + switch(theCurrency){ + case USD: return 1.00; + break; + + case EUR: return 0.94; + break; + + case GBP: return 0.82; + break; + + case INR: return 68.32; + break; + + case AUD: return 1.35; + break; + + case CAD: return 1.32; + break; + + case SGD: return 1.43; + break; + + case CHF: return 1.01; + break; + + case MYR: return 4.47; + break; + + case JPY: return 115.84; + break; + + case CNY: return 6.92; + break; + + default: + return 0.00; + + } + } + + public static void main(String[] args) { + + } + + Converter testConverter; + + @Before + public void setup (){ + + testConverter = new Converter(); + + } + + @Test + public void dollarToEuroTest(){ + CurrencyConverter.dollarToEuroTest("EUR"); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + + + //end +} diff --git a/target/classes/CurrencyConverter.class b/target/classes/CurrencyConverter.class new file mode 100644 index 0000000000000000000000000000000000000000..ae4d7b467ffe8a0ff59c083734ee6f94f719e6be GIT binary patch literal 394 zcmZusO-sW-5Pg&8!=}~rLwfgC6%3wRyaYT2Jyd$}w24dHl5Sv43jQolLJ$4`f0Q^I z3kq>zXXd?`_h$F=YySb@8mA$87zdaHm=gS@(yG28^ycSlf}2!Nk`Sdz%e!WqN%J7G zl9@?b<)T~*qbxp Date: Sun, 18 Feb 2018 19:58:54 -0500 Subject: [PATCH 3/5] test case carbs --- src/test/java/CurrencyConverterTest.java | 91 ++++++++++++++++++++---- 1 file changed, 79 insertions(+), 12 deletions(-) diff --git a/src/test/java/CurrencyConverterTest.java b/src/test/java/CurrencyConverterTest.java index c981ab8..ea69101 100644 --- a/src/test/java/CurrencyConverterTest.java +++ b/src/test/java/CurrencyConverterTest.java @@ -17,10 +17,11 @@ public class ConverterTest { enum testCurrencyEnum {USD,EUR,GBP, INR, AUD, CAD, SGD, CHF, MYR, JPY, CNY}; - private double getExchangeRate (testCurrencyEnum theCurrency){ + private double getExchangeRate (testCurrencyEnum desiredXRate){ - switch(theCurrency){ - case USD: return 1.00; + //i am not yet sure if i need to use return or System.out.println(). I think it's the latter. + switch(desiredXRate){ + case USD: System.out.println(1.00); break; case EUR: return 0.94; @@ -56,15 +57,8 @@ private double getExchangeRate (testCurrencyEnum theCurrency){ default: return 0.00; - } - } - - public static void main(String[] args) { - } - Converter testConverter; - @Before public void setup (){ @@ -74,13 +68,86 @@ public void setup (){ @Test public void dollarToEuroTest(){ - CurrencyConverter.dollarToEuroTest("EUR"); + CurrencyConverter.dollarToEuroTest(); double expected = 0; double actual = 0; Assert.assertequals(expected, actual, 0.001); } + @Test + public void euroToDollarTest(){ + CurrencyConverter.euroToDollarTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + @Test + public void dollarToBritishPoundTest(){ + CurrencyConverter.dollarToBritishPoundTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + @Test + public void poundToIndianRupeeTest(){ + CurrencyConverter.poundToIndianRupeeTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + @Test + public void rupeeToCanadianDollarTest(){ + CurrencyConverter.rupeeToCanadianDollarTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + @Test + public void CanadianDollarToSingaporeDollarTest(){ + CurrencyConverter.CanadianDollarToSingaporeDollarTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + @Test + public void singaporeDollarToSwissFrancTest(){ + CurrencyConverter.singaporeDollarToSwissFrancTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + @Test + public void swissFrancToMalaysianRingittTest(){ + CurrencyConverter.swissFrancToMalaysianRingittTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + @Test + public void japaneseYentoChineseYuanRenminbi(){ + CurrencyConverter.swissFrancToMalaysianRingittTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + @Test + public void malaysianRingittToJapaneseYuanTest(){ + CurrencyConverter.malaysianRingittToJapaneseYuanTest(); + double expected = 0; + double actual = 0; + Assert.assertequals(expected, actual, 0.001); + } + + + + - //end + //end } From edd25860e9b355f02410f9c8cc6d0309bcc6049a Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Sun, 18 Feb 2018 20:07:20 -0500 Subject: [PATCH 4/5] test case carbs --- src/main/java/TestCurrencyEnum.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/TestCurrencyEnum.java diff --git a/src/main/java/TestCurrencyEnum.java b/src/main/java/TestCurrencyEnum.java new file mode 100644 index 0000000..9b0288e --- /dev/null +++ b/src/main/java/TestCurrencyEnum.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class TestCurrencyEnum { +} From 00ecbf948c05e147fb4c7ae128e15226331b0fae Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Sun, 18 Feb 2018 20:07:43 -0500 Subject: [PATCH 5/5] this is not the final --- src/main/java/CurrencyConverter.java | 57 +++++- src/main/java/TestCurrencyEnum.java | 5 +- src/test/java/CurrencyConverterTest.java | 227 ++++++++++++----------- 3 files changed, 179 insertions(+), 110 deletions(-) diff --git a/src/main/java/CurrencyConverter.java b/src/main/java/CurrencyConverter.java index 634b432..be16d99 100644 --- a/src/main/java/CurrencyConverter.java +++ b/src/main/java/CurrencyConverter.java @@ -10,9 +10,60 @@ public class CurrencyConverter { - public static void main(String[] args) { + private double getExchangeRate(testCurrencyEnum desiredXRate) { + + //i am not yet sure if i need to use return or System.out.println(). I think it's the latter. + switch (desiredXRate) { + case USD: + System.out.println(1.00); + break; + + case EUR: + return 0.94; + break; + + case GBP: + return 0.82; + break; + + case INR: + return 68.32; + break; + + case AUD: + return 1.35; + break; + + case CAD: + return 1.32; + break; + + case SGD: + return 1.43; + break; + + case CHF: + return 1.01; + break; + + case MYR: + return 4.47; + break; + + case JPY: + return 115.84; + break; + + case CNY: + return 6.92; + break; + + default: + return 0.00; + + } + + return 0.0; } - public static - //last } diff --git a/src/main/java/TestCurrencyEnum.java b/src/main/java/TestCurrencyEnum.java index 9b0288e..21f99ee 100644 --- a/src/main/java/TestCurrencyEnum.java +++ b/src/main/java/TestCurrencyEnum.java @@ -1,4 +1,3 @@ -package PACKAGE_NAME; +public enum TestCurrencyEnum + {USD, EUR, GBP, INR, AUD, CAD, SGD, CHF, MYR, JPY, CNY}; -public class TestCurrencyEnum { -} diff --git a/src/test/java/CurrencyConverterTest.java b/src/test/java/CurrencyConverterTest.java index ea69101..1a7bf15 100644 --- a/src/test/java/CurrencyConverterTest.java +++ b/src/test/java/CurrencyConverterTest.java @@ -15,139 +15,158 @@ public class ConverterTest { - enum testCurrencyEnum {USD,EUR,GBP, INR, AUD, CAD, SGD, CHF, MYR, JPY, CNY}; + enum testCurrencyEnum {USD, EUR, GBP, INR, AUD, CAD, SGD, CHF, MYR, JPY, CNY}; - private double getExchangeRate (testCurrencyEnum desiredXRate){ + private double getExchangeRate(testCurrencyEnum desiredXRate) { //i am not yet sure if i need to use return or System.out.println(). I think it's the latter. - switch(desiredXRate){ - case USD: System.out.println(1.00); - break; + switch (desiredXRate) { + case USD: + System.out.println(1.00); + break; - case EUR: return 0.94; + case EUR: + return 0.94; break; - case GBP: return 0.82; + case GBP: + return 0.82; break; - case INR: return 68.32; + case INR: + return 68.32; break; - case AUD: return 1.35; + case AUD: + return 1.35; break; - case CAD: return 1.32; + case CAD: + return 1.32; break; - case SGD: return 1.43; + case SGD: + return 1.43; break; - case CHF: return 1.01; + case CHF: + return 1.01; break; - case MYR: return 4.47; + case MYR: + return 4.47; break; - case JPY: return 115.84; + case JPY: + return 115.84; break; - case CNY: return 6.92; + case CNY: + return 6.92; break; default: return 0.00; - } - - @Before - public void setup (){ - - testConverter = new Converter(); - - } - - @Test - public void dollarToEuroTest(){ - CurrencyConverter.dollarToEuroTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - - @Test - public void euroToDollarTest(){ - CurrencyConverter.euroToDollarTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); } - @Test - public void dollarToBritishPoundTest(){ - CurrencyConverter.dollarToBritishPoundTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } + // Given + CurrencyType fromType = CurrencyType.USD; + CurrencyType toType = CurrencyType.EURO; + double fromAmount = 1.00; + double expected = 0.94; + +// When + double actual = CurrencyConverter.convert(fromType, toType, fromAmount); + +// Then + Assert.assertEquals(expected, actual); + +// @Before +// public void setup () { +// +// testConverter = new Converter(); +// +// } +// +// @Test +// public void dollarToEuroTest () { +// CurrencyConverter.dollarToEuroTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void euroToDollarTest () { +// CurrencyConverter.euroToDollarTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void dollarToBritishPoundTest () { +// CurrencyConverter.dollarToBritishPoundTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void poundToIndianRupeeTest () { +// CurrencyConverter.poundToIndianRupeeTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void rupeeToCanadianDollarTest () { +// CurrencyConverter.rupeeToCanadianDollarTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void CanadianDollarToSingaporeDollarTest () { +// CurrencyConverter.CanadianDollarToSingaporeDollarTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void singaporeDollarToSwissFrancTest () { +// CurrencyConverter.singaporeDollarToSwissFrancTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// +// @Test +// public void swissFrancToMalaysianRingittTest () { +// CurrencyConverter.swissFrancToMalaysianRingittTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// @Test +// public void japaneseYentoChineseYuanRenminbi () { +// CurrencyConverter.swissFrancToMalaysianRingittTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } +// @Test +// public void malaysianRingittToJapaneseYuanTest () { +// CurrencyConverter.malaysianRingittToJapaneseYuanTest(); +// double expected = 0; +// double actual = 0; +// Assert.assertequals(expected, actual, 0.001); +// } - @Test - public void poundToIndianRupeeTest(){ - CurrencyConverter.poundToIndianRupeeTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - @Test - public void rupeeToCanadianDollarTest(){ - CurrencyConverter.rupeeToCanadianDollarTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - - @Test - public void CanadianDollarToSingaporeDollarTest(){ - CurrencyConverter.CanadianDollarToSingaporeDollarTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - - @Test - public void singaporeDollarToSwissFrancTest(){ - CurrencyConverter.singaporeDollarToSwissFrancTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - - @Test - public void swissFrancToMalaysianRingittTest(){ - CurrencyConverter.swissFrancToMalaysianRingittTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - @Test - public void japaneseYentoChineseYuanRenminbi(){ - CurrencyConverter.swissFrancToMalaysianRingittTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - @Test - public void malaysianRingittToJapaneseYuanTest(){ - CurrencyConverter.malaysianRingittToJapaneseYuanTest(); - double expected = 0; - double actual = 0; - Assert.assertequals(expected, actual, 0.001); - } - - - - - - - //end + } }