Skip to content
Snippets Groups Projects
Commit c45c19d8 authored by tranoris's avatar tranoris
Browse files

fix for tests

parent 440f11a2
No related branches found
No related tags found
2 merge requests!59MR for Release 2024Q4,!48Generic controller enhancement
Pipeline #10440 failed
...@@ -275,7 +275,7 @@ public class ServiceInventoryIntegrationTest { ...@@ -275,7 +275,7 @@ public class ServiceInventoryIntegrationTest {
assertThat( serviceRepoService.findAll().size() ).isEqualTo( 1 ); assertThat( serviceRepoService.findAll().size() ).isEqualTo( 1 );
assertThat( responseSOUpd.getEndDate() ).isNotNull(); assertThat( responseSOUpd.getEndDate() ).isNotNull();
assertThat( responseSOUpd.getNote().size() ).isEqualTo( 5 ); assertThat( responseSOUpd.getNote().size() ).isEqualTo( 4 );
assertThat( responseSOUpd.getServiceCharacteristic().size() ).isEqualTo( 4 ); assertThat( responseSOUpd.getServiceCharacteristic().size() ).isEqualTo( 4 );
assertThat( responseSOUpd.getServiceCharacteristicByName( "ConfigStatus" ).getValue().getValue() ).isEqualTo( "RUNNING" ) ; assertThat( responseSOUpd.getServiceCharacteristicByName( "ConfigStatus" ).getValue().getValue() ).isEqualTo( "RUNNING" ) ;
assertThat( responseSOUpd.getServiceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue() ).isEqualTo( "1007" ) ; assertThat( responseSOUpd.getServiceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue() ).isEqualTo( "1007" ) ;
...@@ -321,7 +321,7 @@ public class ServiceInventoryIntegrationTest { ...@@ -321,7 +321,7 @@ public class ServiceInventoryIntegrationTest {
assertThat( serviceRepoService.findAll().size() ).isEqualTo( 1 ); assertThat( serviceRepoService.findAll().size() ).isEqualTo( 1 );
assertThat( responseSOUpd.getEndDate() ).isNotNull(); assertThat( responseSOUpd.getEndDate() ).isNotNull();
assertThat( responseSOUpd.getNote().size() ).isEqualTo( 7 ); assertThat( responseSOUpd.getNote().size() ).isEqualTo( 6 );
assertThat( responseSOUpd.getServiceCharacteristic().size() ).isEqualTo( 4 ); assertThat( responseSOUpd.getServiceCharacteristic().size() ).isEqualTo( 4 );
assertThat( responseSOUpd.getServiceCharacteristicByName( "ConfigStatus" ).getValue().getValue() ).isEqualTo( "RUNNING" ) ; assertThat( responseSOUpd.getServiceCharacteristicByName( "ConfigStatus" ).getValue().getValue() ).isEqualTo( "RUNNING" ) ;
assertThat( responseSOUpd.getServiceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue() ).isEqualTo( "1007" ) ; assertThat( responseSOUpd.getServiceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue() ).isEqualTo( "1007" ) ;
......
...@@ -258,7 +258,7 @@ public class ServiceRepoServiceTest { ...@@ -258,7 +258,7 @@ public class ServiceRepoServiceTest {
boolean expectedNoteExists = false; boolean expectedNoteExists = false;
for (Note n : noteList) { for (Note n : noteList) {
if ( n.getText().contains("State Changed with status:") && n.getAuthor().equals("SIM638-API")) { if ( n.getText().contains("Supporting Resource changed with") && n.getAuthor().equals("SIM638-API")) {
expectedNoteExists= true; expectedNoteExists= true;
break; break;
} }
...@@ -291,7 +291,7 @@ public class ServiceRepoServiceTest { ...@@ -291,7 +291,7 @@ public class ServiceRepoServiceTest {
Service updatedService = serviceRepoService.findByUuid(id); Service updatedService = serviceRepoService.findByUuid(id);
assertThat( updatedService.getServiceCharacteristic().size() ).isEqualTo( 6 ); assertThat( updatedService.getServiceCharacteristic().size() ).isEqualTo( 7 );
assertThat( updatedService.getSupportingResource().size() ).isEqualTo( 1); assertThat( updatedService.getSupportingResource().size() ).isEqualTo( 1);
ResourceUpdate resourceUpdate = new ResourceUpdate(); ResourceUpdate resourceUpdate = new ResourceUpdate();
...@@ -313,14 +313,14 @@ public class ServiceRepoServiceTest { ...@@ -313,14 +313,14 @@ public class ServiceRepoServiceTest {
System.out.println("STEP 3 - =========================================== " ); System.out.println("STEP 3 - =========================================== " );
updatedService = serviceRepoService.findByUuid(id); updatedService = serviceRepoService.findByUuid(id);
assertThat( updatedService.getSupportingResource().size() ).isEqualTo( 1); assertThat( updatedService.getSupportingResource().size() ).isEqualTo( 1);
assertThat( updatedService.getServiceCharacteristic().size() ).isEqualTo( 7 ); assertThat( updatedService.getServiceCharacteristic().size() ).isEqualTo( 8 );
Set<Note> noteSet = updatedService.getNote(); Set<Note> noteSet = updatedService.getNote();
List<Note> noteList = new ArrayList<>(noteSet); List<Note> noteList = new ArrayList<>(noteSet);
boolean expectedNoteExists = false; boolean expectedNoteExists = false;
for (Note n : noteList) { for (Note n : noteList) {
if ( n.getText().contains("Service Characteristic changed") && n.getAuthor().equals("API")) { if ( n.getText().contains("Supporting Resource changed with") && n.getAuthor().equals("API")) {
expectedNoteExists= true; expectedNoteExists= true;
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment