This is an automated email from the ASF dual-hosted git repository.
panjuan 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 b2ab47c56fd Move fixture back for test cases (#30263)
b2ab47c56fd is described below
commit b2ab47c56fdfb5c35705f14e9c89c9f25fd6adf6
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 24 14:26:09 2024 +0800
Move fixture back for test cases (#30263)
---
.../shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java | 6 +++---
.../shardingsphere/agent/core/spi/AgentServiceLoaderTest.java | 6 +++---
.../shardingsphere/{agent/core => }/fixture/advice/BarAdvice.java | 2 +-
.../shardingsphere/{agent/core => }/fixture/advice/FooAdvice.java | 2 +-
.../{agent/core => }/fixture/agent/AgentServiceEmptySPIFixture.java | 2 +-
.../{agent/core => }/fixture/agent/AgentServiceSPIFixture.java | 2 +-
.../core => }/fixture/agent/impl/AgentServiceSPIFixtureImpl.java | 4 ++--
.../{agent/core => }/fixture/targeted/TargetObjectFixture.java | 2 +-
... org.apache.shardingsphere.fixture.agent.AgentServiceSPIFixture} | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
index daf0e03d204..e51306b373d 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
@@ -23,9 +23,9 @@ import
net.bytebuddy.agent.builder.ResettableClassFileTransformer;
import net.bytebuddy.matcher.ElementMatchers;
import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.core.advisor.config.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.fixture.advice.BarAdvice;
-import org.apache.shardingsphere.agent.core.fixture.advice.FooAdvice;
-import
org.apache.shardingsphere.agent.core.fixture.targeted.TargetObjectFixture;
+import org.apache.shardingsphere.fixture.advice.BarAdvice;
+import org.apache.shardingsphere.fixture.advice.FooAdvice;
+import org.apache.shardingsphere.fixture.targeted.TargetObjectFixture;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoaderTest.java
index 5f0debf6ca3..3d25685aef3 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoaderTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.core.spi;
-import
org.apache.shardingsphere.agent.core.fixture.agent.AgentServiceEmptySPIFixture;
-import
org.apache.shardingsphere.agent.core.fixture.agent.AgentServiceSPIFixture;
-import
org.apache.shardingsphere.agent.core.fixture.agent.impl.AgentServiceSPIFixtureImpl;
+import org.apache.shardingsphere.fixture.agent.AgentServiceEmptySPIFixture;
+import org.apache.shardingsphere.fixture.agent.AgentServiceSPIFixture;
+import org.apache.shardingsphere.fixture.agent.impl.AgentServiceSPIFixtureImpl;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/BarAdvice.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/BarAdvice.java
similarity index 98%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/BarAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/BarAdvice.java
index d7972339f1c..87cbf574d7a 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/BarAdvice.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/BarAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.fixture.advice;
+package org.apache.shardingsphere.fixture.advice;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/FooAdvice.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/FooAdvice.java
similarity index 98%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/FooAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/FooAdvice.java
index bf3ec60921e..04baee22f7f 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/advice/FooAdvice.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/FooAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.fixture.advice;
+package org.apache.shardingsphere.fixture.advice;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/AgentServiceEmptySPIFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/AgentServiceEmptySPIFixture.java
similarity index 93%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/AgentServiceEmptySPIFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/AgentServiceEmptySPIFixture.java
index 1364f90107b..37f480b6071 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/AgentServiceEmptySPIFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/AgentServiceEmptySPIFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.fixture.agent;
+package org.apache.shardingsphere.fixture.agent;
public interface AgentServiceEmptySPIFixture {
}
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/AgentServiceSPIFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/AgentServiceSPIFixture.java
similarity index 93%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/AgentServiceSPIFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/AgentServiceSPIFixture.java
index bb4281526a6..f129ca3eb7d 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/AgentServiceSPIFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/AgentServiceSPIFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.fixture.agent;
+package org.apache.shardingsphere.fixture.agent;
public interface AgentServiceSPIFixture {
}
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/impl/AgentServiceSPIFixtureImpl.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/impl/AgentServiceSPIFixtureImpl.java
similarity index 85%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/impl/AgentServiceSPIFixtureImpl.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/impl/AgentServiceSPIFixtureImpl.java
index cdde4e12e06..b0d13d8056a 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/agent/impl/AgentServiceSPIFixtureImpl.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/agent/impl/AgentServiceSPIFixtureImpl.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.fixture.agent.impl;
+package org.apache.shardingsphere.fixture.agent.impl;
-import
org.apache.shardingsphere.agent.core.fixture.agent.AgentServiceSPIFixture;
+import org.apache.shardingsphere.fixture.agent.AgentServiceSPIFixture;
public class AgentServiceSPIFixtureImpl implements AgentServiceSPIFixture {
}
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/TargetObjectFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/targeted/TargetObjectFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/TargetObjectFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/targeted/TargetObjectFixture.java
index 644b2c33828..e707a5e2f1a 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/fixture/targeted/TargetObjectFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/targeted/TargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.fixture.targeted;
+package org.apache.shardingsphere.fixture.targeted;
import java.util.List;
diff --git
a/agent/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.core.fixture.agent.AgentServiceSPIFixture
b/agent/core/src/test/resources/META-INF/services/org.apache.shardingsphere.fixture.agent.AgentServiceSPIFixture
similarity index 90%
rename from
agent/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.core.fixture.agent.AgentServiceSPIFixture
rename to
agent/core/src/test/resources/META-INF/services/org.apache.shardingsphere.fixture.agent.AgentServiceSPIFixture
index 31c24cadb27..8eaa2a1f329 100644
---
a/agent/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.core.fixture.agent.AgentServiceSPIFixture
+++
b/agent/core/src/test/resources/META-INF/services/org.apache.shardingsphere.fixture.agent.AgentServiceSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.agent.core.fixture.agent.impl.AgentServiceSPIFixtureImpl
+org.apache.shardingsphere.fixture.agent.impl.AgentServiceSPIFixtureImpl
