hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 1 Activity

fix expected resources in acceptance test

Browse Source
This commit is contained in:
Michael Hoennig 2024-04-15 07:36:54 +02:00
parent 101443c474
commit fff15bacad
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java
View File

@ -66,26 +66,25 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
.then().log().all().assertThat() .then().log().all().assertThat()
.statusCode(200) .statusCode(200)
.contentType("application/json") .contentType("application/json")
.log().all()
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
[ [
{ {
"caption": "some ManagedServer", "caption": "some ManagedServer",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
"validTo": null, "validTo": null,
"resources": null "resources": { CPUs: 2, SDD-storage: 512 }
}, },
{ {
"caption": "some CloudServer", "caption": "some CloudServer",
"validFrom": "2023-01-15", "validFrom": "2023-01-15",
"validTo": "2024-04-14", "validTo": "2024-04-14",
"resources": null "resources": { CPUs: 2, HDD-storage: 1024 }
}, },
{ {
"caption": "some Whatever", "caption": "some Whatever",
"validFrom": "2024-04-01", "validFrom": "2024-04-01",
"validTo": null, "validTo": null,
"resources": null "resources": { CPUs: 1, HDD-storage: 2048, SDD-storage: 512 }
} }
] ]
""")); """));
@ -110,9 +109,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
{ {
"debitorUuid": "%s", "debitorUuid": "%s",
"caption": "some new booking", "caption": "some new booking",
"resources": { "resources": { "something": 12 },
"something": 12
},
"validFrom": "2022-10-13" "validFrom": "2022-10-13"
} }
""".formatted(givenDebitor.getUuid())) """.formatted(givenDebitor.getUuid()))
@ -127,7 +124,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
"caption": "some new booking", "caption": "some new booking",
"validFrom": "2022-10-13", "validFrom": "2022-10-13",
"validTo": null, "validTo": null,
"resources": null "resources": { "something": 12 }
} }
""")) """))
.header("Location", startsWith("http://localhost")) .header("Location", startsWith("http://localhost"))
@ -165,7 +162,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
"caption": "some CloudServer", "caption": "some CloudServer",
"validFrom": "2023-01-15", "validFrom": "2023-01-15",
"validTo": "2024-04-14", "validTo": "2024-04-14",
"resources": null "resources": { CPUs: 2, HDD-storage: 1024 }
} }
""")); // @formatter:on """)); // @formatter:on
} }
@ -210,7 +207,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
"caption": "some CloudServer", "caption": "some CloudServer",
"validFrom": "2023-01-15", "validFrom": "2023-01-15",
"validTo": "2024-04-14", "validTo": "2024-04-14",
"resources": null "resources": { CPUs: 2, HDD-storage: 1024 }
} }
""")); // @formatter:on """)); // @formatter:on
} }