LMS-2077 tests written

SVN: 20172

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommand.java

@@ -29,6 +29,7 @@ import ch.systemsx.cisd.common.logging.ISimpleLogger;
 import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.logging.LogLevel;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetDirectoryProvider;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IShareIdManager;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.SegmentedStoreUtils;
@@ -55,7 +56,7 @@ class DeletionCommand extends AbstractDataSetDescriptionBasedCommand
     {
         final IShareIdManager shareIdManager = dataSetDirectoryProvider.getShareIdManager();
         final ISimpleLogger logger = createLogger();
-        ThreadPoolExecutor executor =
+        final ThreadPoolExecutor executor =
                 new ThreadPoolExecutor(1, 10, 360, TimeUnit.SECONDS,
                         new LinkedBlockingQueue<Runnable>());
         for (final DatasetDescription dataSet : dataSets)
@@ -64,10 +65,17 @@ class DeletionCommand extends AbstractDataSetDescriptionBasedCommand
                 {
                     public void run()
                     {
-                        File dataSetDirectory =
-                                dataSetDirectoryProvider.getDataSetDirectory(dataSet);
-                        SegmentedStoreUtils.deleteDataSet(dataSet.getDatasetCode(),
-                                dataSetDirectory, shareIdManager, logger);
+                        try
+                        {
+                            File dataSetDirectory =
+                                    dataSetDirectoryProvider.getDataSetDirectory(dataSet);
+                            SegmentedStoreUtils.deleteDataSet(dataSet.getDatasetCode(),
+                                    dataSetDirectory, shareIdManager, logger);
+                        } catch (Throwable ex)
+                        {
+                            logger.log(LogLevel.ERROR, "Couldn't delete " + dataSet + ", reason: "
+                                    + ex);
+                        }
                     }
                 });
         }

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommandTest.java

+/*
+ * Copyright 2011 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.dss.generic.server;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import ch.rinn.restrictions.Friend;
+import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
+import ch.systemsx.cisd.common.filesystem.FileUtilities;
+import ch.systemsx.cisd.common.logging.ISimpleLogger;
+import ch.systemsx.cisd.common.logging.MockLogger;
+import ch.systemsx.cisd.openbis.dss.generic.shared.IShareIdManager;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
+import ch.systemsx.cisd.openbis.generic.shared.dto.builders.DatasetDescriptionBuilder;
+
+/**
+ * 
+ *
+ * @author Franz-Josef Elmer
+ */
+@Friend(toClasses=DeletionCommand.class)
+public class DeletionCommandTest extends AbstractFileSystemTestCase
+{
+    private static final String SHARE_ID = "1";
+
+    private static final class DeletionCommandWithMockLogger extends DeletionCommand
+    {
+        private static final long serialVersionUID = 1L;
+        
+        private final ISimpleLogger logger;
+
+        DeletionCommandWithMockLogger(ISimpleLogger logger, List<DatasetDescription> dataSets)
+        {
+            super(dataSets);
+            this.logger = logger;
+        }
+
+        @Override
+        ISimpleLogger createLogger()
+        {
+            return logger;
+        }
+    }
+    
+    private Mockery context;
+    private IShareIdManager shareIdManager;
+    private MockLogger log;
+    private DataSetDirectoryProvider dataSetDirectoryProvider;
+    private File store;
+    private File share1;
+    
+    @BeforeMethod
+    public void beforeMethod()
+    {
+        context = new Mockery();
+        shareIdManager = context.mock(IShareIdManager.class);
+        store = new File(workingDirectory, "store");
+        store.mkdirs();
+        share1 = new File(store, SHARE_ID);
+        share1.mkdir();
+        dataSetDirectoryProvider = new DataSetDirectoryProvider(store, shareIdManager);
+        log = new MockLogger();
+    }
+    
+    @AfterMethod
+    public void tearDown()
+    {
+        context.assertIsSatisfied();
+    }
+    
+    @Test
+    public void testDeletionError() throws Exception
+    {
+        DatasetDescription ds1 =
+                new DatasetDescriptionBuilder("ds-1").location("a").getDatasetDescription();
+        DeletionCommand deletionCommand =
+                new DeletionCommandWithMockLogger(log, Arrays.asList(ds1));
+
+        deletionCommand.execute(dataSetDirectoryProvider);
+
+        log.assertNextLogMessage("Couldn't delete Dataset 'ds-1', reason: unexpected invocation: "
+                + "iShareIdManager.getShareId(\"ds-1\")\n"
+                + "no expectations specified: did you...\n"
+                + " - forget to start an expectation with a cardinality clause?\n"
+                + " - call a mocked method to specify the parameter of an expectation?\n"
+                + "what happened before this: nothing!");
+        context.assertIsSatisfied();
+    }
+    
+    @Test
+    public void testDeletion() throws Exception
+    {
+        DatasetDescription ds1 = new DatasetDescriptionBuilder("ds-1").location("a").getDatasetDescription();
+        File f1 = new File(share1, "a");
+        FileUtilities.writeToFile(f1, "hello ds-1");
+        assertEquals(true, f1.exists());
+        DatasetDescription ds2 = new DatasetDescriptionBuilder("ds-2").location("b").getDatasetDescription();
+        File f2 = new File(share1, "b");
+        context.checking(new Expectations()
+            {
+                {
+                    one(shareIdManager).getShareId("ds-1");
+                    will(returnValue(SHARE_ID));
+                    one(shareIdManager).await("ds-1");
+                    
+                    one(shareIdManager).getShareId("ds-2");
+                    will(returnValue(SHARE_ID));
+                    one(shareIdManager).await("ds-2");
+                }
+            });
+        IDataSetCommand command = new DeletionCommandWithMockLogger(log, Arrays.asList(ds1, ds2));
+        
+        command.execute(dataSetDirectoryProvider);
+        
+        log.assertNextLogMessage("Await for data set ds-1 to be unlocked.");
+        log.assertNextLogMessage("Start deleting data set ds-1 at " + f1);
+        log.assertNextLogMessage("Data set ds-1 at " + f1 + " has been successfully deleted.");
+        log.assertNextLogMessage("Await for data set ds-2 to be unlocked.");
+        log.assertNextLogMessage("Start deleting data set ds-2 at " + f2);
+        log.assertNextLogMessage("Deletion of data set ds-2 at " + f2 + " failed.");
+        log.assertNoMoreLogMessages();
+        assertEquals(false, f1.exists());
+        
+        context.assertIsSatisfied();
+    }
+}