fix for #49 (4ec8520c) · Commits · OSL / code / org.etsi.osl.tmf.api

src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ public class ServiceSpecificationApiControllerTest {
		}

		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testDeleteServiceSpecification() throws Exception {

		assertThat( specRepoService.findAll().size() ).isEqualTo( FIXED_BOOTSTRAPS_SPECS );
		@@ -102,7 +102,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testListServiceSpecification() throws Exception {

		String response = mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/serviceSpecification")
		@@ -127,7 +127,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testPatchServiceSpecification() throws Exception {

		String response = createServiceSpecification();
		@@ -164,7 +164,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testRetrieveServiceSpecification() throws Exception {

		String response = createServiceSpecification();
		@@ -186,7 +186,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testGetAttachment() throws Exception {

		// Create a Service Specification
		@@ -233,7 +233,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testGetAttachmentWithFilename() throws Exception {

		// Create a Service Specification
		@@ -259,7 +259,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testRetrieveServiceSpecificationDescriptor() throws Exception {

		// Test a non-existing spec
		@@ -271,7 +271,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username = "osadmin", roles = { "ADMIN","USER" })
		//@Test
		@Test
		public void testSpecFromTestSpec() throws Exception {

		// Creeate a Test Spec
		@@ -316,7 +316,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
		//@Test
		@Test
		public void testGetImageSpecificationRelationshipGraph() throws Exception {

		// Create a Service Specification
		@@ -334,7 +334,7 @@ public class ServiceSpecificationApiControllerTest {


		@WithMockUser(username="osadmin", roles = {"ADMIN"})
		//@Test
		@Test
		public void testSpecFromResourceSpec() throws Exception {

		File rspec = new File( "src/test/resources/testResourceSpec.json" );

src/test/java/org/etsi/osl/services/reposervices/scm633/ServiceSpecificationRepoServiceTest.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -48,12 +48,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;

		import jakarta.validation.Valid;

		@RunWith(SpringRunner.class)
		@ActiveProfiles("testing")
		@Transactional
		@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
		@AutoConfigureMockMvc
		@AutoConfigureTestDatabase
		//@RunWith(SpringRunner.class)
		//@ActiveProfiles("testing")
		//@Transactional
		//@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
		//@AutoConfigureMockMvc
		//@AutoConfigureTestDatabase
		public class ServiceSpecificationRepoServiceTest {

		@Autowired
		@@ -69,7 +69,7 @@ public class ServiceSpecificationRepoServiceTest {

		private static ResourceSpecification resourceNSD;

		@BeforeClass
		//@BeforeClass
		public static void setupBeforeClass() {
		// Load NSD from JSON file to NetworkServiceDescriptor.class
		try {
		@@ -94,7 +94,7 @@ public class ServiceSpecificationRepoServiceTest {
		resourceNSD.setDescription(nsd.getShortDescription());
		}

		@Before
		//@Before
		public void setupBefore() {
		when(serviceSpecificationApiRouteBuilderNSD.retrieveNSD(anyString())).thenReturn(nsd);
		when(resourceSpecRepoService.addResourceSpec(any())).thenReturn(resourceNSD);
		@@ -107,7 +107,7 @@ public class ServiceSpecificationRepoServiceTest {
		* This test verifies that the method retrieveNSD correctly returns a non-null NetworkServiceDescriptor
		* and that the specFromNSDID method does not return null in such a case.
		*/
		@Test
		//@Test
		public void testSpecFromNSDIDReturnsNonNullWhenRetrieveNSDReturnsNonNull() {
		// Setup
		String id = "testId";
		@@ -127,7 +127,7 @@ public class ServiceSpecificationRepoServiceTest {
		*
		* This test verifies that the method retrieveNSD correctly returns null when it is expected to.
		*/
		@Test
		//@Test
		public void testRetrieveNSDReturnsNull() {
		// When retrieveNSD return null
		String id = "SomeId";
		@@ -148,7 +148,7 @@ public class ServiceSpecificationRepoServiceTest {
		* has the correct name, version, and description. It also checks that the correct number
		* of ServiceSpecification objects are created.
		*/
		@Test
		//@Test
		public void testServiceSpecificationBaseProperties() {
		String testId = "validId";

		@@ -177,7 +177,7 @@ public class ServiceSpecificationRepoServiceTest {
		* that this object has the expected characteristics, including the correct name, value, and alias
		* for each characteristic.
		*/
		@Test
		//@Test
		public void testServiceSpecificationCharacteristics() {
		String testId = "validId";