fix tests

Author: GaOrtiga

engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java

@@ -127,55 +127,48 @@ public void setUp() {
         Mockito.doReturn(templateInfoMock).when(templateDataFactoryMock).getTemplate(2L, sourceStoreMock);
         Mockito.doReturn(3L).when(dataStoreMock).getId();
         Mockito.doReturn(zoneScopeMock).when(dataStoreMock).getScope();
-        Mockito.when(imageStoreDao.findById(3L)).thenReturn(imageStoreMock);
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestSkipsTemplateDirectedToAnotherStorage() {
         DataStore destinedStore = Mockito.mock(DataStore.class);
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(false);
         Mockito.doReturn(dataStoreMock.getId() + 1L).when(destinedStore).getId();
         Mockito.when(templateManagerMock.verifyHeuristicRulesForZone(tmpltMock, zoneScopeMock.getScopeId())).thenReturn(destinedStore);
         Assert.assertFalse(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestDownloadsPublicTemplate() {
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(false);
         Mockito.when(tmpltMock.isPublicTemplate()).thenReturn(true);
         Assert.assertTrue(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestDownloadsFeaturedTemplate() {
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(false);
         Mockito.when(tmpltMock.isFeatured()).thenReturn(true);
         Assert.assertTrue(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestDownloadsSystemTemplate() {
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(false);
         Mockito.when(tmpltMock.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM);
         Assert.assertTrue(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestDownloadsPrivateNoRefTemplate() {
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(false);
         Assert.assertTrue(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestSkipsPrivateExistingTemplate() {
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(false);
         Mockito.when(templateDataStoreDao.findByTemplateZone(tmpltMock.getId(), zoneScopeMock.getScopeId(), DataStoreRole.Image)).thenReturn(Mockito.mock(TemplateDataStoreVO.class));
         Assert.assertFalse(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
     }
 
     @Test
     public void shouldDownloadTemplateToStoreTestSkipsWhenStorageIsReadOnly() {
-        Mockito.when(imageStoreMock.isReadonly()).thenReturn(true);
+        Mockito.when(dataStoreManagerMock.isRemovedOrReadonly(Mockito.any())).thenReturn(true);
         Assert.assertFalse(templateService.shouldDownloadTemplateToStore(tmpltMock, dataStoreMock));
 
     }