Skip to content

Commit d90adec

Browse files
keilwkeilw
committed
OPEN - issue JAVAMONEY-15: EDR Specification Document Cleaning up and
making tests pass https://java.net/jira/browse/JAVAMONEY-15
1 parent 846e228 commit d90adec

File tree

44 files changed

+3047
-3044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3047
-3044
lines changed

‎LICENSE_RI-TCK.txt‎

Lines changed: 202 additions & 202 deletions
Large diffs are not rendered by default.

‎money-api/convert/src/main/java/javax/money/convert/ExchangeRate.java‎

Lines changed: 692 additions & 692 deletions
Large diffs are not rendered by default.

‎money-api/convert/src/test/java/javax/money/convert/ExchangeRateTest.java‎

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,99 @@
1-
package javax.money.convert;
2-
3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNull;
5-
import static org.junit.Assert.assertTrue;
6-
7-
import java.util.Arrays;
8-
9-
import javax.money.CurrencyUnit;
10-
import javax.money.MoneyCurrency;
11-
12-
import org.junit.Test;
13-
14-
public class ExchangeRateTest {
15-
16-
@Test
17-
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberString() {
18-
CurrencyUnit base = MoneyCurrency.of("CHF");
19-
CurrencyUnit term = MoneyCurrency.of("EUR");
20-
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,1.5,"myProvider");
21-
assertEquals(base, rate.getBase());
22-
assertEquals(term, rate.getTerm());
23-
assertTrue(1.5d == rate.getFactor().doubleValue());
24-
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
25-
assertEquals(Arrays.asList(new ExchangeRate[]{rate}), rate.getExchangeRateChain());
26-
assertEquals("myProvider", rate.getProvider());
27-
}
28-
29-
@Test
30-
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberStringLongLong() {
31-
CurrencyUnit base = MoneyCurrency.of("CHF");
32-
CurrencyUnit term = MoneyCurrency.of("EUR");
33-
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,1.5,"myProvider", 10L, 100L);
34-
assertEquals(base, rate.getBase());
35-
assertEquals(term, rate.getTerm());
36-
assertTrue(1.5d == rate.getFactor().doubleValue());
37-
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
38-
assertEquals(Arrays.asList(new ExchangeRate[]{rate}), rate.getExchangeRateChain());
39-
assertEquals("myProvider", rate.getProvider());
40-
assertEquals(10, rate.getValidFrom().longValue());
41-
assertEquals(100, rate.getValidUntil().longValue());
42-
}
43-
44-
@Test
45-
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberStringExchangeRateArray() {
46-
CurrencyUnit base = MoneyCurrency.of("CHF");
47-
CurrencyUnit baseTerm = MoneyCurrency.of("EUR");
48-
CurrencyUnit term = MoneyCurrency.of("USD");
49-
ExchangeRate rate1 = new ExchangeRate(ExchangeRateType.of("test"),base,baseTerm,0.8,"myProvider");
50-
ExchangeRate rate2 = new ExchangeRate(ExchangeRateType.of("test"),baseTerm,term,1.4,"myProvider");
51-
// derived rate
52-
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,0.8 * 1.4,"myProvider", rate1, rate2);
53-
54-
assertEquals(base, rate.getBase());
55-
assertEquals(term, rate.getTerm());
56-
assertTrue(0.8d * 1.4d == rate.getFactor().doubleValue());
57-
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
58-
assertEquals(Arrays.asList(new ExchangeRate[]{rate1, rate2}), rate.getExchangeRateChain());
59-
assertEquals("myProvider", rate.getProvider());
60-
assertNull(rate.getValidFrom());
61-
assertNull(rate.getValidUntil());
62-
}
63-
64-
@Test
65-
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberStringLongLongExchangeRateArray() {
66-
CurrencyUnit base = MoneyCurrency.of("CHF");
67-
CurrencyUnit baseTerm = MoneyCurrency.of("EUR");
68-
CurrencyUnit term = MoneyCurrency.of("USD");
69-
ExchangeRate rate1 = new ExchangeRate(ExchangeRateType.of("test"),base,baseTerm,0.8,"myProvider");
70-
ExchangeRate rate2 = new ExchangeRate(ExchangeRateType.of("test"),baseTerm,term,1.4,"myProvider");
71-
// derived rate
72-
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,0.8 * 1.4,"myProvider", 10L, 100L, rate1, rate2);
73-
74-
assertEquals(base, rate.getBase());
75-
assertEquals(term, rate.getTerm());
76-
assertTrue(0.8d * 1.4d == rate.getFactor().doubleValue());
77-
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
78-
assertEquals(Arrays.asList(new ExchangeRate[]{rate1, rate2}), rate.getExchangeRateChain());
79-
assertEquals("myProvider", rate.getProvider());
80-
assertEquals(10, rate.getValidFrom().longValue());
81-
assertEquals(100, rate.getValidUntil().longValue());
82-
}
83-
84-
85-
@Test
86-
public void testToString() {
87-
CurrencyUnit base = MoneyCurrency.of("CHF");
88-
CurrencyUnit baseTerm = MoneyCurrency.of("EUR");
89-
CurrencyUnit term = MoneyCurrency.of("USD");
90-
ExchangeRate rate1 = new ExchangeRate(ExchangeRateType.of("test"),base,baseTerm,0.8,"myProvider");
91-
ExchangeRate rate2 = new ExchangeRate(ExchangeRateType.of("test"),baseTerm,term,1.4,"myProvider");
92-
// derived rate
93-
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,0.8 * 1.4,"myProvider", 10L, 100L, rate1, rate2);
94-
assertEquals("ExchangeRate [type=test, base=ISO-4217:CHF, term=ISO-4217:USD, factor=1.1199999999999999, validFrom=10, validUntil=100, provider=myProvider]",rate.toString());
95-
rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,1.5,"myProvider");
96-
assertEquals("ExchangeRate [type=test, base=ISO-4217:CHF, term=ISO-4217:USD, factor=1.5, validFrom=null, validUntil=null, provider=myProvider]",rate.toString());
97-
}
98-
99-
}
1+
package javax.money.convert;
2+
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertNull;
5+
import static org.junit.Assert.assertTrue;
6+
7+
import java.util.Arrays;
8+
9+
import javax.money.CurrencyUnit;
10+
import javax.money.MoneyCurrency;
11+
12+
import org.junit.Test;
13+
14+
public class ExchangeRateTest {
15+
16+
@Test
17+
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberString() {
18+
CurrencyUnit base = MoneyCurrency.of("CHF");
19+
CurrencyUnit term = MoneyCurrency.of("EUR");
20+
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,1.5,"myProvider");
21+
assertEquals(base, rate.getBase());
22+
assertEquals(term, rate.getTerm());
23+
assertTrue(1.5d == rate.getFactor().doubleValue());
24+
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
25+
assertEquals(Arrays.asList(new ExchangeRate[]{rate}), rate.getExchangeRateChain());
26+
assertEquals("myProvider", rate.getProvider());
27+
}
28+
29+
@Test
30+
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberStringLongLong() {
31+
CurrencyUnit base = MoneyCurrency.of("CHF");
32+
CurrencyUnit term = MoneyCurrency.of("EUR");
33+
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,1.5,"myProvider", 10L, 100L);
34+
assertEquals(base, rate.getBase());
35+
assertEquals(term, rate.getTerm());
36+
assertTrue(1.5d == rate.getFactor().doubleValue());
37+
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
38+
assertEquals(Arrays.asList(new ExchangeRate[]{rate}), rate.getExchangeRateChain());
39+
assertEquals("myProvider", rate.getProvider());
40+
assertEquals(10, rate.getValidFrom().longValue());
41+
assertEquals(100, rate.getValidUntil().longValue());
42+
}
43+
44+
@Test
45+
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberStringExchangeRateArray() {
46+
CurrencyUnit base = MoneyCurrency.of("CHF");
47+
CurrencyUnit baseTerm = MoneyCurrency.of("EUR");
48+
CurrencyUnit term = MoneyCurrency.of("USD");
49+
ExchangeRate rate1 = new ExchangeRate(ExchangeRateType.of("test"),base,baseTerm,0.8,"myProvider");
50+
ExchangeRate rate2 = new ExchangeRate(ExchangeRateType.of("test"),baseTerm,term,1.4,"myProvider");
51+
// derived rate
52+
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,0.8 * 1.4,"myProvider", rate1, rate2);
53+
54+
assertEquals(base, rate.getBase());
55+
assertEquals(term, rate.getTerm());
56+
assertTrue(0.8d * 1.4d == rate.getFactor().doubleValue());
57+
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
58+
assertEquals(Arrays.asList(new ExchangeRate[]{rate1, rate2}), rate.getExchangeRateChain());
59+
assertEquals("myProvider", rate.getProvider());
60+
assertNull(rate.getValidFrom());
61+
assertNull(rate.getValidUntil());
62+
}
63+
64+
@Test
65+
public void testExchangeRateExchangeRateTypeCurrencyUnitCurrencyUnitNumberStringLongLongExchangeRateArray() {
66+
CurrencyUnit base = MoneyCurrency.of("CHF");
67+
CurrencyUnit baseTerm = MoneyCurrency.of("EUR");
68+
CurrencyUnit term = MoneyCurrency.of("USD");
69+
ExchangeRate rate1 = new ExchangeRate(ExchangeRateType.of("test"),base,baseTerm,0.8,"myProvider");
70+
ExchangeRate rate2 = new ExchangeRate(ExchangeRateType.of("test"),baseTerm,term,1.4,"myProvider");
71+
// derived rate
72+
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,0.8 * 1.4,"myProvider", 10L, 100L, rate1, rate2);
73+
74+
assertEquals(base, rate.getBase());
75+
assertEquals(term, rate.getTerm());
76+
assertTrue(0.8d * 1.4d == rate.getFactor().doubleValue());
77+
assertEquals(ExchangeRateType.of("test"), rate.getExchangeRateType());
78+
assertEquals(Arrays.asList(new ExchangeRate[]{rate1, rate2}), rate.getExchangeRateChain());
79+
assertEquals("myProvider", rate.getProvider());
80+
assertEquals(10, rate.getValidFrom().longValue());
81+
assertEquals(100, rate.getValidUntil().longValue());
82+
}
83+
84+
85+
@Test
86+
public void testToString() {
87+
CurrencyUnit base = MoneyCurrency.of("CHF");
88+
CurrencyUnit baseTerm = MoneyCurrency.of("EUR");
89+
CurrencyUnit term = MoneyCurrency.of("USD");
90+
ExchangeRate rate1 = new ExchangeRate(ExchangeRateType.of("test"),base,baseTerm,0.8,"myProvider");
91+
ExchangeRate rate2 = new ExchangeRate(ExchangeRateType.of("test"),baseTerm,term,1.4,"myProvider");
92+
// derived rate
93+
ExchangeRate rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,0.8 * 1.4,"myProvider", 10L, 100L, rate1, rate2);
94+
assertEquals("ExchangeRate [type=test, base=ISO-4217:CHF, term=ISO-4217:USD, factor=1.1199999999999999, validFrom=10, validUntil=100, provider=myProvider]",rate.toString());
95+
rate = new ExchangeRate(ExchangeRateType.of("test"),base,term,1.5,"myProvider");
96+
assertEquals("ExchangeRate [type=test, base=ISO-4217:CHF, term=ISO-4217:USD, factor=1.5, validFrom=null, validUntil=null, provider=myProvider]",rate.toString());
97+
}
98+
99+
}

0 commit comments

Comments
 (0)