This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new fdb4b21f9a Refactor some test cases to remove public modifier (#10984)
fdb4b21f9a is described below
commit fdb4b21f9a8ada06c54467a3089653c592209601
Author: Albumen Kevin <[email protected]>
AuthorDate: Tue Nov 22 14:04:32 2022 +0800
Refactor some test cases to remove public modifier (#10984)
---
.../common/beanutil/JavaBeanSerializeUtilTest.java | 92 +++++++++++++++++++++-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 2 +-
.../org/apache/dubbo/config/spring/ConfigTest.java | 2 +-
.../spring/schema/DubboNamespaceHandlerTest.java | 5 +-
.../{transport => }/codec/CodecAdapterTest.java | 4 +-
.../codec/DeprecatedExchangeCodec.java | 2 +-
.../codec/DeprecatedTelnetCodec.java | 2 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 2 +-
8 files changed, 97 insertions(+), 14 deletions(-)
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
index 9231a32c10..64fcf7ade4 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.common.beanutil;
-import org.apache.dubbo.common.utils.PojoUtilsTest;
import org.apache.dubbo.rpc.model.person.BigPerson;
import org.apache.dubbo.rpc.model.person.FullAddress;
import org.apache.dubbo.rpc.model.person.PersonInfo;
@@ -300,12 +299,12 @@ class JavaBeanSerializeUtilTest {
@Test
void test_Circular_Reference() {
- PojoUtilsTest.Parent parent = new PojoUtilsTest.Parent();
+ Parent parent = new Parent();
parent.setAge(Integer.MAX_VALUE);
parent.setEmail("a@b");
parent.setName("zhangsan");
- PojoUtilsTest.Child child = new PojoUtilsTest.Child();
+ Child child = new Child();
child.setAge(100);
child.setName("lisi");
child.setParent(parent);
@@ -324,6 +323,91 @@ class JavaBeanSerializeUtilTest {
assertEqualsPrimitive(child.getAge(),
childDescriptor.getProperty("age"));
}
+ public static class Parent {
+ public String gender;
+ public String email;
+ String name;
+ int age;
+ Child child;
+ private String securityEmail;
+
+ public static Parent getNewParent() {
+ return new Parent();
+ }
+
+ public String getEmail() {
+ return this.securityEmail;
+ }
+
+ public void setEmail(String email) {
+ this.securityEmail = email;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
+ public Child getChild() {
+ return child;
+ }
+
+ public void setChild(Child child) {
+ this.child = child;
+ }
+ }
+
+ public static class Child {
+ public String gender;
+ public int age;
+ String toy;
+ Parent parent;
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
+ public String getToy() {
+ return toy;
+ }
+
+ public void setToy(String toy) {
+ this.toy = toy;
+ }
+
+ public Parent getParent() {
+ return parent;
+ }
+
+ public void setParent(Parent parent) {
+ this.parent = parent;
+ }
+ }
+
@Test
void testBeanSerialize() {
Bean bean = new Bean();
@@ -544,4 +628,4 @@ class JavaBeanSerializeUtilTest {
bigPerson.setInfoProfile(pi);
return bigPerson;
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
index e4b8b15c9c..2c7a0b8032 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
@@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class PojoUtilsTest {
+class PojoUtilsTest {
BigPerson bigPerson;
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
index 938504aaf4..8eadd48674 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
@@ -79,7 +79,7 @@ import static org.junit.jupiter.api.Assertions.fail;
/**
* ConfigTest
*/
-public class ConfigTest {
+class ConfigTest {
private static String resourcePath =
ConfigTest.class.getPackage().getName().replace('.', '/');
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
index fdd8795028..348383715a 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
@@ -27,7 +27,6 @@ import org.apache.dubbo.config.ServiceConfigBase;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.context.ModuleConfigManager;
-import org.apache.dubbo.config.spring.ConfigTest;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.impl.DemoServiceImpl;
@@ -58,7 +57,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
class DubboNamespaceHandlerTest {
- private static String resourcePath =
ConfigTest.class.getPackage().getName().replace('.', '/');
+ private static String resourcePath =
"org.apache.dubbo.config.spring".replace('.', '/');
@BeforeEach
public void setUp() {
@@ -301,4 +300,4 @@ class DubboNamespaceHandlerTest {
assertEquals(metricsBean.getPrometheus().getPushgateway().getPassword(),
"password");
assertEquals(metricsBean.getPrometheus().getPushgateway().getJob(),
"job");
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/CodecAdapterTest.java
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/CodecAdapterTest.java
similarity index 90%
rename from
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/CodecAdapterTest.java
rename to
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/CodecAdapterTest.java
index 928e95e147..60214b2c6f 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/CodecAdapterTest.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/CodecAdapterTest.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.remoting.transport.codec;
+package org.apache.dubbo.remoting.codec;
-import org.apache.dubbo.remoting.codec.ExchangeCodecTest;
+import org.apache.dubbo.remoting.transport.codec.CodecAdapter;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/DeprecatedExchangeCodec.java
similarity index 99%
rename from
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java
rename to
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/DeprecatedExchangeCodec.java
index 552222db98..5b0425e9d6 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/DeprecatedExchangeCodec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.remoting.transport.codec;
+package org.apache.dubbo.remoting.codec;
import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.io.Bytes;
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/DeprecatedTelnetCodec.java
similarity index 99%
rename from
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java
rename to
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/DeprecatedTelnetCodec.java
index 0522565081..7a82e64ddd 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/DeprecatedTelnetCodec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.remoting.transport.codec;
+package org.apache.dubbo.remoting.codec;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
index 4342eb468d..bc40fae681 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java
@@ -61,7 +61,7 @@ import static
org.apache.dubbo.common.constants.CommonConstants.READONLY_EVENT;
* 4-11 id (long)
* 12 -15 datalength
*/
-public class ExchangeCodecTest extends TelnetCodecTest {
+class ExchangeCodecTest extends TelnetCodecTest {
// magic header.
private static final short MAGIC = (short) 0xdabb;
private static final byte MAGIC_HIGH = (byte) Bytes.short2bytes(MAGIC)[0];
