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

introduce-booking-module #41

Merged
hsh-michaelhoennig merged 21 commits from introduce-booking-module into master 2024-04-16 11:21:35 +02:00
Conversation 0 Commits 21 Files Changed 33 +7 -10
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09405eb549 - Show all commits

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