You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/19 11:50:39 UTC

[shardingsphere] branch master updated: Refactor agent's fixture (#22978)

This is an automated email from the ASF dual-hosted git repository.

sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new dec86c4911e Refactor agent's fixture (#22978)
dec86c4911e is described below

commit dec86c4911e44db3a87ab56e78edc60734515bfe
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Dec 19 19:50:33 2022 +0800

    Refactor agent's fixture (#22978)
---
 .../core/fixture/advice/MockStaticMethodAdvice.java      |  1 -
 .../agent/core/fixture/targeted/ConstructorMaterial.java |  4 ++--
 .../agent/core/fixture/targeted/InstanceMaterial.java    | 10 +++++-----
 .../agent/core/fixture/targeted/Material.java            | 16 ++++++++--------
 .../core/fixture/targeted/RepeatedAdviceMaterial.java    |  6 +++---
 .../agent/core/fixture/targeted/StaticMaterial.java      | 10 +++++-----
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/MockStaticMethodAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/MockStaticMethodAdvice.java
index f4d15e3c542..b8f8f86c8b8 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/MockStaticMethodAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/MockStaticMethodAdvice.java
@@ -54,5 +54,4 @@ public final class MockStaticMethodAdvice implements StaticMethodAdvice {
         List<String> queue = (List<String>) args[0];
         queue.add("exception");
     }
-    
 }
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/ConstructorMaterial.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/ConstructorMaterial.java
index 7a789016b8d..d966488a136 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/ConstructorMaterial.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/ConstructorMaterial.java
@@ -24,7 +24,7 @@ import java.util.List;
 @NoArgsConstructor
 public final class ConstructorMaterial {
     
-    public ConstructorMaterial(final List<String> queues) {
-        queues.add("constructor");
+    public ConstructorMaterial(final List<String> queue) {
+        queue.add("constructor");
     }
 }
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/InstanceMaterial.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/InstanceMaterial.java
index 918d65f1444..ac91ac59302 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/InstanceMaterial.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/InstanceMaterial.java
@@ -25,21 +25,21 @@ public class InstanceMaterial {
     /**
      * Mock method for testing.
      *
-     * @param queues queues
+     * @param queue queue
      * @return result
      */
-    public String mock(final List<String> queues) {
-        queues.add("on");
+    public String mock(final List<String> queue) {
+        queue.add("on");
         return "invocation";
     }
     
     /**
      * Mock method for testing with exception.
      *
-     * @param queues queues
+     * @param queue queue
      * @throws IOException IO Exception
      */
-    public void mockWithException(final List<String> queues) throws IOException {
+    public void mockWithException(final List<String> queue) throws IOException {
         throw new IOException();
     }
 }
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/Material.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/Material.java
index 47adf387f7a..f64507592d9 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/Material.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/Material.java
@@ -24,29 +24,29 @@ import java.util.List;
 @NoArgsConstructor
 public final class Material {
     
-    public Material(final List<String> queues) {
-        queues.add("constructor");
+    public Material(final List<String> queue) {
+        queue.add("constructor");
     }
     
     /**
      * Mock method for testing.
      *
-     * @param queues queues
+     * @param queue queue
      * @return result
      */
-    public String mock(final List<String> queues) {
-        queues.add("on");
+    public String mock(final List<String> queue) {
+        queue.add("on");
         return "invocation";
     }
     
     /**
      * Mock static method for testing.
      *
-     * @param queues queues
+     * @param queue queue
      * @return result
      */
-    public static String staticMock(final List<String> queues) {
-        queues.add("on");
+    public static String staticMock(final List<String> queue) {
+        queue.add("on");
         return "static invocation";
     }
 }
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/RepeatedAdviceMaterial.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/RepeatedAdviceMaterial.java
index 8cbad6dd261..fd0faa9e16d 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/RepeatedAdviceMaterial.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/RepeatedAdviceMaterial.java
@@ -27,11 +27,11 @@ public final class RepeatedAdviceMaterial {
     /**
      * Mock method for testing.
      *
-     * @param queues queues
+     * @param queue queue
      * @return result
      */
-    public String mock(final List<String> queues) {
-        queues.add("on");
+    public String mock(final List<String> queue) {
+        queue.add("on");
         return "invocation";
     }
 }
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/StaticMaterial.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/StaticMaterial.java
index 8e749244876..ee4e1598c98 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/StaticMaterial.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/StaticMaterial.java
@@ -25,21 +25,21 @@ public final class StaticMaterial {
     /**
      * Mock static method for testing.
      *
-     * @param queues queues
+     * @param queue queue
      * @return result
      */
-    public static String staticMock(final List<String> queues) {
-        queues.add("on");
+    public static String staticMock(final List<String> queue) {
+        queue.add("on");
         return "static invocation";
     }
     
     /**
      * Mock static method for testing with exception.
      *
-     * @param queues queues
+     * @param queue queue
      * @throws IOException IO Exception
      */
-    public static void staticMockWithException(final List<String> queues) throws IOException {
+    public static void staticMockWithException(final List<String> queue) throws IOException {
         throw new IOException();
     }
 }