Skip to content

Commit

Permalink
add timeouts to all tests (corda#5875)
Browse files Browse the repository at this point in the history
  • Loading branch information
roastario authored Feb 11, 2020
1 parent 1d0918c commit b23af5f
Show file tree
Hide file tree
Showing 485 changed files with 5,655 additions and 5,625 deletions.
3 changes: 3 additions & 0 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM amazoncorretto:8u242
RUN yum install -y shadow-utils
RUN useradd -m buildUser
Original file line number Diff line number Diff line change
Expand Up @@ -18,68 +18,68 @@ class AmountTest {
private val yamlMapper: ObjectMapper = ObjectMapper(YAMLFactory()).registerModule(CordaModule())
}

@Test
fun `Amount(Currency) JSON deserialization`() {
@Test(timeout=300_000)
fun `Amount(Currency) JSON deserialization`() {
val str = """{ "quantity": 100, "token": "USD" }"""
val amount = jsonMapper.readValue<Amount<Currency>>(str, object : TypeReference<Amount<Currency>>() {})
assertThat(amount.quantity).isEqualTo(100)
assertThat(amount.token).isEqualTo(Currency.getInstance("USD"))
}

@Test
fun `Amount(Currency) YAML deserialization`() {
@Test(timeout=300_000)
fun `Amount(Currency) YAML deserialization`() {
val str = """{ quantity: 100, token: USD }"""
val amount = yamlMapper.readValue<Amount<Currency>>(str, object : TypeReference<Amount<Currency>>() {})
assertThat(amount.quantity).isEqualTo(100)
assertThat(amount.token).isEqualTo(Currency.getInstance("USD"))
}

@Test
fun `Amount(CarbonCredit) JSON deserialization`() {
@Test(timeout=300_000)
fun `Amount(CarbonCredit) JSON deserialization`() {
val str = """{ "quantity": 200, "token": { "type": "CO2" } }"""
val amount = jsonMapper.readValue<Amount<CarbonCredit>>(str, object : TypeReference<Amount<CarbonCredit>>() {})
assertThat(amount.quantity).isEqualTo(200)
assertThat(amount.token).isEqualTo(CO2)
}

@Test
fun `Amount(CarbonCredit) YAML deserialization`() {
@Test(timeout=300_000)
fun `Amount(CarbonCredit) YAML deserialization`() {
val str = """{ quantity: 250, token: { type: CO2 } }"""
val amount = yamlMapper.readValue<Amount<CarbonCredit>>(str, object : TypeReference<Amount<CarbonCredit>>() {})
assertThat(amount.quantity).isEqualTo(250)
assertThat(amount.token).isEqualTo(CO2)
}

@Test
fun `Amount(Unknown) JSON deserialization`() {
@Test(timeout=300_000)
fun `Amount(Unknown) JSON deserialization`() {
val str = """{ "quantity": 100, "token": "USD" }"""
val amount = jsonMapper.readValue<Amount<*>>(str, object : TypeReference<Amount<*>>() {})
assertThat(amount.quantity).isEqualTo(100)
assertThat(amount.token).isEqualTo(Currency.getInstance("USD"))
}

@Test
fun `Amount(Unknown) YAML deserialization`() {
@Test(timeout=300_000)
fun `Amount(Unknown) YAML deserialization`() {
val str = """{ quantity: 100, token: USD }"""
val amount = yamlMapper.readValue<Amount<*>>(str, object : TypeReference<Amount<*>>() {})
assertThat(amount.quantity).isEqualTo(100)
assertThat(amount.token).isEqualTo(Currency.getInstance("USD"))
}

@Test
fun `Amount(Currency) YAML serialization`() {
@Test(timeout=300_000)
fun `Amount(Currency) YAML serialization`() {
assertThat(yamlMapper.valueToTree<TextNode>(Amount.parseCurrency("£25000000"))).isEqualTo(TextNode("25000000.00 GBP"))
assertThat(yamlMapper.valueToTree<TextNode>(Amount.parseCurrency("$250000"))).isEqualTo(TextNode("250000.00 USD"))
}

@Test
fun `Amount(CarbonCredit) JSON serialization`() {
@Test(timeout=300_000)
fun `Amount(CarbonCredit) JSON serialization`() {
assertThat(jsonMapper.writeValueAsString(Amount(123456, CO2)).trim())
.isEqualTo(""""123456 CarbonCredit(type=CO2)"""")
}

@Test
fun `Amount(CarbonCredit) YAML serialization`() {
@Test(timeout=300_000)
fun `Amount(CarbonCredit) YAML serialization`() {
assertThat(yamlMapper.writeValueAsString(Amount(123456, CO2)).trim())
.isEqualTo("""--- "123456 CarbonCredit(type=CO2)"""")
}
Expand Down
Loading

0 comments on commit b23af5f

Please sign in to comment.