modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java | 11
++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 3d0d0443d63042755967b493da3f3330f58aaea7
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Sun Feb 26 21:00:56 2012 -0500
fix bad failure message; add an additonal failure check
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java
index d7dde7b..50a061b 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java
@@ -122,10 +122,9 @@ public class DriftFileTest extends DriftDataAccessTest {
int numDriftFiles = 2;
final List<String> driftFileHashIds = new ArrayList<String>();
- for (int i = 0; i < numDriftFiles; ++i) {
+ for (int driftFileNum = 0; driftFileNum < numDriftFiles; ++driftFileNum) {
File dataFile = createDataFile("test_data.txt", 10, 'X');
final JPADriftFileBits driftFile = new JPADriftFileBits();
- final int driftFileNum = i;
driftFile.setDataSize(dataFile.length());
driftFile.setHashId(digestGen.calcDigestString(dataFile));
driftFile.setData(Hibernate.createBlob(new BufferedInputStream(new
FileInputStream(dataFile))));
@@ -139,10 +138,14 @@ public class DriftFileTest extends DriftDataAccessTest {
driftFileHashIds.add(driftFile.getHashId());
}
});
+ if (driftFileNum >= 1) {
+ fail("Should not be able to store JPADriftFile with same hashId
more than once.");
+ }
+
} catch (Exception e) {
- // expected for file 2 or higher
+ // expected for second file
if (driftFileNum == 0) {
- fail("Should not be able to store JPADriftFile with same hashId
more than once.");
+ fail("Should be able to store JPADriftFile with unique hashId -
cause: " + e);
}
}
}
Show replies by date