fix unit tests related

alibaba · Aug 4, 2020 · 8b5a235 · 8b5a235
1 parent 76f329c
commit 8b5a235
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 119 deletions.
diff --git a/...a/com/alibaba/csp/sentinel/slots/block/degrade/circuitbreaker/AbstractCircuitBreaker.java b/...a/com/alibaba/csp/sentinel/slots/block/degrade/circuitbreaker/AbstractCircuitBreaker.java
@@ -22,11 +22,9 @@
 import com.alibaba.csp.sentinel.slotchain.ResourceWrapper;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
-import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreaker.State;
 import com.alibaba.csp.sentinel.util.AssertUtil;
 import com.alibaba.csp.sentinel.util.TimeUtil;
 import com.alibaba.csp.sentinel.util.function.BiConsumer;
-import com.alibaba.csp.sentinel.util.function.Consumer;
 
 /**
  * @author Eric Zhao

diff --git a/sentinel-core/src/test/java/com/alibaba/csp/sentinel/EntryTest.java b/sentinel-core/src/test/java/com/alibaba/csp/sentinel/EntryTest.java
@@ -1,8 +1,10 @@
 package com.alibaba.csp.sentinel;
 
+import com.alibaba.csp.sentinel.context.Context;
 import com.alibaba.csp.sentinel.node.Node;
 import com.alibaba.csp.sentinel.slotchain.ResourceWrapper;
 import com.alibaba.csp.sentinel.slotchain.StringResourceWrapper;
+import com.alibaba.csp.sentinel.util.function.BiConsumer;
 
 import org.junit.Test;
 
@@ -64,5 +66,10 @@ protected Entry trueExit(int count, Object... args) throws ErrorEntryFreeExcepti
         public Node getLastNode() {
             return null;
         }
+
+        @Override
+        public void whenComplete(BiConsumer<Context, Entry> consumer) {
+            // do nothing
+        }
     }
-}
+}
diff --git a/...est/java/com/alibaba/csp/sentinel/slots/block/degrade/CircuitBreakingIntegrationTest.java b/...est/java/com/alibaba/csp/sentinel/slots/block/degrade/CircuitBreakingIntegrationTest.java
@@ -15,10 +15,6 @@
  */
 package com.alibaba.csp.sentinel.slots.block.degrade;
 
-import com.alibaba.csp.sentinel.Entry;
-import com.alibaba.csp.sentinel.SphU;
-import com.alibaba.csp.sentinel.Tracer;
-import com.alibaba.csp.sentinel.slots.block.BlockException;
 import com.alibaba.csp.sentinel.slots.block.RuleConstant;
 import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreaker;
 import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreaker.State;
@@ -56,41 +52,6 @@ public void tearDown() throws Exception {
         DegradeRuleManager.loadRules(new ArrayList<DegradeRule>());
     }
 
-    private boolean entryAndSleepFor(String res, int sleepMs) {
-        Entry entry = null;
-        try {
-            entry = SphU.entry(res);
-            sleep(sleepMs);
-        } catch (BlockException ex) {
-            return false;
-        } catch (Exception ex) {
-            Tracer.traceEntry(ex, entry);
-        } finally {
-            if (entry != null) {
-                entry.exit();
-            }
-        }
-        return true;
-    }
-
-    private boolean entryWithErrorIfPresent(String res, Exception ex) {
-        Entry entry = null;
-        try {
-            entry = SphU.entry(res);
-            if (ex != null) {
-                Tracer.traceEntry(ex, entry);
-            }
-            sleep(ThreadLocalRandom.current().nextInt(5, 10));
-        } catch (BlockException b) {
-            return false;
-        } finally {
-            if (entry != null) {
-                entry.exit();
-            }
-        }
-        return true;
-    }
-
     @Test
     public void testSlowRequestMode() throws Exception {
         CircuitBreakerStateChangeObserver observer = mock(CircuitBreakerStateChangeObserver.class);

diff --git a/.../alibaba/csp/sentinel/slots/block/degrade/circuitbreaker/ExceptionCircuitBreakerTest.java b/.../alibaba/csp/sentinel/slots/block/degrade/circuitbreaker/ExceptionCircuitBreakerTest.java
@@ -15,97 +15,71 @@
  */
 package com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker;
 
-import com.alibaba.csp.sentinel.slots.block.RuleConstant;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreaker.State;
-import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.ExceptionCircuitBreaker.SimpleErrorCounter;
-import com.alibaba.csp.sentinel.slots.statistic.base.LeapArray;
-import com.alibaba.csp.sentinel.slots.statistic.base.WindowWrap;
-import com.alibaba.csp.sentinel.test.AbstractTimeBasedTest;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
+import com.alibaba.csp.sentinel.slots.block.RuleConstant;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
+import com.alibaba.csp.sentinel.test.AbstractTimeBasedTest;
 
 /**
  * @author Eric Zhao
  */
 public class ExceptionCircuitBreakerTest extends AbstractTimeBasedTest {
+
+    @Before
+    public void setUp() {
+        DegradeRuleManager.loadRules(new ArrayList<DegradeRule>());
+    }
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testStateChangeAndTryAcquire() {
-        int retryTimeout = 10;
-        DegradeRule rule = new DegradeRule("abc")
-            .setCount(0.5d)
-            .setGrade(RuleConstant.DEGRADE_GRADE_EXCEPTION_RATIO)
-            .setStatIntervalMs(20 * 1000)
-            .setTimeWindow(retryTimeout)
-            .setMinRequestAmount(10);
-        LeapArray<SimpleErrorCounter> stat = mock(LeapArray.class);
-        SimpleErrorCounter counter = new SimpleErrorCounter();
-        WindowWrap<SimpleErrorCounter> bucket = new WindowWrap<>(20000, 0, counter);
-        when(stat.currentWindow()).thenReturn(bucket);
-
-        ExceptionCircuitBreaker cb = new ExceptionCircuitBreaker(rule, stat);
-
-        assertTrue(cb.tryPass());
-        assertTrue(cb.tryPass());
-
-        setCurrentMillis(System.currentTimeMillis());
-        cb.fromCloseToOpen(0.52d);
-        assertEquals(State.OPEN, cb.currentState());
-
-        assertFalse(cb.tryPass());
-        assertFalse(cb.tryPass());
-
-        // Wait for next retry checkpoint.
-        sleepSecond(retryTimeout);
-        sleep(100);
-        // Try a request to trigger state transformation.
-        assertTrue(cb.tryPass());
-        assertEquals(State.HALF_OPEN, cb.currentState());
-
-        // Mark this request as error
-        cb.onRequestComplete(20, new IllegalArgumentException());
-        assertEquals(State.OPEN, cb.currentState());
-
-        // Wait for next retry checkpoint.
-        sleepSecond(retryTimeout);
-        sleep(100);
-        assertTrue(cb.tryPass());
-        assertEquals(State.HALF_OPEN, cb.currentState());
-
-        setCurrentMillis(System.currentTimeMillis());
-        // Mark this request as success.
-        cb.onRequestComplete(20, null);
-        assertEquals(State.CLOSED, cb.currentState());
+    @After
+    public void tearDown() throws Exception {
+        DegradeRuleManager.loadRules(new ArrayList<DegradeRule>());
     }
 
     @Test
-    @SuppressWarnings("unchecked")
-    public void testRecordErrorOrSuccess() {
+    public void testRecordErrorOrSuccess() throws BlockException {
+        String resource = "testRecordErrorOrSuccess";
+        int retryTimeoutMillis = 10 * 1000;
+        int retryTimeout = retryTimeoutMillis / 1000;
         DegradeRule rule = new DegradeRule("abc")
-            .setCount(0.5d)
+            .setCount(0.2d)
             .setGrade(RuleConstant.DEGRADE_GRADE_EXCEPTION_RATIO)
             .setStatIntervalMs(20 * 1000)
-            .setTimeWindow(10)
-            .setMinRequestAmount(10);
-        LeapArray<SimpleErrorCounter> stat = mock(LeapArray.class);
-        SimpleErrorCounter counter = new SimpleErrorCounter();
-        WindowWrap<SimpleErrorCounter> bucket = new WindowWrap<>(20000, 0, counter);
-        when(stat.currentWindow()).thenReturn(bucket);
-
-        CircuitBreaker cb = new ExceptionCircuitBreaker(rule, stat);
-        cb.onRequestComplete(15, null);
-
-        assertEquals(1L, counter.getTotalCount().longValue());
-        assertEquals(0L, counter.getErrorCount().longValue());
-
-        cb.onRequestComplete(15, new IllegalArgumentException());
-        assertEquals(2L, counter.getTotalCount().longValue());
-        assertEquals(1L, counter.getErrorCount().longValue());
+            .setTimeWindow(retryTimeout)
+            .setMinRequestAmount(1);
+        rule.setResource(resource);
+        DegradeRuleManager.loadRules(Arrays.asList(rule));
+
+        assertTrue(entryAndSleepFor(resource, 10));
+
+        assertTrue(entryWithErrorIfPresent(resource, new IllegalArgumentException())); // -> open
+        assertFalse(entryWithErrorIfPresent(resource, new IllegalArgumentException()));
+        assertFalse(entryAndSleepFor(resource, 100));
+        sleep(retryTimeoutMillis / 2);
+        assertFalse(entryAndSleepFor(resource, 100));
+        sleep(retryTimeoutMillis / 2);
+        assertTrue(entryWithErrorIfPresent(resource, new IllegalArgumentException())); // -> half -> open
+        assertFalse(entryAndSleepFor(resource, 100));
+        assertFalse(entryAndSleepFor(resource, 100));
+        sleep(retryTimeoutMillis);
+        assertTrue(entryAndSleepFor(resource, 100)); // -> half -> closed
+        assertTrue(entryAndSleepFor(resource, 100));
+        assertTrue(entryAndSleepFor(resource, 100));
+        assertTrue(entryAndSleepFor(resource, 100));
+        assertTrue(entryAndSleepFor(resource, 100));
+        assertTrue(entryAndSleepFor(resource, 100));
+        assertTrue(entryAndSleepFor(resource, 100));
+        assertTrue(entryWithErrorIfPresent(resource, new IllegalArgumentException()));
+        assertTrue(entryAndSleepFor(resource, 100));
     }
 }
diff --git a/sentinel-core/src/test/java/com/alibaba/csp/sentinel/test/AbstractTimeBasedTest.java b/sentinel-core/src/test/java/com/alibaba/csp/sentinel/test/AbstractTimeBasedTest.java
@@ -15,11 +15,17 @@
  */
 package com.alibaba.csp.sentinel.test;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import com.alibaba.csp.sentinel.Entry;
+import com.alibaba.csp.sentinel.SphU;
+import com.alibaba.csp.sentinel.Tracer;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
 import com.alibaba.csp.sentinel.util.TimeUtil;
 
 /**
@@ -55,4 +61,39 @@ protected final void sleep(int t) {
     protected final void sleepSecond(int timeSec) {
         sleep(timeSec * 1000);
     }
+
+    protected final boolean entryAndSleepFor(String res, int sleepMs) {
+        Entry entry = null;
+        try {
+            entry = SphU.entry(res);
+            sleep(sleepMs);
+        } catch (BlockException ex) {
+            return false;
+        } catch (Exception ex) {
+            Tracer.traceEntry(ex, entry);
+        } finally {
+            if (entry != null) {
+                entry.exit();
+            }
+        }
+        return true;
+    }
+
+    protected final boolean entryWithErrorIfPresent(String res, Exception ex) {
+        Entry entry = null;
+        try {
+            entry = SphU.entry(res);
+            if (ex != null) {
+                Tracer.traceEntry(ex, entry);
+            }
+            sleep(ThreadLocalRandom.current().nextInt(5, 10));
+        } catch (BlockException b) {
+            return false;
+        } finally {
+            if (entry != null) {
+                entry.exit();
+            }
+        }
+        return true;
+    }
 }