Move native test from infra module to test module

apache · Nov 21, 2023 · 14a932a · 14a932a
1 parent 8974c14
commit 14a932a
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 47 deletions.
diff --git a/...re/test/natived/features/EncryptTest.java → ...st/natived/jdbc/features/EncryptTest.java b/...re/test/natived/features/EncryptTest.java → ...st/natived/jdbc/features/EncryptTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features;
+package org.apache.shardingsphere.test.natived.jdbc.features;
 
 import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.test.natived.FileTestUtils;
-import org.apache.shardingsphere.test.natived.features.entity.Address;
-import org.apache.shardingsphere.test.natived.features.entity.Order;
-import org.apache.shardingsphere.test.natived.features.entity.OrderItem;
-import org.apache.shardingsphere.test.natived.features.repository.AddressRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderItemRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Address;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Order;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.OrderItem;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.AddressRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderItemRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderRepository;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;

diff --git a/...phere/test/natived/features/MaskTest.java → .../test/natived/jdbc/features/MaskTest.java b/...phere/test/natived/features/MaskTest.java → .../test/natived/jdbc/features/MaskTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features;
+package org.apache.shardingsphere.test.natived.jdbc.features;
 
 import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.test.natived.FileTestUtils;
-import org.apache.shardingsphere.test.natived.features.entity.Address;
-import org.apache.shardingsphere.test.natived.features.entity.Order;
-import org.apache.shardingsphere.test.natived.features.entity.OrderItem;
-import org.apache.shardingsphere.test.natived.features.repository.AddressRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderItemRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Address;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Order;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.OrderItem;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.AddressRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderItemRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderRepository;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;

diff --git a/...ived/features/ReadWriteSplittingTest.java → ...jdbc/features/ReadWriteSplittingTest.java b/...ived/features/ReadWriteSplittingTest.java → ...jdbc/features/ReadWriteSplittingTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features;
+package org.apache.shardingsphere.test.natived.jdbc.features;
 
 import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.test.natived.FileTestUtils;
-import org.apache.shardingsphere.test.natived.features.entity.Address;
-import org.apache.shardingsphere.test.natived.features.entity.Order;
-import org.apache.shardingsphere.test.natived.features.entity.OrderItem;
-import org.apache.shardingsphere.test.natived.features.repository.AddressRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderItemRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Address;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Order;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.OrderItem;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.AddressRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderItemRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderRepository;
 import org.h2.jdbc.JdbcSQLSyntaxErrorException;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ere/test/natived/features/ShadowTest.java → ...est/natived/jdbc/features/ShadowTest.java b/...ere/test/natived/features/ShadowTest.java → ...est/natived/jdbc/features/ShadowTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features;
+package org.apache.shardingsphere.test.natived.jdbc.features;
 
 import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.test.natived.FileTestUtils;
-import org.apache.shardingsphere.test.natived.features.entity.Address;
-import org.apache.shardingsphere.test.natived.features.entity.Order;
-import org.apache.shardingsphere.test.natived.features.entity.OrderItem;
-import org.apache.shardingsphere.test.natived.features.repository.AddressRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderItemRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Address;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Order;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.OrderItem;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.AddressRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderItemRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderRepository;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;

diff --git a/...e/test/natived/features/ShardingTest.java → ...t/natived/jdbc/features/ShardingTest.java b/...e/test/natived/features/ShardingTest.java → ...t/natived/jdbc/features/ShardingTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features;
+package org.apache.shardingsphere.test.natived.jdbc.features;
 
 import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.test.natived.FileTestUtils;
-import org.apache.shardingsphere.test.natived.features.entity.Address;
-import org.apache.shardingsphere.test.natived.features.entity.Order;
-import org.apache.shardingsphere.test.natived.features.entity.OrderItem;
-import org.apache.shardingsphere.test.natived.features.repository.AddressRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderItemRepository;
-import org.apache.shardingsphere.test.natived.features.repository.OrderRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Address;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Order;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.OrderItem;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.AddressRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderItemRepository;
+import org.apache.shardingsphere.test.natived.jdbc.features.repository.OrderRepository;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;

diff --git a/...sBasedInlineShardingAlgorithmFixture.java → ...sBasedInlineShardingAlgorithmFixture.java b/...sBasedInlineShardingAlgorithmFixture.java → ...sBasedInlineShardingAlgorithmFixture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.algorithm;
+package org.apache.shardingsphere.test.natived.jdbc.features.algorithm;
 
 import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
 import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;

diff --git a/...ueryAssistedShardingEncryptAlgorithm.java → ...ueryAssistedShardingEncryptAlgorithm.java b/...ueryAssistedShardingEncryptAlgorithm.java → ...ueryAssistedShardingEncryptAlgorithm.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.algorithm;
+package org.apache.shardingsphere.test.natived.jdbc.features.algorithm;
 
 import lombok.Getter;
 import org.apache.shardingsphere.encrypt.api.context.EncryptContext;

diff --git a/...test/natived/features/entity/Address.java → ...natived/jdbc/features/entity/Address.java b/...test/natived/features/entity/Address.java → ...natived/jdbc/features/entity/Address.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.entity;
+package org.apache.shardingsphere.test.natived.jdbc.features.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...e/test/natived/features/entity/Order.java → ...t/natived/jdbc/features/entity/Order.java b/...e/test/natived/features/entity/Order.java → ...t/natived/jdbc/features/entity/Order.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.entity;
+package org.apache.shardingsphere.test.natived.jdbc.features.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...st/natived/features/entity/OrderItem.java → ...tived/jdbc/features/entity/OrderItem.java b/...st/natived/features/entity/OrderItem.java → ...tived/jdbc/features/entity/OrderItem.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.entity;
+package org.apache.shardingsphere.test.natived.jdbc.features.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...eatures/repository/AddressRepository.java → ...eatures/repository/AddressRepository.java b/...eatures/repository/AddressRepository.java → ...eatures/repository/AddressRepository.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.repository;
+package org.apache.shardingsphere.test.natived.jdbc.features.repository;
 
-import org.apache.shardingsphere.test.natived.features.entity.Address;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Address;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

diff --git a/...tures/repository/OrderItemRepository.java → ...tures/repository/OrderItemRepository.java b/...tures/repository/OrderItemRepository.java → ...tures/repository/OrderItemRepository.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.repository;
+package org.apache.shardingsphere.test.natived.jdbc.features.repository;
 
-import org.apache.shardingsphere.test.natived.features.entity.OrderItem;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.OrderItem;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

diff --git a/.../features/repository/OrderRepository.java → .../features/repository/OrderRepository.java b/.../features/repository/OrderRepository.java → .../features/repository/OrderRepository.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.natived.features.repository;
+package org.apache.shardingsphere.test.natived.jdbc.features.repository;
 
-import org.apache.shardingsphere.test.natived.features.entity.Order;
+import org.apache.shardingsphere.test.natived.jdbc.features.entity.Order;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

diff --git a/...t/resources/META-INF/native-image/shardingsphere-test-native-metadata/reflect-config.json b/...t/resources/META-INF/native-image/shardingsphere-test-native-metadata/reflect-config.json
@@ -5,3 +5,4 @@
   "methods":[{"name":"<init>","parameterTypes":[] }]
 }
 ]
+
diff --git a/...c/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm b/...c/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.test.natived.features.algorithm.TestQueryAssistedShardingEncryptAlgorithm
+org.apache.shardingsphere.test.natived.jdbc.features.algorithm.TestQueryAssistedShardingEncryptAlgorithm
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		"methods":[{"name":"<init>","parameterTypes":[] }]
		}
		]