Replace expiration method

Signed-off-by: yang.zhang <[email protected]>
apolloconfig · Jun 30, 2022 · ec2dabe · ec2dabe
1 parent e0938a3
commit ec2dabe
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/...src/test/java/com/ctrip/framework/apollo/biz/repository/InstanceConfigRepositoryTest.java b/...src/test/java/com/ctrip/framework/apollo/biz/repository/InstanceConfigRepositoryTest.java
@@ -27,7 +27,7 @@
 import org.springframework.test.annotation.Rollback;
 
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Created by kezhenxu94 at 2019/1/18 15:33.

diff --git a/...lo-client/src/test/java/com/ctrip/framework/apollo/integration/ConfigIntegrationTest.java b/...lo-client/src/test/java/com/ctrip/framework/apollo/integration/ConfigIntegrationTest.java
@@ -18,7 +18,7 @@
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import com.ctrip.framework.apollo.util.OrderedProperties;

diff --git a/...o-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigManagerTest.java b/...o-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigManagerTest.java
@@ -18,7 +18,7 @@
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import com.ctrip.framework.apollo.enums.ConfigSourceType;

diff --git a/...-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryManagerTest.java b/...-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryManagerTest.java
@@ -19,7 +19,7 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigFactoryTest.java
@@ -20,7 +20,7 @@
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistryTest.java
@@ -18,7 +18,7 @@
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...rtal/src/test/java/com/ctrip/framework/apollo/portal/controller/CommitControllerTest.java b/...rtal/src/test/java/com/ctrip/framework/apollo/portal/controller/CommitControllerTest.java
@@ -17,11 +17,13 @@
 package com.ctrip.framework.apollo.portal.controller;
 
 import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
-import java.util.List;
 import org.junit.Test;
 import org.springframework.web.client.HttpClientErrorException;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 /**
@@ -40,7 +42,7 @@ public void shouldFailWhenPageOrSiseIsNegative() {
       );
       fail("should throw");
     } catch (final HttpClientErrorException e) {
-      assertThat(
+     assertThat(
           new String(e.getResponseBodyAsByteArray()), containsString("page should be positive or 0")
       );
     }

diff --git a/...rc/test/java/com/ctrip/framework/apollo/portal/controller/ServerConfigControllerTest.java b/...rc/test/java/com/ctrip/framework/apollo/portal/controller/ServerConfigControllerTest.java
@@ -25,7 +25,7 @@
 import org.springframework.web.client.HttpClientErrorException;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Created by kezhenxu at 2019/1/14 13:24.