From 774cf35e9ca1899141237e69805f02d8704f8b05 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 13 Feb 2012 09:15:23 +0000
Subject: [PATCH] LMS-2767 fix test
SVN: 24423
---
.../etlserver/DataSetRegistrationAlgorithmTest.java | 3 ++-
.../JythonTopLevelDataSetRegistratorTest.java | 13 ++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
index db6d8701f43..3e17214f18a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
@@ -294,7 +294,8 @@ public class DataSetRegistrationAlgorithmTest extends AbstractFileSystemTestCase
context.checking(new Expectations()
{
{
- allowing(openBisService).setStorageConfirmed(DATA_SET_CODE);
+ one(openBisService).setStorageConfirmed(DATA_SET_CODE);
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
}
});
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index 7b60b3d380c..c9e27ad1824 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -132,7 +132,9 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
will(doAll(returnValue(new AtomicEntityOperationResult()), checkPrecommitDirIsNotEmpty()));
one(openBisService).setStorageConfirmed(DATA_SET_CODE);
-
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
+
+
will(checkPrecommitDirIsEmpty());
}
});
@@ -387,8 +389,10 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
will(returnValue(new AtomicEntityOperationResult()));
one(openBisService).setStorageConfirmed(DATA_SET_CODE + 1);
-
one(openBisService).setStorageConfirmed(DATA_SET_CODE + 2);
+
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE + 1);
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE + 2);
}
});
@@ -466,7 +470,8 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
will(returnValue(new AtomicEntityOperationResult()));
one(openBisService).setStorageConfirmed(DATA_SET_CODE);
- }
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
+ }
});
handler.handle(markerFile);
@@ -526,6 +531,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
will(returnValue(new AtomicEntityOperationResult()));
one(openBisService).setStorageConfirmed(DATA_SET_CODE);
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
}
});
@@ -666,6 +672,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
will(returnValue(new AtomicEntityOperationResult()));
one(openBisService).setStorageConfirmed(DATA_SET_CODE);
+ one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
}
});
--
GitLab