From b6bc4ad60ba2d07c1dfdd2141b1425a884edb060 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Fri, 16 Mar 2012 14:21:56 +0000
Subject: [PATCH] Fix the test broken by adding stacktrace to the log
SVN: 24740
---
.../generic/server/ShareIdManagerTest.java | 45 ++++++++++++-------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java
index 174ee2c0f9b..f43c52126d8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java
@@ -161,13 +161,19 @@ public class ShareIdManagerTest extends AssertJUnit
}, "T1").start();
ch.assertNextMessage("Lock for data set ds1 hasn't been released after "
+ "time out of 1 seconds.");
- assertEquals("INFO OPERATION.ShareIdManager - "
- + "Share id manager initialized with 2 data sets.\n"
- + "DEBUG OPERATION.ShareIdManager - Data set ds1 has been locked.\n"
- + "DEBUG OPERATION.ShareIdManager - "
- + "Data set ds1 is locked by the following threads: T1\n"
+
+
+ String logContent = logRecorder.getLogContent();
+
+ assertTrue(logContent.contains("INFO OPERATION.ShareIdManager"
+ + " - Share id manager initialized with 2 data sets.\n"
+ + "DEBUG OPERATION.ShareIdManager - Data set ds1 has been locked.\n"));
+
+ assertTrue(logContent.contains("DEBUG OPERATION.ShareIdManager"
+ + " - Data set ds1 is locked by the following threads: T1\n"
+ "ERROR OPERATION.ShareIdManager - Timeout: Lock for data set ds1 is held "
- + "by threads 'T1' for 1 seconds.", logRecorder.getLogContent());
+ + "by threads 'T1' for 1 seconds."));
+
ch.assertEmpty();
}
@@ -197,13 +203,16 @@ public class ShareIdManagerTest extends AssertJUnit
manager.await(DS1);
ch1.assertNextMessage("unlocked"); // wait until thread is finished
- assertEquals("INFO OPERATION.ShareIdManager"
+
+ String logContent = logRecorder.getLogContent();
+
+ assertTrue(logContent.contains("INFO OPERATION.ShareIdManager"
+ " - Share id manager initialized with 2 data sets.\n"
- + "DEBUG OPERATION.ShareIdManager - Data set ds1 has been locked.\n"
- + "DEBUG OPERATION.ShareIdManager"
+ + "DEBUG OPERATION.ShareIdManager - Data set ds1 has been locked.\n"));
+
+ assertTrue(logContent.contains("DEBUG OPERATION.ShareIdManager"
+ " - Data set ds1 is locked by the following threads: T1\n"
- + "DEBUG OPERATION.ShareIdManager - Unlock data set ds1",
- logRecorder.getLogContent());
+ + "DEBUG OPERATION.ShareIdManager - Unlock data set ds1"));
}
@Test(groups = "slow")
@@ -246,16 +255,22 @@ public class ShareIdManagerTest extends AssertJUnit
assertEquals("Lock for data set ds1 hasn't been released after time out of 1 seconds.",
ex.getMessage());
}
- assertEquals("INFO OPERATION.ShareIdManager"
+
+
+ String logContent = logRecorder.getLogContent();
+
+ assertTrue(logContent.contains("INFO OPERATION.ShareIdManager"
+ " - Share id manager initialized with 2 data sets.\n"
- + "DEBUG OPERATION.ShareIdManager - Data set ds1 has been locked.\n"
- + "DEBUG OPERATION.ShareIdManager"
+ + "DEBUG OPERATION.ShareIdManager - Data set ds1 has been locked.\n"));
+
+ assertTrue(logContent.contains("DEBUG OPERATION.ShareIdManager"
+ " - Data set ds1 is locked by the following threads: T1\n"
+ "DEBUG OPERATION.ShareIdManager"
+ " - Data set ds1 is locked by the following threads: T1, T2\n"
+ "DEBUG OPERATION.ShareIdManager"
+ " - Data set ds1 is locked by the following threads: T2\n"
+ "ERROR OPERATION.ShareIdManager - Timeout: Lock for data set ds1 is held by "
- + "threads 'T2' for 1 seconds.", logRecorder.getLogContent());
+ + "threads 'T2' for 1 seconds."));
+
}
}
--
GitLab