This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 0a33ae5 add some unit test for enum (#1856)
0a33ae5 is described below
commit 0a33ae54802107107ba297d790c959f83f538173
Author: banana1995 <[email protected]>
AuthorDate: Fri Aug 6 10:55:18 2021 +0800
add some unit test for enum (#1856)
* add some unit test for enum
* format code
---
...umTest.java => AdminPluginOperateEnumTest.java} | 28 ++-----
...hodEnumTest.java => AdminResourceEnumTest.java} | 27 ++----
.../shenyu/common/enums/HttpMethodEnumTest.java | 35 +++++---
.../shenyu/common/enums/ParamTypeEnumTest.java | 50 ++++++++---
...MethodEnumTest.java => PluginTypeEnumTest.java} | 29 ++-----
...pMethodEnumTest.java => RateLimitEnumTest.java} | 34 +++-----
.../shenyu/common/enums/RpcTypeEnumTest.java | 96 ++++++++++++++++++++++
.../{HttpMethodEnumTest.java => WafEnumTest.java} | 30 ++-----
8 files changed, 198 insertions(+), 131 deletions(-)
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/AdminPluginOperateEnumTest.java
similarity index 59%
copy from
shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
copy to
shenyu-common/src/test/java/org/apache/shenyu/common/enums/AdminPluginOperateEnumTest.java
index b6cde9b..9016412 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/AdminPluginOperateEnumTest.java
@@ -17,32 +17,16 @@
package org.apache.shenyu.common.enums;
-import org.apache.shenyu.common.exception.ShenyuException;
import org.junit.Test;
-import java.util.Arrays;
-
import static org.junit.Assert.assertEquals;
-/**
- * Test Cases for HttpMethodEnum.
- */
-public final class HttpMethodEnumTest {
-
+public class AdminPluginOperateEnumTest {
@Test
- public void testAcquireByNameValid() {
- Arrays.stream(HttpMethodEnum.values()).forEach(
- e -> {
- if (e.getSupport()) {
- assertEquals(e, HttpMethodEnum.acquireByName(e.getName()));
- }
- }
- );
- }
-
- @Test(expected = ShenyuException.class)
- public void testAcquireByNameInvalid() {
- String httpMethodName = "InvalidName";
- HttpMethodEnum.acquireByName(httpMethodName);
+ public void testName() {
+ assertEquals("add", AdminPluginOperateEnum.ADD.getName());
+ assertEquals("delete", AdminPluginOperateEnum.DELETE.getName());
+ assertEquals("edit", AdminPluginOperateEnum.EDIT.getName());
+ assertEquals("query", AdminPluginOperateEnum.QUERY.getName());
}
}
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/AdminResourceEnumTest.java
similarity index 59%
copy from
shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
copy to
shenyu-common/src/test/java/org/apache/shenyu/common/enums/AdminResourceEnumTest.java
index b6cde9b..ccc00dc 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/AdminResourceEnumTest.java
@@ -17,32 +17,15 @@
package org.apache.shenyu.common.enums;
-import org.apache.shenyu.common.exception.ShenyuException;
import org.junit.Test;
-import java.util.Arrays;
-
import static org.junit.Assert.assertEquals;
-/**
- * Test Cases for HttpMethodEnum.
- */
-public final class HttpMethodEnumTest {
-
+public class AdminResourceEnumTest {
@Test
- public void testAcquireByNameValid() {
- Arrays.stream(HttpMethodEnum.values()).forEach(
- e -> {
- if (e.getSupport()) {
- assertEquals(e, HttpMethodEnum.acquireByName(e.getName()));
- }
- }
- );
- }
-
- @Test(expected = ShenyuException.class)
- public void testAcquireByNameInvalid() {
- String httpMethodName = "InvalidName";
- HttpMethodEnum.acquireByName(httpMethodName);
+ public void testGetCode() {
+ assertEquals(0, AdminResourceEnum.MAIN_MENU.getCode());
+ assertEquals(1, AdminResourceEnum.SECOND_MENU.getCode());
+ assertEquals(2, AdminResourceEnum.THREE_MENU.getCode());
}
}
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
index b6cde9b..7bd2bb7 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
@@ -17,27 +17,36 @@
package org.apache.shenyu.common.enums;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
import org.apache.shenyu.common.exception.ShenyuException;
import org.junit.Test;
-import java.util.Arrays;
+/** Test Cases for HttpMethodEnum. */
+public final class HttpMethodEnumTest {
-import static org.junit.Assert.assertEquals;
+ @Test
+ public void testGetName() {
+ assertEquals("delete", HttpMethodEnum.DELETE.getName());
+ assertEquals("get", HttpMethodEnum.GET.getName());
+ assertEquals("post", HttpMethodEnum.POST.getName());
+ assertEquals("put", HttpMethodEnum.PUT.getName());
+ }
-/**
- * Test Cases for HttpMethodEnum.
- */
-public final class HttpMethodEnumTest {
+ @Test
+ public void testSupport() {
+ assertTrue(HttpMethodEnum.DELETE.getSupport());
+ assertTrue(HttpMethodEnum.GET.getSupport());
+ assertTrue(HttpMethodEnum.POST.getSupport());
+ assertTrue(HttpMethodEnum.PUT.getSupport());
+ }
@Test
public void testAcquireByNameValid() {
- Arrays.stream(HttpMethodEnum.values()).forEach(
- e -> {
- if (e.getSupport()) {
- assertEquals(e, HttpMethodEnum.acquireByName(e.getName()));
- }
- }
- );
+ Arrays.stream(HttpMethodEnum.values())
+ .forEach(e -> assertEquals(e,
HttpMethodEnum.acquireByName(e.getName())));
}
@Test(expected = ShenyuException.class)
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/ParamTypeEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/ParamTypeEnumTest.java
index acfe608..36b76c6 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/ParamTypeEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/ParamTypeEnumTest.java
@@ -17,24 +17,51 @@
package org.apache.shenyu.common.enums;
-import org.apache.shenyu.common.exception.ShenyuException;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.shenyu.common.exception.ShenyuException;
+import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test Cases for ParamTypeEnum.
- */
+/** Test Cases for ParamTypeEnum. */
public final class ParamTypeEnumTest {
@Test
+ public void testGetName() {
+ assertEquals("cookie", ParamTypeEnum.COOKIE.getName());
+ assertEquals("req_method", ParamTypeEnum.REQUEST_METHOD.getName());
+ assertEquals("header", ParamTypeEnum.HEADER.getName());
+ assertEquals("ip", ParamTypeEnum.IP.getName());
+ assertEquals("host", ParamTypeEnum.HOST.getName());
+ assertEquals("query", ParamTypeEnum.QUERY.getName());
+ assertEquals("uri", ParamTypeEnum.URI.getName());
+ assertEquals("post", ParamTypeEnum.POST.getName());
+ assertEquals("form-data", ParamTypeEnum.FORM_DATA.getName());
+ assertEquals("path", ParamTypeEnum.PATH.getName());
+ }
+
+ @Test
+ public void testSupport() {
+ assertTrue(ParamTypeEnum.COOKIE.getSupport());
+ assertTrue(ParamTypeEnum.REQUEST_METHOD.getSupport());
+ assertTrue(ParamTypeEnum.HEADER.getSupport());
+ assertTrue(ParamTypeEnum.IP.getSupport());
+ assertTrue(ParamTypeEnum.HOST.getSupport());
+ assertTrue(ParamTypeEnum.QUERY.getSupport());
+ assertTrue(ParamTypeEnum.URI.getSupport());
+ assertTrue(ParamTypeEnum.POST.getSupport());
+ assertTrue(ParamTypeEnum.FORM_DATA.getSupport());
+ }
+
+ @Test
public void testAcquireSupport() {
- List<ParamTypeEnum> supportParamTypeList =
Arrays.stream(ParamTypeEnum.values())
-
.filter(ParamTypeEnum::getSupport).collect(Collectors.toList());
+ List<ParamTypeEnum> supportParamTypeList =
+ Arrays.stream(ParamTypeEnum.values())
+ .filter(ParamTypeEnum::getSupport)
+ .collect(Collectors.toList());
assertEquals(ParamTypeEnum.acquireSupport(), supportParamTypeList);
}
@@ -42,7 +69,10 @@ public final class ParamTypeEnumTest {
public void testGetParamTypeEnumByNameValid() {
Arrays.stream(ParamTypeEnum.values())
.filter(ParamTypeEnum::getSupport)
- .forEach(paramTypeEnum -> assertEquals(paramTypeEnum,
ParamTypeEnum.getParamTypeEnumByName(paramTypeEnum.getName())));
+ .forEach(
+ paramTypeEnum ->
+ assertEquals(
+ paramTypeEnum,
ParamTypeEnum.getParamTypeEnumByName(paramTypeEnum.getName())));
}
@Test(expected = ShenyuException.class)
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/PluginTypeEnumTest.java
similarity index 59%
copy from
shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
copy to
shenyu-common/src/test/java/org/apache/shenyu/common/enums/PluginTypeEnumTest.java
index b6cde9b..83b186e 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/PluginTypeEnumTest.java
@@ -17,32 +17,17 @@
package org.apache.shenyu.common.enums;
-import org.apache.shenyu.common.exception.ShenyuException;
-import org.junit.Test;
-
-import java.util.Arrays;
-
import static org.junit.Assert.assertEquals;
-/**
- * Test Cases for HttpMethodEnum.
- */
-public final class HttpMethodEnumTest {
+import org.junit.Test;
+
+public class PluginTypeEnumTest {
@Test
- public void testAcquireByNameValid() {
- Arrays.stream(HttpMethodEnum.values()).forEach(
- e -> {
- if (e.getSupport()) {
- assertEquals(e, HttpMethodEnum.acquireByName(e.getName()));
- }
- }
- );
+ public void testName() {
+ assertEquals("before", PluginTypeEnum.BEFORE.getName());
+ assertEquals("function", PluginTypeEnum.FUNCTION.getName());
+ assertEquals("last", PluginTypeEnum.LAST.getName());
}
- @Test(expected = ShenyuException.class)
- public void testAcquireByNameInvalid() {
- String httpMethodName = "InvalidName";
- HttpMethodEnum.acquireByName(httpMethodName);
- }
}
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RateLimitEnumTest.java
similarity index 50%
copy from
shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
copy to
shenyu-common/src/test/java/org/apache/shenyu/common/enums/RateLimitEnumTest.java
index b6cde9b..b5706c4 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RateLimitEnumTest.java
@@ -17,32 +17,24 @@
package org.apache.shenyu.common.enums;
-import org.apache.shenyu.common.exception.ShenyuException;
-import org.junit.Test;
-
-import java.util.Arrays;
-
import static org.junit.Assert.assertEquals;
-/**
- * Test Cases for HttpMethodEnum.
- */
-public final class HttpMethodEnumTest {
+import org.junit.Test;
+public class RateLimitEnumTest {
@Test
- public void testAcquireByNameValid() {
- Arrays.stream(HttpMethodEnum.values()).forEach(
- e -> {
- if (e.getSupport()) {
- assertEquals(e, HttpMethodEnum.acquireByName(e.getName()));
- }
- }
- );
+ public void testGetKeyName() {
+ assertEquals("concurrent_request_rate_limiter",
RateLimitEnum.CONCURRENT.getKeyName());
+ assertEquals("request_leaky_rate_limiter",
RateLimitEnum.LEAKY_BUCKET.getKeyName());
+ assertEquals("sliding_window_request_rate_limiter",
RateLimitEnum.SLIDING_WINDOW.getKeyName());
+ assertEquals("request_rate_limiter",
RateLimitEnum.TOKEN_BUCKET.getKeyName());
}
- @Test(expected = ShenyuException.class)
- public void testAcquireByNameInvalid() {
- String httpMethodName = "InvalidName";
- HttpMethodEnum.acquireByName(httpMethodName);
+ @Test
+ public void testGetScriptName() {
+ assertEquals("concurrent_request_rate_limiter.lua",
RateLimitEnum.CONCURRENT.getScriptName());
+ assertEquals("request_leaky_rate_limiter.lua",
RateLimitEnum.LEAKY_BUCKET.getScriptName());
+ assertEquals("sliding_window_request_rate_limiter.lua",
RateLimitEnum.SLIDING_WINDOW.getScriptName());
+ assertEquals("request_rate_limiter.lua",
RateLimitEnum.TOKEN_BUCKET.getScriptName());
}
}
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java
new file mode 100644
index 0000000..d6e359b
--- /dev/null
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shenyu.common.enums;
+
+import org.apache.shenyu.common.exception.ShenyuException;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class RpcTypeEnumTest {
+ @Test
+ public void testGetName() {
+ assertEquals("grpc", RpcTypeEnum.GRPC.getName());
+ assertEquals("dubbo", RpcTypeEnum.DUBBO.getName());
+ assertEquals("http", RpcTypeEnum.HTTP.getName());
+ assertEquals("motan", RpcTypeEnum.MOTAN.getName());
+ assertEquals("sofa", RpcTypeEnum.SOFA.getName());
+ assertEquals("springCloud", RpcTypeEnum.SPRING_CLOUD.getName());
+ assertEquals("tars", RpcTypeEnum.TARS.getName());
+ assertEquals("websocket", RpcTypeEnum.WEB_SOCKET.getName());
+ }
+
+ @Test
+ public void testSupport() {
+ assertTrue(RpcTypeEnum.GRPC.getSupport());
+ assertTrue(RpcTypeEnum.DUBBO.getSupport());
+ assertTrue(RpcTypeEnum.HTTP.getSupport());
+ assertTrue(RpcTypeEnum.MOTAN.getSupport());
+ assertTrue(RpcTypeEnum.SOFA.getSupport());
+ assertTrue(RpcTypeEnum.SPRING_CLOUD.getSupport());
+ assertTrue(RpcTypeEnum.TARS.getSupport());
+ assertTrue(RpcTypeEnum.WEB_SOCKET.getSupport());
+ }
+
+ @Test
+ public void testAcquireSupport() {
+ List<RpcTypeEnum> supportRpcTypeList =
+ Arrays.stream(RpcTypeEnum.values())
+ .filter(RpcTypeEnum::getSupport)
+ .collect(Collectors.toList());
+ assertEquals(RpcTypeEnum.acquireSupports(), supportRpcTypeList);
+ }
+
+ @Test
+ public void testGetRpcTypeEnumByNameValid() {
+ Arrays.stream(RpcTypeEnum.values())
+ .filter(RpcTypeEnum::getSupport)
+ .forEach(
+ rpcTypeEnum ->
+ assertEquals(rpcTypeEnum,
RpcTypeEnum.acquireByName(rpcTypeEnum.getName())));
+ }
+
+ @Test
+ public void testAcquireSupportURIs() {
+ List<RpcTypeEnum> rpcTypeEnumList = RpcTypeEnum.acquireSupportURIs();
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.GRPC));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.HTTP));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.TARS));
+ }
+
+ @Test
+ public void testAcquireSupportMetadatas() {
+ List<RpcTypeEnum> rpcTypeEnumList =
RpcTypeEnum.acquireSupportMetadatas();
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.DUBBO));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.GRPC));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.HTTP));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.SPRING_CLOUD));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.SOFA));
+ assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.TARS));
+ }
+
+ @Test(expected = ShenyuException.class)
+ public void testGetRpcTypeEnumByNameInvalid() {
+ RpcTypeEnum.acquireByName("InvalidName");
+ }
+}
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/WafEnumTest.java
similarity index 59%
copy from
shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
copy to
shenyu-common/src/test/java/org/apache/shenyu/common/enums/WafEnumTest.java
index b6cde9b..29595c2 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/HttpMethodEnumTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/WafEnumTest.java
@@ -17,32 +17,20 @@
package org.apache.shenyu.common.enums;
-import org.apache.shenyu.common.exception.ShenyuException;
-import org.junit.Test;
-
-import java.util.Arrays;
-
import static org.junit.Assert.assertEquals;
-/**
- * Test Cases for HttpMethodEnum.
- */
-public final class HttpMethodEnumTest {
+import org.junit.Test;
+public class WafEnumTest {
@Test
- public void testAcquireByNameValid() {
- Arrays.stream(HttpMethodEnum.values()).forEach(
- e -> {
- if (e.getSupport()) {
- assertEquals(e, HttpMethodEnum.acquireByName(e.getName()));
- }
- }
- );
+ public void testGetCode() {
+ assertEquals(0, WafEnum.REJECT.getCode());
+ assertEquals(1, WafEnum.ALLOW.getCode());
}
- @Test(expected = ShenyuException.class)
- public void testAcquireByNameInvalid() {
- String httpMethodName = "InvalidName";
- HttpMethodEnum.acquireByName(httpMethodName);
+ @Test
+ public void testGetName() {
+ assertEquals("reject", WafEnum.REJECT.getName());
+ assertEquals("allow", WafEnum.ALLOW.getName());
}
}
