@@ -548,6 +548,37 @@ public void getStoragePoolNonDestroyedVolumesLogTestNonDestroyedVolumesReturnLog
548548 Assert .assertEquals (expected , log );
549549 }
550550
551+ @ Test
552+ public void getStoragePoolNonDestroyedVolumesLogTestNonDestroyedVolumesSkipLogForOneVolume () {
553+ Mockito .doReturn (1L ).when (storagePoolVOMock ).getId ();
554+ Mockito .doReturn (null ).when (volume1VOMock ).getInstanceId ();
555+ Mockito .doReturn (1L ).when (volume2VOMock ).getInstanceId ();
556+ Mockito .doReturn ("ffb46333-e983-4c21-b5f0-51c5877a3805" ).when (volume2VOMock ).getUuid ();
557+ Mockito .doReturn ("58760044-928f-4c4e-9fef-d0e48423595e" ).when (vmInstanceVOMock ).getUuid ();
558+
559+ Mockito .when (_volumeDao .findByPoolId (storagePoolVOMock .getId (), null )).thenReturn (List .of (volume1VOMock , volume2VOMock ));
560+ Mockito .doReturn (vmInstanceVOMock ).when (vmInstanceDao ).findById (Mockito .anyLong ());
561+
562+ String log = storageManagerImpl .getStoragePoolNonDestroyedVolumesLog (storagePoolVOMock .getId ());
563+ String expected = String .format ("[Volume [%s] (attached to VM [%s])]" , volume2VOMock .getUuid (), vmInstanceVOMock .getUuid ());
564+
565+ Assert .assertEquals (expected , log );
566+ }
567+
568+ @ Test
569+ public void getStoragePoolNonDestroyedVolumesLogTestNonDestroyedVolumesNoLog () {
570+ Mockito .doReturn (1L ).when (storagePoolVOMock ).getId ();
571+ Mockito .doReturn (1L ).when (volume1VOMock ).getInstanceId ();
572+ Mockito .doReturn (1L ).when (volume2VOMock ).getInstanceId ();
573+
574+ Mockito .when (_volumeDao .findByPoolId (storagePoolVOMock .getId (), null )).thenReturn (List .of (volume1VOMock , volume2VOMock ));
575+ Mockito .doReturn (null ).when (vmInstanceDao ).findById (Mockito .anyLong ());
576+
577+ String log = storageManagerImpl .getStoragePoolNonDestroyedVolumesLog (storagePoolVOMock .getId ());
578+
579+ Assert .assertEquals ("[]" , log );
580+ }
581+
551582 private ChangeStoragePoolScopeCmd mockChangeStoragePooolScopeCmd (String newScope ) {
552583 ChangeStoragePoolScopeCmd cmd = new ChangeStoragePoolScopeCmd ();
553584 ReflectionTestUtils .setField (cmd , "id" , 1L );
0 commit comments