merging master aftermath

This commit is contained in:
Michael Hoennig 2024-06-17 19:11:03 +02:00
parent 981fbbcf04
commit 875ff5c046

View File

@ -157,7 +157,7 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
attempt(em, () -> { attempt(em, () -> {
context("superuser-alex@hostsharing.net"); context("superuser-alex@hostsharing.net");
final var found = assetRepo.findByUuid(saved.getUuid()); final var found = assetRepo.findByUuid(saved.getUuid());
assertThat(found).isNotEmpty().map(HsHostingAssetEntity::getVersion).get().isEqualTo(saved.getVersion()); assertThat(found).isNotEmpty().map(HsHostingAssetEntity::toString).get().isEqualTo(saved.toString());
}); });
} }
} }
@ -181,14 +181,6 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
"HsHostingAssetEntity(MANAGED_WEBSPACE, thi01, some Webspace, MANAGED_SERVER:vm1013, D-1000313:D-1000313 default project:separate ManagedWebspace)"); "HsHostingAssetEntity(MANAGED_WEBSPACE, thi01, some Webspace, MANAGED_SERVER:vm1013, D-1000313:D-1000313 default project:separate ManagedWebspace)");
} }
public <R> R stopWatch(final String caption, final Supplier<R> operation) {
long start = System.nanoTime();
final R result = operation.get();
System.out.printf("StopWatch %s: %dms\n",
caption, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start));
return result;
}
@Test @Test
public void normalUser_canViewOnlyRelatedAsset() { public void normalUser_canViewOnlyRelatedAsset() {
// given: // given:
@ -197,9 +189,7 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
.findAny().orElseThrow().getUuid(); .findAny().orElseThrow().getUuid();
// when: // when:
final var result = stopWatch("findAllByCriteria", () -> final var result = assetRepo.findAllByCriteria(projectUuid, null, null);
assetRepo.findAllByCriteria(projectUuid, null, null)
);
// then: // then:
exactlyTheseAssetsAreReturned( exactlyTheseAssetsAreReturned(