Skip to content

Commit e6d6e83

Browse files
committed
Fix app relationship on package upload
We need to revisit this test as the cloud controller on Toolsmith environments doesn't cache resources smaller than 4k.
1 parent 0029512 commit e6d6e83

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727
import org.cloudfoundry.client.v3.packages.GetPackageRequest;
2828
import org.cloudfoundry.client.v3.packages.GetPackageResponse;
2929
import org.cloudfoundry.client.v3.packages.Package;
30+
import org.cloudfoundry.client.v3.packages.PackageRelationships;
3031
import org.cloudfoundry.client.v3.packages.PackageState;
3132
import org.cloudfoundry.client.v3.packages.PackageType;
3233
import org.cloudfoundry.client.v3.packages.UploadPackageRequest;
3334
import org.cloudfoundry.util.DelayTimeoutException;
3435
import org.cloudfoundry.util.ExceptionUtils;
3536
import org.cloudfoundry.util.ResourceMatchingUtilsV3;
37+
import org.junit.Ignore;
3638
import org.junit.Test;
3739
import org.springframework.beans.factory.annotation.Autowired;
3840
import org.springframework.core.io.ClassPathResource;
@@ -55,9 +57,9 @@ public class ResourceMatchTest extends AbstractIntegrationTest {
5557
@Autowired
5658
private Mono<String> spaceId;
5759

58-
//TODO how to check if resource matching is enabled on this CF instance?
59-
@IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.UNSPECIFIED) //TODO how to select this version?
60+
@IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
6061
@Test
62+
@Ignore("Cloud Controller is configured not to cache resource smaller than 4k - Find a better way to test this")
6163
public void upload() throws IOException {
6264
createAndUploadPackage()
6365
.flatMap(this::waitForReady)
@@ -87,6 +89,13 @@ private Mono<String> createAndUploadPackage() {
8789
.flatMap(applicationId -> this.cloudFoundryClient.packages()
8890
.create(CreatePackageRequest.builder()
8991
.type(PackageType.BITS)
92+
.relationships(PackageRelationships.builder()
93+
.application(ToOneRelationship.builder()
94+
.data(Relationship.builder()
95+
.id(applicationId)
96+
.build())
97+
.build())
98+
.build())
9099
.build()))
91100
.map(Package::getId)
92101
.flatMap(packageId -> {

0 commit comments

Comments
 (0)