This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 7c87ae6e32 Avoid dependency toward `org.apache.sis.test` in modules
that are still in incubating phase. Those modules were always excluded from
Apache SIS releases. For making future releases easier, the incubated modules
may move in a separated group of modules, for example an "incubator" group.
7c87ae6e32 is described below
commit 7c87ae6e3265f7a5a787164f50a505c108c5906d
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Jul 15 11:55:19 2023 +0200
Avoid dependency toward `org.apache.sis.test` in modules that are still in
incubating phase.
Those modules were always excluded from Apache SIS releases. For making
future releases easier,
the incubated modules may move in a separated group of modules, for example
an "incubator" group.
---
core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java | 3 +--
.../sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java | 3 +--
.../org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java | 4 +---
.../java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java | 2 --
.../java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java | 2 --
.../src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java | 3 +--
6 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
index a405b7ea36..9403c3edfc 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
@@ -19,7 +19,6 @@ package org.apache.sis.cql;
import org.opengis.filter.FilterFactory;
import org.locationtech.jts.geom.GeometryFactory;
import org.apache.sis.filter.DefaultFilterFactory;
-import org.apache.sis.test.TestCase;
import org.opengis.feature.Feature;
@@ -30,7 +29,7 @@ import org.opengis.feature.Feature;
* @version 1.1
* @since 1.1
*/
-abstract class CQLTestCase extends TestCase {
+abstract class CQLTestCase {
/**
* The factory to use for creating filter and expressions.
*/
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
index 62d79b1a42..a8157c17cc 100644
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
+++
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
@@ -28,7 +28,6 @@ import java.sql.SQLException;
import java.util.logging.Logger;
import org.apache.sis.storage.shapefile.ShapeFileTest;
-import org.apache.sis.test.TestCase;
import org.junit.Before;
/**
@@ -36,7 +35,7 @@ import org.junit.Before;
* all these tests are currently based on the SignedBikeRoute_4326_clipped.dbf
DBase 3 file.
* @author Marc LE BIHAN
*/
-public abstract class AbstractTestBaseForInternalJDBC extends TestCase {
+public abstract class AbstractTestBaseForInternalJDBC {
/** Logger. */
protected Logger log =
Logger.getLogger("org.apache.sis.internal.shapefile.jdbc");
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
index 0221a4c086..18d9d27bdf 100644
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
+++
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
@@ -20,7 +20,6 @@ import java.sql.*;
import java.util.Properties;
import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.test.DependsOnMethod;
import org.junit.*;
import static org.junit.Assert.*;
@@ -57,7 +56,7 @@ public class DBFConnectionTest extends
AbstractTestBaseForInternalJDBC {
public void openCloseConnectionWithAnotherCharset() throws SQLException {
Properties info = new Properties();
info.put("record_charset", "UTF-8");
-
+
final Driver driver = new DBFDriver();
final Connection connection =
driver.connect(this.dbfFile.getAbsolutePath(), info);
assertFalse("Connection should be opened", connection.isClosed());
@@ -73,7 +72,6 @@ public class DBFConnectionTest extends
AbstractTestBaseForInternalJDBC {
* @throws SQLException if an error occurred while opening the database.
*/
@Test(expected=SQLConnectionClosedException.class)
- @DependsOnMethod("openCloseConnection")
public void connectionClosed() throws SQLException {
// Open and close an connection.
final Driver driver = new DBFDriver();
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
index b2a4818ae8..4c4f83e974 100644
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
+++
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
@@ -25,7 +25,6 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import
org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
-import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
@@ -58,7 +57,6 @@ public class DBFResultSetTest extends
AbstractTestBaseForInternalJDBC {
* @throws SQLException if an error occurred while querying the database.
*/
@Test
- @DependsOnMethod("readFirstRecord")
public void readAllRecords() throws SQLException {
try(Connection connection = connect(); Statement stmt =
connection.createStatement(); ResultSet rs = stmt.executeQuery("SELECT * FROM
SignedBikeRoute")) {
int count = 0;
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
index 19dc0fa6d5..d1addfcc75 100644
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
+++
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
@@ -19,7 +19,6 @@ package org.apache.sis.internal.shapefile.jdbc;
import java.sql.*;
import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
-import org.apache.sis.test.DependsOnMethod;
import org.junit.*;
import static org.junit.Assert.*;
@@ -54,7 +53,6 @@ public class DBFStatementTest extends
AbstractTestBaseForInternalJDBC {
* @throws SQLException if an error occurred while opening the database or
the statement.
*/
@Test
- @DependsOnMethod("openCloseStatement")
public void statementClosed() throws SQLException {
// Open a connection, open and close a statement.
try(Connection connection = connect()) {
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
b/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
index f8223105ea..bddd9f5f1b 100644
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
+++
b/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
@@ -25,7 +25,6 @@ import java.text.MessageFormat;
import java.util.logging.Logger;
import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.test.TestCase;
import org.junit.Ignore;
import org.junit.Test;
import org.opengis.feature.Feature;
@@ -38,7 +37,7 @@ import org.opengis.feature.Feature;
* @version 0.5
* @since 0.5
*/
-public final class ShapeFileTest extends TestCase {
+public final class ShapeFileTest {
/**
* Returns URI path to a resource.
* @param name Resource name.
