From b01977939a5126af88a4e43043b40171c0111d28 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 28 Jan 2015 11:02:07 +0000
Subject: [PATCH] SSDM-1191: remove runAlways=true in @AfterMethod annotation
SVN: 33344
---
.../plugins/standard/archiver/MultiDataSetArchiverTest.java | 2 +-
.../archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
index 81ecb6b20cc..09d71180c60 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
@@ -547,7 +547,7 @@ public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase
});
}
- @AfterMethod(alwaysRun = true)
+ @AfterMethod
public void checkMockExpectations(ITestResult result)
{
ServiceProviderTestWrapper.restoreApplicationContext();
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
index 8bb793bb908..940a48669ac 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
@@ -176,7 +176,7 @@ public class MultiDataSetUnarchivingMaintenanceTaskTest extends AssertJUnit
});
}
- @AfterMethod(alwaysRun = true)
+ @AfterMethod
public void checkMockExpectations(ITestResult result)
{
ServiceProviderTestWrapper.restoreApplicationContext();
--
GitLab