Skip to content

Commit

Permalink
test: use junit assert instead of java assert statement in test
Browse files Browse the repository at this point in the history 
Signed-off-by: ZhangJian He <[email protected]>
  • Loading branch information
@hezhangjian
hezhangjian committed Apr 23, 2024
1 parent 9f202b0 commit 16f2f86
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 82 deletions.
43 changes: 0 additions & 43 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DaemonThreadFactory.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...er/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ public void testEnsembleWithThreeRegionsReplaceInternal(int minDurability, boole
try {
BookieId replacedBookie = repp.replaceBookie(6, 6, ackQuorum, null,
ensemble, bookieToReplace, excludedAddrs).getResult();
assert (replacedBookie.equals(replacedBookieExpected));
assertEquals(replacedBookieExpected, replacedBookie);
assertEquals(3, getNumRegionsInEnsemble(ensemble));
} catch (BKNotEnoughBookiesException bnebe) {
fail("Should not get not enough bookies exception even there is only one rack.");
Expand Down
76 changes: 38 additions & 38 deletions ...tributedlog/core/src/test/java/org/apache/distributedlog/TestBKDistributedLogManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ public class TestBKDistributedLogManager extends TestDistributedLogBase {
protected static int numBookies = 1;
static {
conf.setEnsembleSize(numBookies)
.setAckQuorumSize(numBookies)
.setWriteQuorumSize(numBookies);
.setAckQuorumSize(numBookies)
.setWriteQuorumSize(numBookies);
}

@Rule
Expand Down Expand Up @@ -187,7 +187,7 @@ private void testNonPartitionedWritesInternal(String name, DistributedLogConfigu
long lastTxId = -1;
while (null != record) {
DLMTestUtil.verifyLogRecord(record);
assert (lastTxId < record.getTransactionId());
assertTrue(lastTxId < record.getTransactionId());
lastTxId = record.getTransactionId();
numTrans++;
record = reader.readNext(false);
Expand Down Expand Up @@ -251,8 +251,8 @@ public void testContinuousReaders() throws Exception {
BKLogWriteHandler blplm = dlm.createWriteHandler(true);

assertNotNull(
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
Utils.ioResult(blplm.asyncClose());
}

Expand Down Expand Up @@ -304,7 +304,7 @@ public void testWriteRestartFrom1() throws Exception {
out = (BKSyncLogWriter) dlm.startLogSegmentNonPartitioned();
out.write(DLMTestUtil.getLogRecordInstance(txid));
fail("Shouldn't be able to start another journal from " + txid
+ " when one already exists");
+ " when one already exists");
} catch (Exception ioe) {
LOG.info("Caught exception as expected", ioe);
} finally {
Expand All @@ -317,7 +317,7 @@ public void testWriteRestartFrom1() throws Exception {
out = (BKSyncLogWriter) dlm.startLogSegmentNonPartitioned();
out.write(DLMTestUtil.getLogRecordInstance(txid));
fail("Shouldn't be able to start another journal from " + txid
+ " when one already exists");
+ " when one already exists");
} catch (TransactionIdOutOfOrderException rste) {
LOG.info("Caught exception as expected", rste);
} finally {
Expand Down Expand Up @@ -407,8 +407,8 @@ public void testNumberOfTransactionsWithInprogressAtEnd() throws Exception {
out.closeAndComplete();
BKLogWriteHandler blplm = ((BKDistributedLogManager) (dlm)).createWriteHandler(true);
assertNotNull(
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
Utils.ioResult(blplm.asyncClose());
}
BKSyncLogWriter out = (BKSyncLogWriter) dlm.startLogSegmentNonPartitioned();
Expand Down Expand Up @@ -465,7 +465,7 @@ public void testContinuousReaderBulk() throws Exception {
long lastTxId = -1;
while (!recordList.isEmpty()) {
for (LogRecord record : recordList) {
assert (lastTxId < record.getTransactionId());
assertTrue(lastTxId < record.getTransactionId());
lastTxId = record.getTransactionId();
DLMTestUtil.verifyLogRecord(record);
numTrans++;
Expand Down Expand Up @@ -494,14 +494,14 @@ public void testContinuousReadersWithEmptyLedgers() throws Exception {
BKLogWriteHandler blplm = ((BKDistributedLogManager) (dlm)).createWriteHandler(true);

assertNotNull(
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
writer.getLogSegmentSequenceNumber()), false));
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
writer.getLogSegmentSequenceNumber()), false));
BKLogSegmentWriter perStreamLogWriter = blplm.startLogSegment(txid - 1);
blplm.completeAndCloseLogSegment(perStreamLogWriter.getLogSegmentSequenceNumber(),
perStreamLogWriter.getLogSegmentId(), txid - 1, txid - 1, 0);
assertNotNull(
zkc.exists(blplm.completedLedgerZNode(txid - 1, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
zkc.exists(blplm.completedLedgerZNode(txid - 1, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
Utils.ioResult(blplm.asyncClose());
}

Expand Down Expand Up @@ -595,7 +595,7 @@ public void testCheckLogExists() throws Exception {
public void testMetadataAccessor() throws Exception {
String name = "distrlog-metadata-accessor";
org.apache.distributedlog.api.MetadataAccessor metadata =
DLMTestUtil.createNewMetadataAccessor(conf, name, createDLMURI("/" + name));
DLMTestUtil.createNewMetadataAccessor(conf, name, createDLMURI("/" + name));
assertEquals(name, metadata.getStreamName());
metadata.createOrUpdateMetadata(name.getBytes());
assertEquals(name, new String(metadata.getMetadata()));
Expand Down Expand Up @@ -792,7 +792,7 @@ private void markEndOfStreamOnEmptyLogSegment(int numCompletedSegments) throws E
long lastTxId = -1;
while (null != record) {
DLMTestUtil.verifyLogRecord(record);
assert (lastTxId < record.getTransactionId());
assertTrue(lastTxId < record.getTransactionId());
lastTxId = record.getTransactionId();
numTrans++;
record = reader.readNext(false);
Expand All @@ -818,7 +818,7 @@ public void testMaxLogRecSize() throws Exception {
DistributedLogManager dlm = createNewDLM(conf, "distrlog-maxlogRecSize");
AsyncLogWriter writer = Utils.ioResult(dlm.openAsyncLogWriter());
Utils.ioResult(writer.write(new LogRecord(1L, DLMTestUtil.repeatString(
DLMTestUtil.repeatString("abcdefgh", 256), 512).getBytes())));
DLMTestUtil.repeatString("abcdefgh", 256), 512).getBytes())));
dlm.close();
}

Expand Down Expand Up @@ -874,7 +874,7 @@ public void deleteDuringRead() throws Exception {

LogReader reader = dlm.getInputStream(1);
LogRecord record = reader.readNext(false);
assert (null != record);
assertNotNull(record);
DLMTestUtil.verifyLogRecord(record);
long lastTxId = record.getTransactionId();

Expand All @@ -885,7 +885,7 @@ public void deleteDuringRead() throws Exception {
record = reader.readNext(false);
while (null != record) {
DLMTestUtil.verifyLogRecord(record);
assert (lastTxId < record.getTransactionId());
assertTrue(lastTxId < record.getTransactionId());
lastTxId = record.getTransactionId();
record = reader.readNext(false);
}
Expand Down Expand Up @@ -927,14 +927,14 @@ public void testLastLogRecordWithEmptyLedgers() throws Exception {
BKLogWriteHandler blplm = ((BKDistributedLogManager) (dlm)).createWriteHandler(true);

assertNotNull(
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
zkc.exists(blplm.completedLedgerZNode(start, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
BKLogSegmentWriter writer = blplm.startLogSegment(txid - 1);
blplm.completeAndCloseLogSegment(writer.getLogSegmentSequenceNumber(),
writer.getLogSegmentId(), txid - 1, txid - 1, 0);
assertNotNull(
zkc.exists(blplm.completedLedgerZNode(txid - 1, txid - 1,
writer.getLogSegmentSequenceNumber()), false));
zkc.exists(blplm.completedLedgerZNode(txid - 1, txid - 1,
writer.getLogSegmentSequenceNumber()), false));
Utils.ioResult(blplm.asyncClose());
}

Expand Down Expand Up @@ -1128,8 +1128,8 @@ public void testTruncationValidation() throws Exception {
String name = "distrlog-truncation-validation";
URI uri = createDLMURI("/" + name);
ZooKeeperClient zookeeperClient = TestZooKeeperClientBuilder.newBuilder()
.uri(uri)
.build();
.uri(uri)
.build();
OrderedScheduler scheduler = OrderedScheduler.newSchedulerBuilder()
.name("test-truncation-validation")
.numThreads(1)
Expand Down Expand Up @@ -1247,42 +1247,42 @@ public void testTruncationValidation() throws Exception {
for (LogSegmentMetadata segment: cachedSegments) {
if (segment.getLastDLSN().compareTo(truncDLSN) < 0) {
assertTrue(segment.isTruncated());
assertTrue(!segment.isPartiallyTruncated());
assertFalse(segment.isPartiallyTruncated());
} else if (segment.getFirstDLSN().compareTo(truncDLSN) < 0) {
assertTrue(!segment.isTruncated());
assertFalse(segment.isTruncated());
assertTrue(segment.isPartiallyTruncated());
} else {
assertTrue(!segment.isTruncated());
assertTrue(!segment.isPartiallyTruncated());
assertFalse(segment.isTruncated());
assertFalse(segment.isPartiallyTruncated());
}
}

segmentList = DLMTestUtil.readLogSegments(zookeeperClient,
LogMetadata.getLogSegmentsPath(uri, name, conf.getUnpartitionedStreamName()));

assertTrue(segmentList.get(truncDLSN.getLogSegmentSequenceNo())
.getMinActiveDLSN().compareTo(truncDLSN) == 0);
assertEquals(0, segmentList.get(truncDLSN.getLogSegmentSequenceNo())
.getMinActiveDLSN().compareTo(truncDLSN));

{
LogReader reader = dlm.getInputStream(DLSN.InitialDLSN);
LogRecordWithDLSN record = reader.readNext(false);
assertTrue(record != null);
assertNotNull(record);
assertEquals(truncDLSN, record.getDlsn());
reader.close();
}

{
LogReader reader = dlm.getInputStream(1);
LogRecordWithDLSN record = reader.readNext(false);
assertTrue(record != null);
assertNotNull(record);
assertEquals(truncDLSN, record.getDlsn());
reader.close();
}

{
AsyncLogReader reader = dlm.getAsyncLogReader(DLSN.InitialDLSN);
LogRecordWithDLSN record = Utils.ioResult(reader.readNext());
assertTrue(record != null);
assertNotNull(record);
assertEquals(truncDLSN, record.getDlsn());
Utils.close(reader);
}
Expand All @@ -1291,7 +1291,7 @@ public void testTruncationValidation() throws Exception {
{
LogReader reader = dlm.getInputStream(beyondTruncDLSN);
LogRecordWithDLSN record = reader.readNext(false);
assertTrue(record != null);
assertNotNull(record);
assertEquals(beyondTruncDLSN, record.getDlsn());
reader.close();
}
Expand Down Expand Up @@ -1331,19 +1331,19 @@ public void testDeleteLog() throws Exception {
writer.closeAndComplete();
BKLogWriteHandler blplm = ((BKDistributedLogManager) (dlm)).createWriteHandler(true);
assertNotNull(zkc.exists(blplm.completedLedgerZNode(txid, txid - 1,
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
perStreamLogWriter.getLogSegmentSequenceNumber()), false));
Utils.ioResult(blplm.asyncClose());

// Should be able to open the underline ledger using BK client
long ledgerId = perStreamLogWriter.getLogSegmentId();
BKNamespaceDriver driver = (BKNamespaceDriver) dlm.getNamespaceDriver();
driver.getReaderBKC().get().openLedgerNoRecovery(ledgerId,
BookKeeper.DigestType.CRC32, conf.getBKDigestPW().getBytes(UTF_8));
BookKeeper.DigestType.CRC32, conf.getBKDigestPW().getBytes(UTF_8));
// Delete the log and we shouldn't be able the open the ledger
dlm.delete();
try {
driver.getReaderBKC().get().openLedgerNoRecovery(ledgerId,
BookKeeper.DigestType.CRC32, conf.getBKDigestPW().getBytes(UTF_8));
BookKeeper.DigestType.CRC32, conf.getBKDigestPW().getBytes(UTF_8));
fail("Should fail to open ledger after we delete the log");
} catch (BKException.BKNoSuchLedgerExistsOnMetadataServerException e) {
// ignore
Expand Down

0 comments on commit 16f2f86

Please sign in to comment.