Repository: incubator-ratis Updated Branches: refs/heads/master 9bd8cbd6b -> 43bc6ebf4
http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/43bc6ebf/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java index 68ab8c3..f5e2378 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java @@ -36,7 +36,7 @@ import org.apache.ratis.server.storage.RaftStorageDirectory; import org.apache.ratis.server.storage.RaftStorageDirectory.LogPathAndIndex; import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.FileUtils; -import org.apache.ratis.util.RaftUtils; +import org.apache.ratis.util.LogUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -51,10 +51,10 @@ import static org.apache.ratis.server.impl.RaftServerConstants.DEFAULT_CALLID; public abstract class RaftSnapshotBaseTest { static { - RaftUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG); - RaftUtils.setLogLevel(RaftLog.LOG, Level.DEBUG); - RaftUtils.setLogLevel(RequestHandler.LOG, Level.DEBUG); - RaftUtils.setLogLevel(RaftClient.LOG, Level.DEBUG); + LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG); + LogUtils.setLogLevel(RaftLog.LOG, Level.DEBUG); + LogUtils.setLogLevel(RequestHandler.LOG, Level.DEBUG); + LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG); } static final Logger LOG = LoggerFactory.getLogger(RaftSnapshotBaseTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/43bc6ebf/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java index 44c420c..6cb0234 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java @@ -36,7 +36,7 @@ import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.util.Daemon; import org.apache.ratis.util.LifeCycle; import org.apache.ratis.util.MD5FileUtil; -import org.apache.ratis.util.RaftUtils; +import org.apache.ratis.util.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -197,7 +197,7 @@ public class SimpleStateMachine4Testing extends BaseStateMachine { termIndexTracker.update(ServerProtoUtils.toTermIndex(entry)); } } - RaftUtils.assertTrue( + Preconditions.assertTrue( !list.isEmpty() && endIndex == list.get(list.size() - 1).getIndex(), "endIndex=%s, list=%s", endIndex, list); this.endIndexLastCkpt = endIndex; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/43bc6ebf/ratis-server/src/test/java/org/apache/ratis/statemachine/TermIndexTracker.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/TermIndexTracker.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/TermIndexTracker.java index a282d97..bb359d7 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/TermIndexTracker.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/TermIndexTracker.java @@ -18,7 +18,7 @@ package org.apache.ratis.statemachine; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.util.RaftUtils; +import org.apache.ratis.util.Preconditions; import java.util.Objects; @@ -53,7 +53,7 @@ class TermIndexTracker { */ public synchronized void update(TermIndex termIndex) { Objects.requireNonNull(termIndex); - RaftUtils.assertTrue(termIndex.compareTo(current) >= 0); + Preconditions.assertTrue(termIndex.compareTo(current) >= 0); this.current = termIndex; } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/43bc6ebf/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java index b81e367..c1f79a3 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java @@ -28,7 +28,7 @@ import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc; import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; -import org.apache.ratis.util.RaftUtils; +import org.apache.ratis.util.LogUtils; import org.junit.*; import org.junit.rules.Timeout; @@ -50,8 +50,8 @@ import static org.junit.Assert.*; */ public class TestStateMachine { static { - RaftUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG); - RaftUtils.setLogLevel(RaftClient.LOG, Level.DEBUG); + LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG); + LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG); } public static final int NUM_SERVERS = 5;
