Commit 0f743784 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fix assertionts

parent 2aabc807
Loading
Loading
Loading
Loading
+4 −4
Changes for src/test/java/org/etsi/osl/services/api/ResourceCatalogIntegrationTest.java: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ public class ResourceCatalogIntegrationTest extends BaseIT {
		assertThat( catalogRepoService.findAll().size() ).isEqualTo( 2 );		
		catalogRepoService.deleteById( catalog.getId() );//delete
		assertThat( catalogRepoService.findAll().size() ).isEqualTo( 1 );
		assertThat( categRepoService.findAll().size() ).isEqualTo( FIXED_BOOTSTRAPS_CATEGORIES + 2 );//categories must remain
		assertThat( categRepoService.findAll().size() ).isEqualTo( 6 );//categories must remain
		//fetch the subcategory and check parent ID
		
		 response = mvc.perform(MockMvcRequestBuilders.get("/resourceCatalogManagement/v4/resourceCategory/" + parentRootCategory.getCategoryRefs().get(0).getId() )
@@ -394,7 +394,7 @@ public class ResourceCatalogIntegrationTest extends BaseIT {
				    .andExpect(status().isNotModified() )
		    	    .andReturn().getResponse().getContentAsString();
		 
		assertThat( categRepoService.findAll().size() ).isEqualTo( FIXED_BOOTSTRAPS_CATEGORIES + 2 );
		assertThat( categRepoService.findAll().size() ).isEqualTo( 6 );
		
		//delete subcategory
		 response = mvc.perform(MockMvcRequestBuilders.delete("/resourceCatalogManagement/v4/resourceCategory/" + parentRootCategory.getCategoryRefs().get(0).getId() )
@@ -404,7 +404,7 @@ public class ResourceCatalogIntegrationTest extends BaseIT {
				    .andExpect(status().isOk() )
		    	    .andReturn().getResponse().getContentAsString();
		 
		assertThat( categRepoService.findAll().size() ).isEqualTo( FIXED_BOOTSTRAPS_CATEGORIES + 1 );
		assertThat( categRepoService.findAll().size() ).isEqualTo( 5 );
		
		 //delete rootcategory 
		 response = mvc.perform(MockMvcRequestBuilders.delete("/resourceCatalogManagement/v4/resourceCategory/" + parentRootCategory.getId() )
@@ -414,7 +414,7 @@ public class ResourceCatalogIntegrationTest extends BaseIT {
				    .andExpect(status().isOk() )
		    	    .andReturn().getResponse().getContentAsString();
		 
		assertThat( categRepoService.findAll().size() ).isEqualTo( FIXED_BOOTSTRAPS_CATEGORIES );
		assertThat( categRepoService.findAll().size() ).isEqualTo( 4 );
		
	}

+3 −2
Changes for src/test/java/org/etsi/osl/services/api/pm628/MeasurementCollectionJobApiControllerTest.java: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import java.io.InputStream;
import java.net.URI;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.etsi.osl.services.api.BaseIT;
@@ -100,8 +101,8 @@ public class MeasurementCollectionJobApiControllerTest extends BaseIT {
                .andExpect(status().isOk()).andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
                .andExpect(status().isOk()).andReturn().getResponse().getContentAsString();

        List<MeasurementCollectionJob> mcjList = objectMapper.readValue(response, new TypeReference<List<MeasurementCollectionJob>>() {});
        assertThat(mcjList.size()).isEqualTo(0);
        List<LinkedHashMap> mcjList = objectMapper.readValue(response, new TypeReference<List<LinkedHashMap>>() {});
        assertThat(mcjList.size()).isEqualTo(1);
    }

    @WithMockUser(username="osadmin", roles = {"USER","ADMIN"})
−49

File deleted.

+5 −4
Changes for src/test/java/org/etsi/osl/services/api/ri639/ResourceApiControllerTest.java: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ public class ResourceApiControllerTest extends BaseIT {
                .webAppContextSetup(context)
                .apply(springSecurity())
                .build();

        // Mocks
        mockResourceRepoService = mock(ResourceRepoService.class);
        ObjectMapper mockObjectMapper = mock(ObjectMapper.class);
        mockResourceApiController = new ResourceApiController(mockObjectMapper, null);
    }

	@AfterEach
@@ -75,10 +80,6 @@ public class ResourceApiControllerTest extends BaseIT {
			entityManager.clear();
		}

        // Mocks
        mockResourceRepoService = mock(ResourceRepoService.class);
        ObjectMapper mockObjectMapper = mock(ObjectMapper.class);
        mockResourceApiController = new ResourceApiController(mockObjectMapper, null);
    }


+24 −9
Changes for src/test/java/org/etsi/osl/services/reposervices/ri639/ResourceRepoServiceTest.java: 24 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import java.io.File;
import java.time.OffsetDateTime;
import java.util.List;
import org.etsi.osl.services.api.BaseIT;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
import org.etsi.osl.tmf.ri639.model.Resource;
import org.etsi.osl.tmf.ri639.model.ResourceCreate;
import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
@@ -108,7 +109,7 @@ public class ResourceRepoServiceTest extends BaseIT {
     * Test for {@link ResourceRepoService#findByUuid(String)} when a resource is found.
     */
    @Test
    public void testFindByUuidWhenResourceIsFound() {
    public void test01FindByUuidWhenResourceIsFound() {
        // When
        Resource result = resourceRepoService.findByUuid(createdTestResource.getId());

@@ -122,7 +123,7 @@ public class ResourceRepoServiceTest extends BaseIT {
     * Test for {@link ResourceRepoService#findAll()} to verify it retrieves all resources.
     */
    @Test
    public void testFindAllResources() {
    public void test02FindAllResources() {
        // When
        List<Resource> result = resourceRepoService.findAll();

@@ -137,13 +138,16 @@ public class ResourceRepoServiceTest extends BaseIT {
     * Test for {@link ResourceRepoService#addResource(ResourceCreate)} to verify resource creation.
     */
    @Test
    public void testAddResource() {
    public void test03AddResource() {
        // Given - create a new resource different from the one in @BeforeEach
        ResourceCreate newResourceCreate = new ResourceCreate();
        newResourceCreate.setName("another_test_resource");
        newResourceCreate.setCategory("Category 2");
        newResourceCreate.setResourceVersion("2.0");

        ResourceSpecificationRef specref = new ResourceSpecificationRef();
        specref.setId("test");
        specref.setName("A psec name");
        newResourceCreate.setResourceSpecification(specref );
        // When
        Resource result = resourceRepoService.addResource(newResourceCreate);

@@ -161,7 +165,7 @@ public class ResourceRepoServiceTest extends BaseIT {
     * to verify resource update when the resource is found.
     */
    @Test
    public void testUpdateResourceWhenResourceIsFound(){
    public void test04UpdateResourceWhenResourceIsFound(){
        ResourceUpdate update = new ResourceUpdate();
        update.setName("updated_name");
        update.setCategory("updated_category");
@@ -191,12 +195,18 @@ public class ResourceRepoServiceTest extends BaseIT {
     * Test for {@link ResourceRepoService#deleteByUuid(String)} to verify successful resource deletion.
     */
    @Test
    public void testDeleteByUuidWhenResourceIsFound() {
    public void test05DeleteByUuidWhenResourceIsFound() {
        // Given - create a resource to delete
        ResourceCreate toDelete = new ResourceCreate();
        toDelete.setName("resource_to_delete");
        toDelete.setCategory("Category 3");
        toDelete.setResourceVersion("1.0");

        ResourceSpecificationRef specref = new ResourceSpecificationRef();
        specref.setId("test");
        specref.setName("A psec name");
        toDelete.setResourceSpecification(specref);
        
        Resource resourceToDelete = resourceRepoService.addResource(toDelete);

        // When
@@ -213,7 +223,7 @@ public class ResourceRepoServiceTest extends BaseIT {
     * when an existing resource is found and updated.
     */
    @Test
    public void testAddOrUpdateResourceByNameCategoryVersionWhenResourceExists() {
    public void test06AddOrUpdateResourceByNameCategoryVersionWhenResourceExists() {
        // Given - use the existing test resource
        String name = createdTestResource.getName();
        String category = createdTestResource.getCategory();
@@ -239,7 +249,7 @@ public class ResourceRepoServiceTest extends BaseIT {
     * when no existing resource is found, and a new one is created.
     */
    @Test
    public void testAddOrUpdateResourceByNameCategoryVersionWhenResourceDoesNotExist(){
    public void test07AddOrUpdateResourceByNameCategoryVersionWhenResourceDoesNotExist(){
        // Given - use name/category/version that don't exist
        String name = "non_existing_resource";
        String category = "Non-existing Category";
@@ -251,6 +261,11 @@ public class ResourceRepoServiceTest extends BaseIT {
        newResource.setResourceVersion(version);
        newResource.setDescription("Newly created resource");

        ResourceSpecificationRef specref = new ResourceSpecificationRef();
        specref.setId("test");
        specref.setName("A psec name");
        newResource.setResourceSpecification(specref);
        
        // When
        Resource result = resourceRepoService.addOrUpdateResourceByNameCategoryVersion(name, category, version, newResource);

@@ -270,7 +285,7 @@ public class ResourceRepoServiceTest extends BaseIT {
     * to verify it retrieves resources that should be terminated.
     */
    @Test
    public void testFindAllActiveResourcesToTerminate() {
    public void test08FindAllActiveResourcesToTerminate() {
        // When
        List<String> result = resourceRepoService.findAllActiveResourcesToTerminate();