SSDM-50 detect access to data set file - test

SVN: 31250

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

@@ -324,12 +324,12 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
     protected final void ensureDatasetAccessible(String dataSetCode, HttpSession session,
             String sessionIdOrNull)
     {
-        applicationContext.getDataSetService().notifyDatasetAccess(dataSetCode);
-
         if (isDatasetAccessible(dataSetCode, sessionIdOrNull, session) == false)
         {
             throw new UserFailureException("Data set '" + dataSetCode + "' is not accessible.");
         }
+
+        applicationContext.getDataSetService().notifyDatasetAccess(dataSetCode);
     }
 
     private boolean isDatasetAccessible(String dataSetCode, String sessionIdOrNull,

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

@@ -225,6 +225,7 @@ public class DatasetDownloadServletTest
         prepareCheckSession();
         prepareForObtainingDataSetFromServer(externalData);
         prepareForGettingDataSetFromSession(externalData, "");
+        prepareDatasetAccessed();
         prepareLocking();
         prepareForCreatingHTML(writer);
 
@@ -387,6 +388,7 @@ public class DatasetDownloadServletTest
         prepareCheckSession();
         prepareForObtainingDataSetFromServer(externalData);
         prepareForGettingDataSetFromSession(externalData, ESCAPED_EXAMPLE_DATA_SET_SUB_FOLDER_NAME);
+        prepareDatasetAccessed();
         prepareLocking();
         context.checking(new Expectations()
             {
@@ -423,6 +425,7 @@ public class DatasetDownloadServletTest
         prepareParseRequestURL();
         prepareCheckSession();
         prepareCheckDatasetAccess();
+        prepareDatasetAccessed();
         prepareForObtainingDataSetFromServer(externalData);
         prepareLocking();
 
@@ -469,6 +472,7 @@ public class DatasetDownloadServletTest
         prepareCheckSession();
         final AbstractExternalData externalData = createDataSet();
         prepareCheckDatasetAccess();
+        prepareDatasetAccessed();
         prepareForObtainingDataSetFromServer(externalData);
         prepareLocking();
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -767,6 +771,16 @@ public class DatasetDownloadServletTest
             });
     }
 
+    private void prepareDatasetAccessed()
+    {
+        context.checking(new Expectations()
+            {
+                {
+                    one(openbisService).notifyDatasetAccess(EXAMPLE_DATA_SET_CODE);
+                }
+            });
+    }
+
     private void prepareCheckDatasetAccess()
     {
         context.checking(new Expectations()