From f05469c94090ece0e70d531405494e7449bbf375 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 1 Feb 2016 07:45:39 +0000
Subject: [PATCH] SSDM-3074: Fixing MultiThread*OptimisticLockingTest
SVN: 35597
---
.../MultiThreadExperimentOptimisticLockingTest.java | 2 +-
.../MultiThreadOptimisticLockingTestCase.java | 1 +
.../MultiThreadProjectOptimisticLockingTest.java | 2 +-
.../MultiThreadSampleOptimisticLockingTest.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
index fe8be50904a..da881be2e19 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
@@ -132,7 +132,7 @@ public class MultiThreadExperimentOptimisticLockingTest extends
public void handleProgress(String phaseName, int totalItemsToProcess,
int numItemsProcessed)
{
- if (phaseName.equals("createDataSets") && numItemsProcessed == 1
+ if (phaseName.equals(CREATING_ENTITIES) && numItemsProcessed == 2
&& totalItemsToProcess == 2)
{
messageChannelMain.send(ToolBox.FIRST_REGISTERED);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
index df23319bc2a..be70605def9 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
@@ -32,6 +32,7 @@ import ch.systemsx.cisd.openbis.systemtest.PersistentSystemTestCase;
@Transactional
public class MultiThreadOptimisticLockingTestCase extends PersistentSystemTestCase
{
+ static final String CREATING_ENTITIES = "creating entities";
protected ToolBox toolBox;
@BeforeMethod
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
index 3c6299adae4..b4539cd66b8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
@@ -115,6 +115,6 @@ public class MultiThreadProjectOptimisticLockingTest extends MultiThreadOptimist
assertEquals("[OLT-E1, OLT-E2, OLT-E3]", toolBox.extractCodes(experiments).toString());
toolBox.checkModifierAndModificationDateOfProject1(timeIntervalChecker);
assertEquals("authorize 1/2\n" + "authorize 2/2\n" + "createExperiments 1/2\n"
- + "createExperiments 2/2\n", stringBuilder.toString());
+ + "createExperiments 2/2\n" + "load related entities 0/0\n", stringBuilder.toString());
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
index 84a4280dda2..5ced99d16d1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
@@ -181,7 +181,7 @@ public class MultiThreadSampleOptimisticLockingTest extends MultiThreadOptimisti
public void handleProgress(String phaseName, int totalItemsToProcess,
int numItemsProcessed)
{
- if (phaseName.equals("createDataSets") && numItemsProcessed == 1
+ if (phaseName.equals(CREATING_ENTITIES) && numItemsProcessed == 2
&& totalItemsToProcess == 2)
{
messageChannelMain.send(ToolBox.FIRST_REGISTERED);
--
GitLab