Skip to content

Commit ec5b3b6

Browse files
keilwkeilw
committed
Updated ECB tests
1 parent 8a1d685 commit ec5b3b6

4 files changed

Lines changed: 64 additions & 30 deletions

File tree

‎moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBAbstractRateProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void newDataLoaded(String resourceId, InputStream is) {
104104
LOG.config(loadState);
105105
} catch (Exception e) {
106106
loadState = "Last Error during data load: " + e.getMessage();
107-
LOG.log(Level.FINEST, "Error during data load.", e);
107+
LOG.log(Level.FINEST, "Error during data load.", e); //TODO could be WARNING?
108108
} finally{
109109
loadLock.countDown();
110110
}

‎moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBCurrentRateProviderTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ public void setup() {
5252
}
5353

5454
@Test
55-
public void shouldReturnsECBCurrentRateProvider() {
55+
public void shouldReturnECBCurrentRateProvider() {
5656
assertTrue(Objects.nonNull(provider));
5757
assertEquals(provider.getClass(), ECBCurrentRateProvider.class);
5858
}
5959

6060
@Test
61-
public void shouldReturnsSameDollarValue() {
61+
public void shouldReturnSameDollarValue() {
6262
CurrencyConversion currencyConversion = provider.getCurrencyConversion(DOLLAR);
6363
assertNotNull(currencyConversion);
6464
MonetaryAmount money = Money.of(BigDecimal.TEN, DOLLAR);
@@ -71,7 +71,7 @@ public void shouldReturnsSameDollarValue() {
7171
}
7272

7373
@Test
74-
public void shouldReturnsSameBrazilianValue() {
74+
public void shouldReturnSameBrazilianValue() {
7575
CurrencyConversion currencyConversion = provider
7676
.getCurrencyConversion(BRAZILIAN_REAL);
7777
assertNotNull(currencyConversion);
@@ -85,7 +85,7 @@ public void shouldReturnsSameBrazilianValue() {
8585
}
8686

8787
@Test
88-
public void shouldReturnsSameEuroValue() {
88+
public void shouldReturnSameEuroValue() {
8989
CurrencyConversion currencyConversion = provider
9090
.getCurrencyConversion(EURO);
9191
assertNotNull(currencyConversion);
@@ -99,7 +99,7 @@ public void shouldReturnsSameEuroValue() {
9999
}
100100

101101
@Test
102-
public void shouldConvertsDollarToEuro() {
102+
public void shouldConvertDollarToEuro() {
103103
CurrencyConversion currencyConversion = provider
104104
.getCurrencyConversion(EURO);
105105
assertNotNull(currencyConversion);
@@ -112,7 +112,7 @@ public void shouldConvertsDollarToEuro() {
112112
}
113113

114114
@Test
115-
public void shouldConvertsEuroToDollar() {
115+
public void shouldConvertEuroToDollar() {
116116
CurrencyConversion currencyConversion = provider
117117
.getCurrencyConversion(DOLLAR);
118118
assertNotNull(currencyConversion);
@@ -125,7 +125,7 @@ public void shouldConvertsEuroToDollar() {
125125
}
126126

127127
@Test
128-
public void shouldConvertsBrazilianToDollar() {
128+
public void shouldConvertBrazilianToDollar() {
129129
CurrencyConversion currencyConversion = provider
130130
.getCurrencyConversion(DOLLAR);
131131
assertNotNull(currencyConversion);
@@ -138,7 +138,7 @@ public void shouldConvertsBrazilianToDollar() {
138138
}
139139

140140
@Test
141-
public void shouldConvertsDollarToBrazilian() {
141+
public void shouldConvertDollarToBrazilian() {
142142
CurrencyConversion currencyConversion = provider
143143
.getCurrencyConversion(BRAZILIAN_REAL);
144144
assertNotNull(currencyConversion);

‎moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProviderTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.javamoney.moneta.Money;
4545
import org.javamoney.moneta.convert.ExchangeRateType;
4646
import org.javamoney.moneta.convert.ecb.ECBHistoric90RateProvider;
47+
import org.testng.annotations.BeforeClass;
4748
import org.testng.annotations.BeforeTest;
4849
import org.testng.annotations.Test;
4950

@@ -57,23 +58,22 @@ public class ECBHistoric90RateProviderTest {
5758
private static final CurrencyUnit BRAZILIAN_REAL = Monetary
5859
.getCurrency("BRL");
5960

60-
private ExchangeRateProvider provider;
61+
private static ExchangeRateProvider provider;
6162

62-
@BeforeTest
63-
public void setup() throws InterruptedException {
63+
@BeforeClass
64+
public static void setup() throws InterruptedException {
6465
provider = getExchangeRateProvider(ExchangeRateType.ECB_HIST90);
6566
Thread.sleep(10_000L);
66-
6767
}
6868

6969
@Test
70-
public void shouldReturnsECBHistoric90RateProvider() {
70+
public void shouldReturnECBHistoric90RateProvider() {
7171
assertTrue(Objects.nonNull(provider));
7272
assertEquals(provider.getClass(), ECBHistoric90RateProvider.class);
7373
}
7474

7575
@Test
76-
public void shouldReturnsSameDollarValue() {
76+
public void shouldReturnSameDollarValue() {
7777
CurrencyConversion currencyConversion = provider.getCurrencyConversion(DOLLAR);
7878
assertNotNull(currencyConversion);
7979
MonetaryAmount money = Money.of(BigDecimal.TEN, DOLLAR);
@@ -86,7 +86,7 @@ public void shouldReturnsSameDollarValue() {
8686
}
8787

8888
@Test
89-
public void shouldReturnsSameBrazilianValue() {
89+
public void shouldReturnSameBrazilianValue() {
9090
CurrencyConversion currencyConversion = provider
9191
.getCurrencyConversion(BRAZILIAN_REAL);
9292
assertNotNull(currencyConversion);
@@ -100,7 +100,7 @@ public void shouldReturnsSameBrazilianValue() {
100100
}
101101

102102
@Test
103-
public void shouldReturnsSameEuroValue() {
103+
public void shouldReturnSameEuroValue() {
104104
CurrencyConversion currencyConversion = provider
105105
.getCurrencyConversion(EURO);
106106
assertNotNull(currencyConversion);
@@ -140,7 +140,7 @@ public void shouldConvertsEuroToDollar() {
140140
}
141141

142142
@Test
143-
public void shouldConvertsBrazilianToDollar() {
143+
public void shouldConvertBrazilianToDollar() {
144144
CurrencyConversion currencyConversion = provider
145145
.getCurrencyConversion(DOLLAR);
146146
assertNotNull(currencyConversion);
@@ -153,7 +153,7 @@ public void shouldConvertsBrazilianToDollar() {
153153
}
154154

155155
@Test
156-
public void shouldConvertsDollarToBrazilian() {
156+
public void shouldConvertDollarToBrazilian() {
157157
CurrencyConversion currencyConversion = provider
158158
.getCurrencyConversion(BRAZILIAN_REAL);
159159
assertNotNull(currencyConversion);

‎moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoricRateProviderTest.java‎

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@
1616
package org.javamoney.moneta.convert.ecb;
1717

1818
import static javax.money.convert.MonetaryConversions.getExchangeRateProvider;
19-
import static org.testng.Assert.assertEquals;
20-
import static org.testng.Assert.assertNotNull;
21-
import static org.testng.Assert.assertTrue;
19+
import static org.testng.Assert.*;
20+
2221
import java.math.BigDecimal;
22+
import java.time.LocalDate;
2323
import java.util.Objects;
2424

2525
import javax.money.CurrencyUnit;
2626
import javax.money.Monetary;
2727
import javax.money.MonetaryAmount;
28+
import javax.money.convert.ConversionQueryBuilder;
2829
import javax.money.convert.CurrencyConversion;
2930
import javax.money.convert.ExchangeRateProvider;
31+
import javax.money.convert.MonetaryConversions;
3032

3133
import org.javamoney.moneta.Money;
3234
import org.javamoney.moneta.convert.ExchangeRateType;
@@ -53,13 +55,13 @@ public void setup() throws InterruptedException {
5355
}
5456

5557
@Test
56-
public void shouldReturnsECBHistoricRateProvider() {
58+
public void shouldReturnECBHistoricRateProvider() {
5759
assertTrue(Objects.nonNull(provider));
5860
assertEquals(provider.getClass(), ECBHistoricRateProvider.class);
5961
}
6062

6163
@Test
62-
public void shouldReturnsSameDollarValue() {
64+
public void shouldReturnSameDollarValue() {
6365
CurrencyConversion currencyConversion = provider.getCurrencyConversion(DOLLAR);
6466
assertNotNull(currencyConversion);
6567
MonetaryAmount money = Money.of(BigDecimal.TEN, DOLLAR);
@@ -72,7 +74,7 @@ public void shouldReturnsSameDollarValue() {
7274
}
7375

7476
@Test
75-
public void shouldReturnsSameBrazilianValue() {
77+
public void shouldReturnSameBrazilianValue() {
7678
CurrencyConversion currencyConversion = provider
7779
.getCurrencyConversion(BRAZILIAN_REAL);
7880
assertNotNull(currencyConversion);
@@ -86,7 +88,7 @@ public void shouldReturnsSameBrazilianValue() {
8688
}
8789

8890
@Test
89-
public void shouldReturnsSameEuroValue() {
91+
public void shouldReturnSameEuroValue() {
9092
CurrencyConversion currencyConversion = provider
9193
.getCurrencyConversion(EURO);
9294
assertNotNull(currencyConversion);
@@ -100,7 +102,7 @@ public void shouldReturnsSameEuroValue() {
100102
}
101103

102104
@Test
103-
public void shouldConvertsDollarToEuro() {
105+
public void shouldConvertDollarToEuro() {
104106
CurrencyConversion currencyConversion = provider
105107
.getCurrencyConversion(EURO);
106108
assertNotNull(currencyConversion);
@@ -113,7 +115,7 @@ public void shouldConvertsDollarToEuro() {
113115
}
114116

115117
@Test
116-
public void shouldConvertsEuroToDollar() {
118+
public void shouldConvertEuroToDollar() {
117119
CurrencyConversion currencyConversion = provider
118120
.getCurrencyConversion(DOLLAR);
119121
assertNotNull(currencyConversion);
@@ -126,7 +128,7 @@ public void shouldConvertsEuroToDollar() {
126128
}
127129

128130
@Test
129-
public void shouldConvertsBrazilianToDollar() {
131+
public void shouldConvertBrazilianToDollar() {
130132
CurrencyConversion currencyConversion = provider
131133
.getCurrencyConversion(DOLLAR);
132134
assertNotNull(currencyConversion);
@@ -139,7 +141,7 @@ public void shouldConvertsBrazilianToDollar() {
139141
}
140142

141143
@Test
142-
public void shouldConvertsDollarToBrazilian() {
144+
public void shouldConvertDollarToBrazilian() {
143145
CurrencyConversion currencyConversion = provider
144146
.getCurrencyConversion(BRAZILIAN_REAL);
145147
assertNotNull(currencyConversion);
@@ -150,4 +152,36 @@ public void shouldConvertsDollarToBrazilian() {
150152
assertTrue(result.getNumber().doubleValue() > 0);
151153

152154
}
155+
156+
@Test
157+
void selectFromECBWithGivenDate() {
158+
MonetaryAmount inEUR = Money.of(BigDecimal.TEN, "EUR");
159+
160+
CurrencyConversion conv2 = provider.getCurrencyConversion(ConversionQueryBuilder.of()
161+
.setTermCurrency("USD")
162+
.set(LocalDate.now())
163+
.build());
164+
/*CurrencyConversion conv2 = MonetaryConversions.getConversion(ConversionQueryBuilder.of()
165+
.setProviderName("ECB-HIST")
166+
.setTermCurrency("USD")
167+
.set(LocalDate.now())
168+
.build());*/
169+
170+
/*CurrencyConversion conv1 = MonetaryConversions.getConversion(
171+
ConversionQueryBuilder.of()
172+
.setProviderName("ECB-HIST")
173+
.setTermCurrency("USD")
174+
.set(LocalDate.of(2008, 1, 1))
175+
.build());
176+
*/
177+
CurrencyConversion conv1 = provider.getCurrencyConversion(ConversionQueryBuilder.of()
178+
.setTermCurrency("USD")
179+
.set(LocalDate.of(2008, 1, 1))
180+
.build());
181+
182+
assertEquals(inEUR.with(conv1), inEUR.with(conv1));
183+
assertEquals(inEUR.with(conv2), inEUR.with(conv2));
184+
assertNotEquals(inEUR.with(conv1), inEUR.with(conv2)); // <- failing step
185+
}
186+
153187
}

0 commit comments

Comments
 (0)