Commit 22a371b3 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch...

Merge branch '108-pipeline-failure-on-develop-two-test-failures-from-model-tmf-35-polymorphism-fix' into 'develop'

Resolve "Pipeline failure on `develop`: two test failures from model.tmf#35 polymorphism fix"

See merge request !107
parents 2d86818c 3eee0caf
Loading
Loading
Loading
Loading
Loading
+3 −1
Changes for src/test/java/org/etsi/osl/services/api/ResourceOrderIntegrationTest.java: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ public class ResourceOrderIntegrationTest extends BaseIT {
		relationships.add(erel );
		
		ResourceRefOrValue resrc = new ResourceRefOrValue();
		
		// Resource's @JsonTypeInfo (model.tmf #35) requires "@type" to be present on the wire;
		// an absent property throws MissingTypeIdException before the custom resolver even runs.
		resrc.setType("LogicalResource");

		resrc
			.addResourceCharacteristicItem(charitem)
+1 −2
Changes for src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ import org.apache.commons.io.IOUtils;
import org.etsi.osl.services.api.BaseIT;
import org.etsi.osl.tmf.JsonUtils;
import org.etsi.osl.tmf.common.model.Attachment;
import org.etsi.osl.tmf.rcm634.model.PhysicalResourceSpecification;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
import org.etsi.osl.tmf.rcm634.reposervices.ResourceSpecificationRepoService;
@@ -366,7 +365,7 @@ public class ServiceSpecificationApiControllerTest extends BaseIT {
                .andReturn().getResponse().getContentAsString();

        assertThat( resourceSpecificationRepoService.findAll().size() ).isEqualTo( originalSize + 1 );
        ResourceSpecification responsesSpec1 = JsonUtils.toJsonObj(responseSpec,  PhysicalResourceSpecification.class);
        ResourceSpecification responsesSpec1 = JsonUtils.toJsonObj(responseSpec,  ResourceSpecification.class);
        assertThat(responsesSpec1.getName()).isEqualTo("Test Resource Spec");
        String rSpecId = responsesSpec1.getId();
        assertThat( specRepoService.findAll().size() ).isEqualTo( 7);