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
commit 46d1541b9fd0ac2b3712d0ac62c3b0afd428bdc4
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon May 8 10:21:14 2023 +0200
Remove test suites, replaced by classical JUnit execution.
https://issues.apache.org/jira/browse/SIS-580
---
.../apache/sis/test/suite/ConsoleTestSuite.java | 49 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../sis/test/suite/ApplicationTestSuite.java | 44 ---
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../apache/sis/test/suite/OpenOfficeTestSuite.java | 45 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../org/apache/sis/test/suite/AWSTestSuite.java | 41 ---
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../test/java/org/apache/sis/cql/CQLTestSuite.java | 49 ----
.../apache/sis/test/suite/FeatureTestSuite.java | 145 ----------
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../apache/sis/test/suite/MetadataTestSuite.java | 156 -----------
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../apache/sis/util/iso/DefaultScopedNameTest.java | 6 +-
.../apache/sis/test/suite/PortrayalTestSuite.java | 46 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../suite/ReferencingByIdentifiersTestSuite.java | 49 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../sis/referencing/IdentifiedObjectsTest.java | 7 +-
.../operation/matrix/NonSquareMatrixTest.java | 11 +-
.../sis/test/suite/ReferencingTestSuite.java | 300 ---------------------
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../test/java/org/apache/sis/test/DependsOn.java | 17 +-
.../org/apache/sis/test/LogRecordCollector.java | 13 +-
.../test/java/org/apache/sis/test/TestCase.java | 12 +-
.../test/java/org/apache/sis/test/TestRunner.java | 52 +---
.../test/java/org/apache/sis/test/TestSuite.java | 263 ------------------
.../apache/sis/test/suite/UtilityTestSuite.java | 145 ----------
.../org/apache/sis/test/suite/package-info.java | 27 --
pom.xml | 3 -
.../sis/test/suite/FrenchProfileTestSuite.java | 46 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../sis/test/suite/JapanProfileTestSuite.java | 44 ---
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../sis/test/suite/EarthObservationTestSuite.java | 46 ----
.../apache/sis/test/suite/GeoTiffTestSuite.java | 53 ----
.../org/apache/sis/test/suite/NetcdfTestSuite.java | 57 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../apache/sis/test/suite/ShapefileTestSuite.java | 44 ---
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../org/apache/sis/test/suite/SQLTestSuite.java | 46 ----
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../apache/sis/test/suite/StorageTestSuite.java | 85 ------
.../org/apache/sis/test/suite/package-info.txt | 3 -
.../org/apache/sis/test/suite/GPXTestSuite.java | 44 ---
.../org/apache/sis/test/suite/package-info.txt | 3 -
46 files changed, 48 insertions(+), 1945 deletions(-)
diff --git
a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
deleted file mode 100644
index 3ee075125d..0000000000
---
a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-console} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.3
- */
-@Suite.SuiteClasses({
- org.apache.sis.console.CommandRunnerTest.class,
- org.apache.sis.console.HelpCommandTest.class,
- org.apache.sis.console.AboutCommandTest.class,
- org.apache.sis.console.MimeTypeCommandTest.class,
- org.apache.sis.console.MetadataCommandTest.class,
- org.apache.sis.console.CRSCommandTest.class
-})
-public final class ConsoleTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(ConsoleTestSuite.class);
- verifyTestList(ConsoleTestSuite.class);
- }
-}
diff --git
a/application/sis-console/src/test/java/org/apache/sis/test/suite/package-info.txt
b/application/sis-console/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/application/sis-console/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
b/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
deleted file mode 100644
index e618539d24..0000000000
---
a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-javafx} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.1
- * @since 1.1
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.gui.GUIUtilitiesTest.class
-})
-public final class ApplicationTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(ApplicationTestSuite.class);
- verifyTestList(ApplicationTestSuite.class);
- }
-}
diff --git
a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/package-info.txt
b/application/sis-javafx/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
deleted file mode 100644
index 0e6bd88df3..0000000000
---
a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-openoffice} add-ins, in rough dependency
order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.8
- */
-@Suite.SuiteClasses({
- org.apache.sis.openoffice.TransformerTest.class,
- org.apache.sis.openoffice.ReferencingFunctionsTest.class
-})
-public final class OpenOfficeTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(OpenOfficeTestSuite.class);
- verifyTestList(OpenOfficeTestSuite.class);
- }
-}
diff --git
a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/package-info.txt
b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
deleted file mode 100644
index 6ac7949849..0000000000
---
a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-cloud-aws} module, in rough dependency order.
- */
-@Suite.SuiteClasses({
- org.apache.sis.cloud.aws.s3.KeyPathTest.class,
- org.apache.sis.cloud.aws.s3.KeyPathMatcherTest.class,
- org.apache.sis.cloud.aws.s3.ClientFileSystemTest.class
-})
-public final class AWSTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- verifyTestList(AWSTestSuite.class);
- }
-}
diff --git
a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/package-info.txt
b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
deleted file mode 100644
index 75716f0521..0000000000
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.cql;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.BeforeClass;
-import org.junit.runners.Suite;
-
-
-/**
- * All tests from the {@code sis-cql} module.
- *
- * @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
- */
-@Suite.SuiteClasses({
- org.apache.sis.cql.ExpressionReadingTest.class,
- org.apache.sis.cql.ExpressionWritingTest.class,
- org.apache.sis.cql.FilterReadingTest.class,
- org.apache.sis.cql.FilterWritingTest.class,
- org.apache.sis.cql.QueryReadingTest.class,
- org.apache.sis.cql.QueryWritingTest.class,
-})
-public final class CQLTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(CQLTestSuite.class);
- verifyTestList(CQLTestSuite.class);
- }
-}
diff --git
a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
deleted file mode 100644
index a8ca5f5ba1..0000000000
---
a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.BeforeClass;
-import org.junit.runners.Suite;
-
-
-/**
- * All tests from the {@code sis-feature} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @author Johann Sorel (Geomatys)
- * @version 1.4
- * @since 0.5
- */
-@Suite.SuiteClasses({
- org.apache.sis.feature.DefaultAttributeTypeTest.class,
- org.apache.sis.feature.CharacteristicTypeMapTest.class,
- org.apache.sis.feature.CharacteristicMapTest.class,
- org.apache.sis.feature.DefaultFeatureTypeTest.class,
- org.apache.sis.feature.PropertySingletonTest.class,
- org.apache.sis.feature.SingletonAttributeTest.class,
- org.apache.sis.feature.MultiValuedAttributeTest.class,
- org.apache.sis.feature.DenseFeatureTest.class,
- org.apache.sis.feature.SparseFeatureTest.class,
- org.apache.sis.feature.AbstractFeatureTest.class,
- org.apache.sis.feature.DefaultAssociationRoleTest.class,
- org.apache.sis.feature.SingletonAssociationTest.class,
- org.apache.sis.feature.AbstractOperationTest.class,
- org.apache.sis.feature.LinkOperationTest.class,
- org.apache.sis.feature.StringJoinOperationTest.class,
- org.apache.sis.feature.EnvelopeOperationTest.class,
- org.apache.sis.feature.GroupAsPolylineOperationTest.class,
- org.apache.sis.feature.FeatureOperationsTest.class,
- org.apache.sis.feature.FeatureFormatTest.class,
- org.apache.sis.feature.FeaturesTest.class,
- org.apache.sis.filter.XPathTest.class,
- org.apache.sis.filter.CapabilitiesTest.class,
- org.apache.sis.filter.LeafExpressionTest.class,
- org.apache.sis.filter.LogicalFilterTest.class,
- org.apache.sis.filter.IdentifierFilterTest.class,
- org.apache.sis.filter.ArithmeticFunctionTest.class,
- org.apache.sis.filter.ComparisonFilterTest.class,
- org.apache.sis.filter.LikeFilterTest.class,
- org.apache.sis.filter.TemporalFilterTest.class,
- org.apache.sis.filter.BinarySpatialFilterUsingJTS_Test.class,
- org.apache.sis.filter.BinarySpatialFilterUsingESRI_Test.class,
- org.apache.sis.filter.BinarySpatialFilterUsingJava2D_Test.class,
- org.apache.sis.internal.feature.AttributeConventionTest.class,
- org.apache.sis.internal.feature.GeometryTypeTest.class,
- org.apache.sis.internal.filter.CopyVisitorTest.class,
- org.apache.sis.internal.filter.FunctionNamesTest.class,
- org.apache.sis.internal.filter.sqlmm.SQLMMTest.class,
- org.apache.sis.internal.filter.sqlmm.RegistryUsingJTS_Test.class,
- org.apache.sis.internal.filter.sqlmm.RegistryUsingESRI_Test.class,
- org.apache.sis.internal.filter.sqlmm.RegistryUsingJava2D_Test.class,
- org.apache.sis.internal.feature.j2d.ShapePropertiesTest.class,
- org.apache.sis.internal.feature.j2d.FlatShapeTest.class,
- org.apache.sis.internal.feature.j2d.FactoryTest.class,
- org.apache.sis.internal.feature.esri.FactoryTest.class,
- org.apache.sis.internal.feature.jts.FactoryTest.class,
- org.apache.sis.internal.feature.jts.JTSTest.class,
- org.apache.sis.internal.feature.jts.ShapeAdapterTest.class,
- org.apache.sis.internal.feature.jts.ShapeConverterTest.class,
- org.apache.sis.feature.builder.CharacteristicTypeBuilderTest.class,
- org.apache.sis.feature.builder.AttributeTypeBuilderTest.class,
- org.apache.sis.feature.builder.AssociationRoleBuilderTest.class,
- org.apache.sis.feature.builder.FeatureTypeBuilderTest.class,
-
- // Rasters
- org.apache.sis.internal.coverage.RangeArgumentTest.class,
- org.apache.sis.internal.coverage.j2d.ImageUtilitiesTest.class,
- org.apache.sis.internal.coverage.j2d.ImageLayoutTest.class,
- org.apache.sis.internal.coverage.j2d.ScaledColorSpaceTest.class,
- org.apache.sis.internal.coverage.j2d.ColorModelBuilderTest.class,
- org.apache.sis.internal.coverage.j2d.SampleModelFactoryTest.class,
- org.apache.sis.internal.processing.isoline.IsolinesTest.class,
- org.apache.sis.image.DataTypeTest.class,
- org.apache.sis.image.PlanarImageTest.class,
- org.apache.sis.image.ComputedImageTest.class,
- org.apache.sis.image.PixelIteratorTest.class,
- org.apache.sis.image.LinearIteratorTest.class,
- org.apache.sis.image.BandedIteratorTest.class,
- org.apache.sis.image.StatisticsCalculatorTest.class,
- org.apache.sis.image.BandSelectImageTest.class,
- org.apache.sis.image.InterpolationTest.class,
- org.apache.sis.image.ResamplingGridTest.class,
- org.apache.sis.image.ResampledImageTest.class,
- org.apache.sis.image.MaskedImageTest.class,
- org.apache.sis.image.BandAggregateImageTest.class,
- org.apache.sis.image.BandedSampleConverterTest.class,
- org.apache.sis.image.ImageCombinerTest.class,
- org.apache.sis.image.ImageProcessorTest.class,
- org.apache.sis.coverage.CategoryTest.class,
- org.apache.sis.coverage.CategoryListTest.class,
- org.apache.sis.coverage.SampleDimensionTest.class,
- org.apache.sis.coverage.SampleRangeFormatTest.class,
- org.apache.sis.coverage.CoverageCombinerTest.class,
- org.apache.sis.coverage.grid.PixelTranslationTest.class,
- org.apache.sis.coverage.grid.GridOrientationTest.class,
- org.apache.sis.coverage.grid.GridExtentTest.class,
- org.apache.sis.coverage.grid.GridGeometryTest.class,
- org.apache.sis.coverage.grid.GridDerivationTest.class,
- org.apache.sis.coverage.grid.FractionalGridCoordinatesTest.class,
- org.apache.sis.coverage.grid.ReshapedImageTest.class,
- org.apache.sis.coverage.grid.GridCoverage2DTest.class,
- org.apache.sis.coverage.grid.BufferedGridCoverageTest.class,
- org.apache.sis.coverage.grid.GridCoverageBuilderTest.class,
- org.apache.sis.coverage.grid.ConvertedGridCoverageTest.class,
- org.apache.sis.coverage.grid.TranslatedGridCoverageTest.class,
- org.apache.sis.coverage.grid.ResampledGridCoverageTest.class,
- org.apache.sis.coverage.grid.DimensionalityReductionTest.class,
- org.apache.sis.coverage.grid.BandAggregateGridCoverageTest.class,
-
- // Index and processing
- org.apache.sis.index.tree.PointTreeNodeTest.class,
- org.apache.sis.index.tree.PointTreeTest.class
-})
-public final class FeatureTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(FeatureTestSuite.class);
- verifyTestList(FeatureTestSuite.class);
- }
-}
diff --git
a/core/sis-feature/src/test/java/org/apache/sis/test/suite/package-info.txt
b/core/sis-feature/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
deleted file mode 100644
index c0139fa9e4..0000000000
---
a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-metadata} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.3
- * @since 0.3
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.metadata.IdentifiersTest.class,
- org.apache.sis.internal.metadata.AxisNamesTest.class,
- org.apache.sis.internal.metadata.NameMeaningTest.class,
- org.apache.sis.internal.metadata.ImplementationHelperTest.class,
-
- // Classes using Java reflection.
- org.apache.sis.metadata.PropertyInformationTest.class,
- org.apache.sis.metadata.PropertyAccessorTest.class,
- org.apache.sis.metadata.SpecialCasesTest.class,
- org.apache.sis.metadata.NameMapTest.class,
- org.apache.sis.metadata.TypeMapTest.class,
- org.apache.sis.metadata.InformationMapTest.class,
- org.apache.sis.metadata.ValueMapTest.class,
- org.apache.sis.metadata.TreeNodeChildrenTest.class,
- org.apache.sis.metadata.TreeNodeTest.class,
- org.apache.sis.metadata.TreeTableViewTest.class,
- org.apache.sis.metadata.TreeTableFormatTest.class,
- org.apache.sis.metadata.MetadataStandardTest.class,
- org.apache.sis.metadata.HashCodeTest.class,
- org.apache.sis.metadata.PrunerTest.class,
- org.apache.sis.metadata.AbstractMetadataTest.class,
- org.apache.sis.metadata.ModifiableMetadataTest.class,
- org.apache.sis.metadata.MetadataCopierTest.class,
- org.apache.sis.internal.metadata.MergerTest.class,
-
- // XML marshalling.
- org.apache.sis.internal.test.DocumentComparatorTest.class,
- org.apache.sis.xml.NamespacesTest.class,
- org.apache.sis.xml.XLinkTest.class,
- org.apache.sis.xml.XPointerTest.class,
- org.apache.sis.xml.NilReasonTest.class,
- org.apache.sis.xml.LegacyCodesTest.class,
- org.apache.sis.xml.ValueConverterTest.class,
- org.apache.sis.xml.MarshallerPoolTest.class,
- org.apache.sis.xml.TransformingNamespacesTest.class,
- org.apache.sis.xml.TransformerTest.class,
- org.apache.sis.internal.xml.XmlUtilitiesTest.class,
- org.apache.sis.internal.jaxb.IdentifierMapAdapterTest.class,
- org.apache.sis.internal.jaxb.ModifiableIdentifierMapTest.class,
- org.apache.sis.internal.jaxb.gco.StringAdapterTest.class,
- org.apache.sis.internal.jaxb.gco.PropertyTypeTest.class,
- org.apache.sis.internal.jaxb.gco.MultiplicityTest.class,
- org.apache.sis.internal.jaxb.lan.PT_LocaleTest.class,
- org.apache.sis.internal.jaxb.lan.OtherLocalesTest.class,
- org.apache.sis.internal.jaxb.lan.LanguageCodeTest.class,
- org.apache.sis.internal.jaxb.lan.FreeTextMarshallingTest.class,
- org.apache.sis.internal.jaxb.cat.EnumAdapterTest.class,
- org.apache.sis.internal.jaxb.cat.EnumMarshallingTest.class,
- org.apache.sis.internal.jaxb.cat.CodeListMarshallingTest.class,
- org.apache.sis.internal.jaxb.gml.TimePeriodTest.class,
- org.apache.sis.internal.jaxb.gml.MeasureTest.class,
- org.apache.sis.xml.NilReasonMarshallingTest.class,
- org.apache.sis.xml.CharSequenceSubstitutionTest.class,
- org.apache.sis.xml.UUIDMarshallingTest.class,
- org.apache.sis.xml.XLinkMarshallingTest.class,
-
- // GeoAPI most basic types.
- org.apache.sis.internal.simple.SimpleIdentifierTest.class,
- org.apache.sis.util.iso.TypesTest.class,
- org.apache.sis.util.iso.DefaultLocalNameTest.class,
- org.apache.sis.util.iso.DefaultScopedNameTest.class,
- org.apache.sis.util.iso.DefaultNameFactoryTest.class,
- org.apache.sis.util.iso.NamesTest.class,
- org.apache.sis.util.iso.TypeNamesTest.class,
- org.apache.sis.util.iso.DefaultRecordTypeTest.class,
- org.apache.sis.util.iso.DefaultRecordSchemaTest.class,
- org.apache.sis.util.iso.DefaultRecordTest.class,
- org.apache.sis.util.iso.NameMarshallingTest.class,
-
- // ISO implementations.
- org.apache.sis.metadata.iso.citation.DefaultContactTest.class,
- org.apache.sis.metadata.iso.citation.DefaultResponsibilityTest.class,
- org.apache.sis.metadata.iso.citation.DefaultCitationDateTest.class,
- org.apache.sis.metadata.iso.citation.DefaultCitationTest.class,
- org.apache.sis.metadata.iso.maintenance.DefaultScopeDescriptionTest.class,
- org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBoxTest.class,
- org.apache.sis.metadata.iso.extent.DefaultExtentTest.class,
- org.apache.sis.metadata.iso.extent.ExtentsTest.class,
- org.apache.sis.metadata.iso.content.DefaultBandTest.class,
- org.apache.sis.metadata.iso.spatial.DefaultGeorectifiedTest.class,
- org.apache.sis.metadata.iso.identification.DefaultKeywordsTest.class,
-
org.apache.sis.metadata.iso.identification.DefaultRepresentativeFractionTest.class,
- org.apache.sis.metadata.iso.identification.DefaultResolutionTest.class,
- org.apache.sis.metadata.iso.identification.DefaultBrowseGraphicTest.class,
-
org.apache.sis.metadata.iso.identification.DefaultDataIdentificationTest.class,
- org.apache.sis.internal.jaxb.metadata.replace.ServiceParameterTest.class,
- org.apache.sis.internal.jaxb.metadata.replace.QualityParameterTest.class,
-
org.apache.sis.metadata.iso.identification.DefaultCoupledResourceTest.class,
-
org.apache.sis.metadata.iso.identification.DefaultServiceIdentificationTest.class,
- org.apache.sis.metadata.iso.quality.DefaultEvaluationMethodTest.class,
- org.apache.sis.metadata.iso.quality.AbstractElementTest.class,
- org.apache.sis.metadata.iso.quality.AbstractPositionalAccuracyTest.class,
- org.apache.sis.metadata.iso.quality.DefaultDomainConsistencyTest.class,
- org.apache.sis.metadata.iso.quality.DefaultQuantitativeResultTest.class,
- org.apache.sis.metadata.iso.quality.ScopeCodeTest.class,
- org.apache.sis.metadata.iso.lineage.DefaultLineageTest.class,
- org.apache.sis.metadata.iso.lineage.DefaultProcessStepTest.class,
- org.apache.sis.metadata.iso.constraint.DefaultLegalConstraintsTest.class,
- org.apache.sis.metadata.iso.DefaultIdentifierTest.class,
- org.apache.sis.metadata.iso.DefaultMetadataTest.class,
- org.apache.sis.metadata.iso.CustomMetadataTest.class,
- org.apache.sis.metadata.iso.AllMetadataTest.class,
- org.apache.sis.metadata.iso.MarshallingTest.class,
- org.apache.sis.metadata.iso.APIVerifier.class,
-
- org.apache.sis.internal.metadata.sql.SQLUtilitiesTest.class,
- org.apache.sis.internal.metadata.sql.TypeMapperTest.class,
- org.apache.sis.internal.metadata.sql.ScriptRunnerTest.class,
- org.apache.sis.metadata.sql.IdentifierGeneratorTest.class,
- org.apache.sis.metadata.sql.MetadataSourceTest.class,
- org.apache.sis.metadata.sql.MetadataWriterTest.class,
- org.apache.sis.metadata.iso.citation.CitationsTest.class,
- org.apache.sis.metadata.xml.SchemaComplianceTest.class
-})
-public final class MetadataTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(MetadataTestSuite.class);
- verifyTestList(MetadataTestSuite.class);
- }
-}
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/package-info.txt
b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
index 3a3136790a..4d414387f9 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.Assert.*;
* For tests using the name factory, see {@link DefaultNameFactoryTest}.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.4
* @since 0.3
*/
@DependsOn(DefaultLocalNameTest.class)
@@ -52,11 +52,11 @@ public final class DefaultScopedNameTest extends TestCase {
assertSame(name, name.toFullyQualifiedName());
assertEquals("urn:ogc:def:crs:epsg:4326", name.toString());
assertNotSame(name, assertSerializedEquals(name));
- validate(name); // GeoAPI tests.
+ validate(name); // GeoAPI tests.
for (int i=parsed.length; --i>=0;) {
name = name.tip();
validate(name);
- assertSame(parsed[i], name.toString());
+ assertEquals(parsed[i], name.toString());
name = name.scope().name();
}
}
diff --git
a/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java
b/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java
deleted file mode 100644
index 58c9254352..0000000000
---
a/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.BeforeClass;
-import org.junit.runners.Suite;
-
-
-/**
- * All tests from the {@code sis-portrayal} module, in rough dependency order.
- *
- * @author Johann Sorel (Geomatys)
- * @version 1.2
- * @since 1.2
- */
-@Suite.SuiteClasses({
- org.apache.sis.portrayal.MapLayersTest.class,
- org.apache.sis.internal.map.SEPortrayerTest.class,
-
org.apache.sis.internal.map.coverage.MultiResolutionCoverageLoaderTest.class
-})
-public final class PortrayalTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(PortrayalTestSuite.class);
- verifyTestList(PortrayalTestSuite.class);
- }
-}
diff --git
a/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/package-info.txt
b/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java
b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java
deleted file mode 100644
index 8285d1a46d..0000000000
---
a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-referencing-by-identifiers} module, in rough
dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.3
- * @since 0.8
- */
-@Suite.SuiteClasses({
- org.apache.sis.referencing.gazetteer.LocationFormatTest.class,
- org.apache.sis.referencing.gazetteer.LocationTypeTest.class,
- org.apache.sis.referencing.gazetteer.ReferencingByIdentifiersTest.class,
- org.apache.sis.referencing.gazetteer.GeohashReferenceSystemTest.class,
- org.apache.sis.referencing.gazetteer.MilitaryGridReferenceSystemTest.class,
- org.apache.sis.referencing.gazetteer.GazetteerFactoryTest.class
-})
-public final class ReferencingByIdentifiersTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(ReferencingByIdentifiersTestSuite.class);
- verifyTestList(ReferencingByIdentifiersTestSuite.class);
- }
-}
diff --git
a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/package-info.txt
b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
index c6bee8f91b..e3a454272a 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
@@ -34,9 +34,10 @@ import static org.apache.sis.referencing.IdentifiedObjects.*;
/**
* Tests the {@link IdentifiedObjects} static methods.
*
- * <p><b>Note:</b> this test class intentionally declares {@link
#testLookupEPSG()} and {@link #testLookupWMS()}
- * methods without {@link Test} annotation because those tests should be
executed only after the EPSG tests in
- * {@link org.apache.sis.test.suite.ReferencingTestSuite}. Those tests will be
executed by {@link CRSTest} instead.</p>
+ * <h2>Test order</h2>
+ * This test class intentionally declares {@link #testLookupEPSG()} and {@link
#testLookupWMS()} methods
+ * without {@link Test} annotation because those tests should be executed only
after the EPSG tests.
+ * Those tests will be executed by {@link CRSTest} instead.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.7
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
index 0c509f11ce..57d200330a 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
@@ -30,11 +30,12 @@ import static org.opengis.test.Assert.*;
* Tests the {@link NonSquareMatrix} implementation.
* This class inherits all tests defined in {@link MatrixTestCase}.
*
- * <p>This class is expected to be the last {@code MatrixTestCase} subclass to
be executed,
- * because it sends the {@link #statistics} to {@link #out}. This condition is
ensured if
- * the tests are executed by {@link
org.apache.sis.test.suite.ReferencingTestSuite}.
- * However, it is not a big deal if this condition is broken, as the only
consequence
- * is that reported statistics will be incomplete.</p>
+ * <h2>Test order</h2>
+ * This class is expected to be the last {@code MatrixTestCase} subclass to be
executed,
+ * because it sends the {@link #statistics} to {@link #out}. However, it is
okay if this
+ * condition is broken, as the only consequence is that reported statistics
will be incomplete.
+ *
+ * @todo Use JUnit 5 ordering mechanism for running other matrix tests first.
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.4
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
deleted file mode 100644
index 9102570e02..0000000000
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-referencing} module, in rough dependency
order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.4
- * @since 0.3
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.referencing.LazySetTest.class,
- org.apache.sis.internal.referencing.FormulasTest.class,
- org.apache.sis.internal.referencing.j2d.AbstractShapeTest.class,
- org.apache.sis.internal.referencing.j2d.ShapeUtilitiesTest.class,
- org.apache.sis.internal.referencing.AxesMapperTest.class,
- org.apache.sis.internal.referencing.AxisDirectionsTest.class,
- org.apache.sis.internal.referencing.VerticalDatumTypesTest.class,
- org.apache.sis.internal.referencing.PositionalAccuracyConstantTest.class,
- org.apache.sis.internal.referencing.ReferencingUtilitiesTest.class,
- org.apache.sis.internal.referencing.WraparoundApplicatorTest.class,
- org.apache.sis.internal.referencing.ExtentSelectorTest.class,
- org.apache.sis.internal.referencing.WKTKeywordsTest.class,
- org.apache.sis.internal.referencing.WKTUtilitiesTest.class,
- org.apache.sis.internal.referencing.GeodeticObjectBuilderTest.class,
- org.apache.sis.internal.jaxb.referencing.CodeTest.class,
- org.apache.sis.internal.jaxb.referencing.SecondDefiningParameterTest.class,
-
- // Well Known Text (WKT) base.
- org.apache.sis.io.wkt.ConventionTest.class,
- org.apache.sis.io.wkt.SymbolsTest.class,
- org.apache.sis.io.wkt.TransliteratorTest.class,
- org.apache.sis.io.wkt.ColorsTest.class,
- org.apache.sis.io.wkt.FormatterTest.class,
- org.apache.sis.io.wkt.ElementTest.class,
-
- // Identification of objects, needed by large parts of sis-referencing.
- org.apache.sis.referencing.ImmutableIdentifierTest.class,
- org.apache.sis.referencing.NamedIdentifierTest.class,
- org.apache.sis.referencing.IdentifiedObjectsTest.class,
- org.apache.sis.referencing.AbstractIdentifiedObjectTest.class,
- org.apache.sis.referencing.AbstractReferenceSystemTest.class,
- org.apache.sis.referencing.BuilderTest.class,
-
- // Test matrices early because they may be used in about every SIS corners.
- org.apache.sis.referencing.operation.matrix.GeneralMatrixTest.class,
- org.apache.sis.referencing.operation.matrix.SolverTest.class,
- org.apache.sis.referencing.operation.matrix.Matrix1Test.class,
- org.apache.sis.referencing.operation.matrix.Matrix2Test.class,
- org.apache.sis.referencing.operation.matrix.Matrix3Test.class,
- org.apache.sis.referencing.operation.matrix.Matrix4Test.class,
- org.apache.sis.referencing.operation.matrix.NonSquareMatrixTest.class,
// Expected to be last MatrixTestCase - see javadoc.
- org.apache.sis.referencing.operation.matrix.MatricesTest.class,
- org.apache.sis.referencing.operation.matrix.AffineTransforms2DTest.class,
-
- // Parameter are needed for math transforms and map projections.
- org.apache.sis.parameter.DefaultParameterDescriptorTest.class,
- org.apache.sis.parameter.DefaultParameterDescriptorGroupTest.class,
- org.apache.sis.parameter.DefaultParameterValueTest.class,
- org.apache.sis.parameter.DefaultParameterValueGroupTest.class,
- org.apache.sis.parameter.UnmodifiableParameterValueTest.class,
- org.apache.sis.parameter.UnmodifiableParameterValueGroupTest.class,
- org.apache.sis.parameter.ParametersTest.class,
- org.apache.sis.parameter.ParameterBuilderTest.class,
- org.apache.sis.parameter.ParameterFormatTest.class,
- org.apache.sis.parameter.TensorParametersTest.class,
- org.apache.sis.parameter.MatrixParametersTest.class,
- org.apache.sis.parameter.MatrixParametersAlphaNumTest.class,
- org.apache.sis.parameter.TensorValuesTest.class,
- org.apache.sis.parameter.MapProjectionParametersTest.class,
- org.apache.sis.parameter.ParameterMarshallingTest.class,
-
org.apache.sis.internal.jaxb.referencing.CC_GeneralOperationParameterTest.class,
-
org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroupTest.class,
-
- // Coordinate Reference System components (except derived CRS).
- org.apache.sis.referencing.datum.BursaWolfParametersTest.class,
- org.apache.sis.referencing.datum.TimeDependentBWPTest.class,
- org.apache.sis.referencing.datum.DefaultEllipsoidTest.class,
- org.apache.sis.referencing.datum.DefaultPrimeMeridianTest.class,
- org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class,
- org.apache.sis.referencing.datum.DefaultTemporalDatumTest.class,
- org.apache.sis.referencing.datum.DefaultGeodeticDatumTest.class,
- org.apache.sis.referencing.cs.DirectionAlongMeridianTest.class,
- org.apache.sis.referencing.cs.DefaultCoordinateSystemAxisTest.class,
- org.apache.sis.referencing.cs.NormalizerTest.class,
- org.apache.sis.referencing.cs.AbstractCSTest.class,
- org.apache.sis.referencing.cs.DefaultCartesianCSTest.class,
- org.apache.sis.referencing.cs.DefaultEllipsoidalCSTest.class,
- org.apache.sis.referencing.cs.DefaultSphericalCSTest.class,
- org.apache.sis.referencing.cs.DefaultPolarCSTest.class,
- org.apache.sis.referencing.cs.DefaultCylindricalCSTest.class,
- org.apache.sis.referencing.cs.DefaultCompoundCSTest.class,
- org.apache.sis.referencing.cs.CoordinateSystemsTest.class,
- org.apache.sis.referencing.cs.HardCodedCSTest.class,
- org.apache.sis.referencing.crs.AbstractCRSTest.class,
- org.apache.sis.referencing.crs.DefaultVerticalCRSTest.class,
- org.apache.sis.referencing.crs.DefaultGeodeticCRSTest.class,
- org.apache.sis.referencing.crs.DefaultGeocentricCRSTest.class,
- org.apache.sis.referencing.crs.DefaultGeographicCRSTest.class,
- org.apache.sis.referencing.crs.DefaultTemporalCRSTest.class,
- org.apache.sis.referencing.crs.DefaultEngineeringCRSTest.class,
- org.apache.sis.referencing.crs.DefaultImageCRSTest.class,
-
- // Test transforms other than map projections.
- org.apache.sis.referencing.operation.transform.CoordinateDomainTest.class,
- org.apache.sis.referencing.operation.transform.IterationStrategyTest.class,
-
org.apache.sis.referencing.operation.transform.AbstractMathTransformTest.class,
-
org.apache.sis.referencing.operation.transform.TranslationTransformTest.class,
- org.apache.sis.referencing.operation.transform.ScaleTransformTest.class,
-
org.apache.sis.referencing.operation.transform.ProjectiveTransformTest.class,
- org.apache.sis.referencing.operation.transform.LinearTransformTest.class,
-
org.apache.sis.referencing.operation.transform.LinearInterpolator1DTest.class,
-
org.apache.sis.referencing.operation.transform.ExponentialTransform1DTest.class,
-
org.apache.sis.referencing.operation.transform.LogarithmicTransform1DTest.class,
- org.apache.sis.referencing.operation.transform.CopyTransformTest.class,
- org.apache.sis.referencing.operation.transform.UnitConversionTest.class,
-
org.apache.sis.referencing.operation.transform.PassThroughTransformTest.class,
-
org.apache.sis.referencing.operation.transform.ConcatenatedTransformTest.class,
-
org.apache.sis.referencing.operation.transform.TransformSeparatorTest.class,
- org.apache.sis.referencing.operation.transform.TransferFunctionTest.class,
- org.apache.sis.referencing.operation.transform.MathTransformsTest.class,
-
org.apache.sis.referencing.operation.transform.ContextualParametersTest.class,
-
org.apache.sis.referencing.operation.transform.EllipsoidToCentricTransformTest.class,
-
org.apache.sis.referencing.operation.transform.MolodenskyTransformTest.class,
-
org.apache.sis.referencing.operation.transform.AbridgedMolodenskyTransformTest.class,
- org.apache.sis.referencing.operation.transform.PoleRotationTest.class,
-
org.apache.sis.referencing.operation.transform.SphericalToCartesianTest.class,
-
org.apache.sis.referencing.operation.transform.CartesianToSphericalTest.class,
- org.apache.sis.referencing.operation.transform.PolarToCartesianTest.class,
- org.apache.sis.referencing.operation.transform.CartesianToPolarTest.class,
-
org.apache.sis.referencing.operation.transform.CoordinateSystemTransformTest.class,
-
org.apache.sis.referencing.operation.transform.SpecializableTransformTest.class,
- org.apache.sis.referencing.operation.transform.DomainDefinitionTest.class,
- org.apache.sis.referencing.operation.DefaultFormulaTest.class,
- org.apache.sis.referencing.operation.DefaultOperationMethodTest.class,
-
org.apache.sis.referencing.operation.transform.OperationMethodSetTest.class,
-
org.apache.sis.referencing.operation.transform.WraparoundTransformTest.class,
-
- // Registration of map projections and other math transforms.
- org.apache.sis.internal.referencing.provider.AffineTest.class,
- org.apache.sis.internal.referencing.provider.GeographicOffsetsTest.class,
- org.apache.sis.internal.referencing.provider.Geographic3Dto2DTest.class,
- org.apache.sis.internal.referencing.provider.LongitudeRotationTest.class,
-
org.apache.sis.internal.referencing.provider.GeocentricTranslationTest.class,
-
org.apache.sis.internal.referencing.provider.PositionVector7ParamTest.class,
-
org.apache.sis.internal.referencing.provider.CoordinateFrameRotationTest.class,
- org.apache.sis.internal.referencing.provider.MolodenskyTest.class,
- org.apache.sis.internal.referencing.provider.DatumShiftGridFileTest.class,
-
org.apache.sis.internal.referencing.provider.DatumShiftGridCompressedTest.class,
-
org.apache.sis.internal.referencing.provider.FranceGeocentricInterpolationTest.class,
- org.apache.sis.internal.referencing.provider.NTv2Test.class,
- org.apache.sis.internal.referencing.provider.NADCONTest.class,
- org.apache.sis.internal.referencing.provider.MapProjectionTest.class,
- org.apache.sis.internal.referencing.provider.TransverseMercatorTest.class,
- org.apache.sis.internal.referencing.provider.ProvidersTest.class,
-
org.apache.sis.referencing.operation.transform.InterpolatedTransformTest.class,
-
org.apache.sis.referencing.operation.transform.InterpolatedGeocentricTransformTest.class,
-
org.apache.sis.referencing.operation.transform.InterpolatedMolodenskyTransformTest.class,
-
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactoryTest.class,
-
- // Test map projections. Those tests need the providers tested above.
- org.apache.sis.referencing.operation.projection.InitializerTest.class,
-
org.apache.sis.referencing.operation.projection.NormalizedProjectionTest.class,
- org.apache.sis.referencing.operation.projection.EquirectangularTest.class,
-
org.apache.sis.referencing.operation.projection.ConformalProjectionTest.class,
- org.apache.sis.referencing.operation.projection.MercatorTest.class,
-
org.apache.sis.referencing.operation.projection.LambertConicConformalTest.class,
-
org.apache.sis.referencing.operation.projection.TransverseMercatorTest.class,
- org.apache.sis.referencing.operation.projection.ZonedGridSystemTest.class,
- org.apache.sis.referencing.operation.projection.CassiniSoldnerTest.class,
-
org.apache.sis.referencing.operation.projection.PolarStereographicTest.class,
-
org.apache.sis.referencing.operation.projection.ObliqueStereographicTest.class,
- org.apache.sis.referencing.operation.projection.ObliqueMercatorTest.class,
-
org.apache.sis.referencing.operation.projection.AuthalicConversionTest.class,
-
org.apache.sis.referencing.operation.projection.CylindricalEqualAreaTest.class,
- org.apache.sis.referencing.operation.projection.AlbersEqualAreaTest.class,
-
org.apache.sis.referencing.operation.projection.LambertAzimuthalEqualAreaTest.class,
- org.apache.sis.referencing.operation.projection.MeridianArcTest.class,
- org.apache.sis.referencing.operation.projection.SinusoidalTest.class,
- org.apache.sis.referencing.operation.projection.PolyconicTest.class,
- org.apache.sis.referencing.operation.projection.MollweideTest.class,
- org.apache.sis.referencing.operation.projection.OrthographicTest.class,
-
org.apache.sis.referencing.operation.projection.AzimuthalEquidistantTest.class,
-
org.apache.sis.referencing.operation.projection.ModifiedAzimuthalEquidistantTest.class,
-
org.apache.sis.referencing.operation.projection.SatelliteTrackingTest.class,
-
- // Coordinate operation and derived Coordinate Reference Systems (cyclic
dependency).
- org.apache.sis.referencing.operation.DefaultTransformationTest.class,
- org.apache.sis.referencing.operation.DefaultConversionTest.class,
- org.apache.sis.referencing.operation.SingleOperationMarshallingTest.class,
- org.apache.sis.referencing.operation.DefaultPassThroughOperationTest.class,
-
org.apache.sis.referencing.operation.DefaultConcatenatedOperationTest.class,
- org.apache.sis.referencing.crs.DefaultProjectedCRSTest.class,
- org.apache.sis.referencing.crs.DefaultDerivedCRSTest.class,
- org.apache.sis.referencing.crs.SubTypesTest.class,
- org.apache.sis.referencing.crs.DefaultCompoundCRSTest.class,
- org.apache.sis.referencing.crs.HardCodedCRSTest.class,
-
- // Direct (not from authority codes) geodetic object creations.
- org.apache.sis.referencing.StandardDefinitionsTest.class,
- org.apache.sis.referencing.factory.GeodeticObjectFactoryTest.class,
-
- // Well Known Text parsing require above factory.
- org.apache.sis.io.wkt.MathTransformParserTest.class,
- org.apache.sis.io.wkt.GeodeticObjectParserTest.class,
- org.apache.sis.io.wkt.WKTFormatTest.class,
- org.apache.sis.io.wkt.WKTParserTest.class,
- org.apache.sis.io.wkt.WKTDictionaryTest.class,
- org.apache.sis.io.wkt.ComparisonWithEPSG.class,
-
- // Following tests may use indirectly EPSG factory.
- org.apache.sis.referencing.CommonCRSTest.class,
- org.apache.sis.referencing.factory.CommonAuthorityFactoryTest.class,
- org.apache.sis.referencing.factory.AuthorityFactoryProxyTest.class,
- org.apache.sis.referencing.factory.ConcurrentAuthorityFactoryTest.class,
- org.apache.sis.referencing.factory.IdentifiedObjectFinderTest.class,
- org.apache.sis.referencing.factory.MultiAuthoritiesFactoryTest.class,
- org.apache.sis.referencing.factory.sql.TableInfoTest.class,
- org.apache.sis.referencing.factory.sql.EPSGFactoryTest.class,
- org.apache.sis.referencing.factory.sql.EPSGInstallerTest.class,
- org.apache.sis.referencing.factory.sql.epsg.DataScriptFormatterTest.class,
- org.apache.sis.referencing.EPSGFactoryFallbackTest.class,
- org.apache.sis.referencing.AuthorityFactoriesTest.class,
- org.apache.sis.referencing.cs.CodesTest.class,
- org.apache.sis.referencing.CRSTest.class,
- org.apache.sis.referencing.GeodeticCalculatorTest.class,
- org.apache.sis.referencing.GeodesicsOnEllipsoidTest.class,
- org.apache.sis.internal.referencing.DefinitionVerifierTest.class,
- org.apache.sis.internal.referencing.CoordinateOperationsTest.class,
-
- // Coordinate operation finders are last, since they need everything else.
- org.apache.sis.referencing.operation.CoordinateOperationRegistryTest.class,
- org.apache.sis.referencing.operation.CoordinateOperationFinderTest.class,
-
org.apache.sis.referencing.operation.DefaultCoordinateOperationFactoryTest.class,
- org.apache.sis.referencing.operation.builder.ResidualGridTest.class,
-
org.apache.sis.referencing.operation.builder.LinearTransformBuilderTest.class,
-
org.apache.sis.referencing.operation.builder.LocalizationGridBuilderTest.class,
- org.apache.sis.referencing.operation.builder.LinearizerTest.class,
-
- // GeoAPI conformance test suite.
- org.apache.sis.referencing.geoapi.AuthorityFactoryTest.class,
- org.apache.sis.referencing.geoapi.ParameterizedTransformTest.class,
-
- // Geometry and miscellaneous
- org.apache.sis.geometry.AbstractDirectPositionTest.class,
- org.apache.sis.geometry.GeneralDirectPositionTest.class,
- org.apache.sis.geometry.DirectPosition1DTest.class,
- org.apache.sis.geometry.DirectPosition2DTest.class,
- org.apache.sis.geometry.AbstractEnvelopeTest.class,
- org.apache.sis.geometry.ArrayEnvelopeTest.class,
- org.apache.sis.geometry.GeneralEnvelopeTest.class,
- org.apache.sis.geometry.SubEnvelopeTest.class,
- org.apache.sis.geometry.ImmutableEnvelopeTest.class,
- org.apache.sis.geometry.Envelope2DTest.class,
- org.apache.sis.geometry.CurveExtremumTest.class,
- org.apache.sis.geometry.Shapes2DTest.class, // Simpler
than EnvelopesTest.
- org.apache.sis.geometry.EnvelopesTest.class,
- org.apache.sis.geometry.EnvelopeReducerTest.class,
- org.apache.sis.internal.referencing.ServicesForMetadataTest.class,
- org.apache.sis.internal.referencing.EllipsoidalHeightCombinerTest.class,
- org.apache.sis.geometry.CoordinateFormatTest.class,
- org.apache.sis.geometry.WraparoundAdjustmentTest.class,
- org.apache.sis.test.integration.CoordinateReferenceSystemTest.class,
- org.apache.sis.test.integration.CoordinateOperationTest.class,
- org.apache.sis.test.integration.DatumShiftTest.class,
- org.apache.sis.test.integration.MetadataVerticalTest.class,
- org.apache.sis.test.integration.MetadataTest.class,
- org.apache.sis.test.integration.ConsistencyTest.class
-})
-public final class ReferencingTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(ReferencingTestSuite.class);
- verifyTestList(ReferencingTestSuite.class);
- }
-}
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/package-info.txt
b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java
b/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java
index 43c58439f9..aa70b149b5 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java
@@ -25,17 +25,26 @@ import java.lang.annotation.Target;
/**
- * Declares that a test class depends on another test class. If any test
method in any
- * dependency failed, then all tests in the annotated class will be skipped.
+ * Declares that a test class depends on another test class.
+ * This annotation was used by a customized test runner but is no longer used
in SIS 1.4.
+ * See <a href="https://issues.apache.org/jira/browse/SIS-580";>SIS-580</a>.
+ *
+ * @todo Replace by JUnit 5 annotations for class ordering. We could use the
ordering based on an integer values,
+ * with constants defined in {@code TestCase} for some broad categories
of tests to run in priority.
+ * Note that the following classes need particular attention:
+ * <ul>
+ * <li>{@link
org.apache.sis.referencing.operation.matrix.NonSquareMatrixTest}</li>
+ * <li>{@link org.apache.sis.referencing.IdentifiedObjectsTest}</li>
+ * </ul>
*
* @author Martin Desruisseaux
- * @version 0.3
+ * @version 1.4
* @since 0.3
*/
@Inherited
@Documented
@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
public @interface DependsOn {
/**
* The other test classes on which this test depends.
diff --git
a/core/sis-utility/src/test/java/org/apache/sis/test/LogRecordCollector.java
b/core/sis-utility/src/test/java/org/apache/sis/test/LogRecordCollector.java
index acf1beea02..2860a08f05 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/LogRecordCollector.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/LogRecordCollector.java
@@ -33,10 +33,15 @@ import org.junit.runner.Description;
* Those emitters will be reported after the test suite completion.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.6
+ * @version 1.4
* @since 0.6
*/
final class LogRecordCollector extends Handler {
+ /**
+ * Expected suffix in name of test classes.
+ */
+ private static final String CLASSNAME_SUFFIX = "Test";
+
/**
* The unique instance.
*/
@@ -76,8 +81,8 @@ final class LogRecordCollector extends Handler {
}
/**
- * Invoked when an Apache SIS method emitted a warning. This method stores
information about records
- * having {@link Level#INFO} or higher.
+ * Invoked when an Apache SIS method emitted a warning.
+ * This method stores information about records having {@link Level#INFO}
or higher.
*/
@Override
public void publish(final LogRecord record) {
@@ -96,7 +101,7 @@ final class LogRecordCollector extends Handler {
method = "<unknown>";
for (final StackTraceElement t :
Thread.currentThread().getStackTrace()) {
final String c = t.getClassName();
- if (c.startsWith(Modules.CLASSNAME_PREFIX) &&
c.endsWith(TestSuite.CLASSNAME_SUFFIX)) {
+ if (c.startsWith(Modules.CLASSNAME_PREFIX) &&
c.endsWith(CLASSNAME_SUFFIX)) {
cname = c;
method = t.getMethodName();
break;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
b/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
index cb9ac87e98..ad83d13e13 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
@@ -49,7 +49,7 @@ import org.junit.runner.RunWith;
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 1.4
* @since 0.3
*/
@RunWith(TestRunner.class)
@@ -140,6 +140,16 @@ public abstract class TestCase {
*/
static final Logger LOGGER = Logger.getLogger(Loggers.ROOT);
+ /**
+ * Installs Apache SIS monoline formatter for easier identification of
Apache SIS log messages among Maven outputs.
+ */
+ static {
+ MonolineFormatter f = MonolineFormatter.install();
+ f.setHeader(null);
+ f.setTimeFormat(null);
+ f.setSourceFormat("class.method");
+ }
+
/**
* Initializes {@link MonolineFormatter} if it has been specified in the
{@code logging.properties}
* configuration file.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
b/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
index eec20cc545..202029d252 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
@@ -55,7 +55,7 @@ import static
org.apache.sis.util.collection.Containers.hashMapCapacity;
*
* @author Stephen Connolly
* @author Martin Desruisseaux (Geomatys)
- * @version 0.5
+ * @version 1.4
* @since 0.3 (derived from <a
href="http://github.com/junit-team/junit.contrib/tree/master/assumes";>junit-team</a>)
*/
public final class TestRunner extends BlockJUnit4ClassRunner {
@@ -75,27 +75,12 @@ public final class TestRunner extends
BlockJUnit4ClassRunner {
* Values are method names.
*
* <p>There is no need to prefix the method names by classnames because a
new instance of {@code TestRunner}
- * will be created for each test class, even if the the test classes are
aggregated in a {@link TestSuite}.</p>
+ * will be created for each test class, even if the the test classes are
aggregated in a test suite.</p>
*
* @see #addDependencyFailure(String)
*/
private Set<String> methodDependencyFailures;
- /**
- * The dependency classes that failed. This set will be created only when
first needed.
- *
- * @see #addDependencyFailure(String)
- */
- private static Set<Class<?>> classDependencyFailures;
-
- /**
- * {@code true} if every tests shall be skipped. This happen if at least
one test failure
- * occurred in at least one class listed in the {@link DependsOn}
annotation.
- *
- * @see #checkClassDependencies()
- */
- private boolean skipAll;
-
/**
* The listener to use for keeping trace of methods that failed.
*/
@@ -330,7 +315,6 @@ public final class TestRunner extends
BlockJUnit4ClassRunner {
return new Statement() {
@Override
public void evaluate() throws Throwable {
- checkClassDependencies();
notifier.addListener(listener);
try {
stmt.evaluate();
@@ -350,10 +334,6 @@ public final class TestRunner extends
BlockJUnit4ClassRunner {
*/
@Override
protected void runChild(final FrameworkMethod method, final RunNotifier
notifier) {
- if (skipAll) {
- notifier.fireTestIgnored(describeChild(method));
- return;
- }
if (methodDependencyFailures != null) {
final DependsOnMethod assumptions =
method.getAnnotation(DependsOnMethod.class);
if (assumptions != null) {
@@ -380,33 +360,5 @@ public final class TestRunner extends
BlockJUnit4ClassRunner {
methodDependencyFailures = new HashSet<>();
}
methodDependencyFailures.add(methodName);
- synchronized (TestRunner.class) {
- if (classDependencyFailures == null) {
- classDependencyFailures = new HashSet<>();
- }
- classDependencyFailures.add(getTestClass().getJavaClass());
- }
- }
-
- /**
- * If at least one test failure occurred in at least one class listed in
the {@link DependsOn}
- * annotation, set the {@link #skipAll} field to {@code true}. This method
shall be invoked
- * before the tests are run.
- */
- final void checkClassDependencies() {
- final Class<?> testClass = getTestClass().getJavaClass();
- final DependsOn dependsOn = testClass.getAnnotation(DependsOn.class);
- if (dependsOn != null) {
- synchronized (TestRunner.class) {
- if (classDependencyFailures != null) {
- for (final Class<?> dependency : dependsOn.value()) {
- if (classDependencyFailures.contains(dependency)) {
- classDependencyFailures.add(testClass);
- skipAll = true;
- }
- }
- }
- }
- }
}
}
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
deleted file mode 100644
index 2800efb371..0000000000
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import org.apache.sis.internal.system.Shutdown;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.util.logging.MonolineFormatter;
-import org.apache.sis.util.Classes;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import static org.junit.Assert.*;
-
-
-/**
- * Base class of Apache SIS test suites (except the ones that extend GeoAPI
suites).
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since 0.3
- */
-@RunWith(Suite.class)
-public abstract class TestSuite {
- /**
- * The default set of base classes that all test cases are expected to
extends.
- * This is the default argument value for {@link #verifyTestList(Class)}
method.
- */
- private static final Class<?>[] BASE_TEST_CLASSES = {
- TestCase.class,
- org.opengis.test.TestCase.class
- };
-
- /**
- * Expected suffix in name of test classes.
- */
- static final String CLASSNAME_SUFFIX = "Test";
-
- /**
- * {@code true} for disabling the search for missing tests. This is
necessary
- * when the test suites are executed from an external project, for example
during a
- * <a
href="https://svn.apache.org/repos/asf/sis/release-test/maven";>release test</a>.
- */
- static boolean skipCheckForMissingTests;
-
- /**
- * {@code true} for disabling {@link #shutdown()}. This is necessary when
the test suites
- * are executed from an external project (same need than {@link
#skipCheckForMissingTests}).
- */
- static boolean skipShutdown;
-
- /**
- * Creates a new test suite.
- */
- protected TestSuite() {
- }
-
- /**
- * Verifies that we did not forgot to declare some test classes in the
given suite.
- * This method scans the directory for {@code *Test.class} files.
- *
- * <p>This check is disabled if {@link #skipCheckForMissingTests} is
{@code true}.</p>
- *
- * @param suite the suite for which to check for missing tests.
- */
- protected static void assertNoMissingTest(final Class<? extends TestSuite>
suite) {
- if (skipCheckForMissingTests) return;
- /*
- * Verifies if we are in the Maven target directory. In some IDE
configuration, all the ".class" files
- * are in the same directory, in which case the verification performed
by this method become irrelevant.
- */
- final ProjectDirectories dir = new ProjectDirectories(suite);
- if (!dir.isMavenModule()) {
- return;
- }
- /*
- * Now scan all "*Test.class" in the "target/org" directory and and
sub-directories,
- * and fail on the first missing test file if any.
- */
- List<Class<?>> declared =
Arrays.asList(suite.getAnnotation(Suite.SuiteClasses.class).value());
- final Set<Class<?>> tests = new HashSet<>(declared);
- if (tests.size() != declared.size()) {
- declared = new ArrayList<>(declared);
- assertTrue(declared.removeAll(tests));
- fail("Classes defined twice in " + suite.getSimpleName() + ": " +
declared);
- }
- /*
- * Ignore classes that are not really test, like "APIVerifier".
- */
- for (final Iterator<Class<?>> it=tests.iterator(); it.hasNext();) {
- if (!it.next().getName().endsWith(CLASSNAME_SUFFIX)) {
- it.remove();
- }
- }
- final ClassLoader loader = suite.getClassLoader();
- final File root = dir.classesRootDirectory.resolve("org").toFile();
- removeExistingTests(loader, root, new
StringBuilder(120).append(root.getName()), tests);
- if (!tests.isEmpty()) {
- fail("Classes not found. Are they defined in another module? " +
tests);
- }
- }
-
- /**
- * Ensures that all tests in the given directory and sub-directories exit
in the given set.
- * This method invokes itself recursively for scanning the sub-directories.
- */
- private static void removeExistingTests(final ClassLoader loader, final
File directory,
- final StringBuilder path, final Set<Class<?>> tests)
- {
- final int length = path.append('.').length();
- for (final File file : directory.listFiles()) {
- if (!file.isHidden()) {
- final String name = file.getName();
- if (!name.startsWith(".")) {
- path.append(name);
- if (file.isDirectory()) {
- removeExistingTests(loader, file, path, tests);
- } else {
- if (name.endsWith(CLASSNAME_SUFFIX + ".class")) {
- path.setLength(path.length() - 6); // Remove
trailing ".class"
- final String classname = path.toString();
- final Class<?> test;
- try {
- test = Class.forName(classname, false, loader);
- } catch (ClassNotFoundException e) {
- fail(e.toString());
- return;
- }
- if (!tests.remove(test)) {
- fail("Class " + classname + " is not specified
in the test suite.");
- }
- }
- }
- path.setLength(length);
- }
- }
- }
- }
-
- /**
- * Verifies the list of tests before the suite is run.
- * This method verifies the following conditions:
- *
- * <ul>
- * <li>Every class shall extend either the SIS {@link TestCase} or the
GeoAPI {@link org.opengis.test.TestCase}.</li>
- * <li>No class shall be declared twice.</li>
- * <li>If a test depends on another test, then the other test shall be
before the dependant test.</li>
- * </ul>
- *
- * Subclasses shall invoke this method as below:
- *
- * {@snippet lang="java" :
- * @BeforeClass
- * public static void verifyTestList() {
- * assertNoMissingTest(MyTestSuite.class);
- * verifyTestList(MyTestSuite.class);
- * }
- * }
- *
- * @param suite the suite for which to verify test order.
- */
- protected static void verifyTestList(final Class<? extends TestSuite>
suite) {
- verifyTestList(suite, BASE_TEST_CLASSES);
- }
-
- /**
- * Same verification than {@link #verifyTestList(Class)}, except that the
set of base classes
- * is explicitly specified. This method is preferred to {@code
verifyTestList(Class)} only in
- * the rare cases where some test cases need to extend something else than
geoapi-conformance
- * or Apache SIS test class.
- *
- * @param suite the suite for which to verify test order.
- * @param baseTestClasses the set of base classes that all test cases
are expected to extends.
- */
- protected static void verifyTestList(final Class<? extends TestSuite>
suite, final Class<?>[] baseTestClasses) {
- final Class<?>[] testCases =
suite.getAnnotation(Suite.SuiteClasses.class).value();
- final Set<Class<?>> done = new HashSet<>(testCases.length);
- for (final Class<?> testCase : testCases) {
- if (!Classes.isAssignableToAny(testCase, baseTestClasses)) {
- fail("Class " + testCase.getCanonicalName() + " does not
extends TestCase.");
- }
- final DependsOn dependencies =
testCase.getAnnotation(DependsOn.class);
- if (dependencies != null) {
- for (final Class<?> dependency : dependencies.value()) {
- if (!done.contains(dependency)) {
- fail("Class " + testCase.getCanonicalName() + "
depends on " + dependency.getCanonicalName()
- + ", but the dependency has not been found
before the test.");
- }
- }
- }
- if (!done.add(testCase)) {
- fail("Class " + testCase.getCanonicalName() + " is declared
twice.");
- }
- }
- }
-
- /**
- * Installs Apache SIS monoline formatter for easier identification of
Apache SIS log messages among Maven outputs.
- * We perform this installation only for {@code *TestSuite}, not for
individual {@code *Test}. Consequently, this is
- * typically enabled when building a whole module with Maven but not when
debugging an individual class.
- *
- * @since 1.0
- */
- @BeforeClass
- public static void configureLogging() {
- MonolineFormatter f = MonolineFormatter.install();
- f.setHeader(null);
- f.setTimeFormat(null);
- f.setSourceFormat("class.method");
- }
-
- /**
- * Simulates a module uninstall after all tests. This method will first
notify any classpath-dependant
- * services that the should clear their cache, then stop the SIS daemon
threads. Those operations are
- * actually not needed in non-server environment (it is okay to just let
the JVM stop by itself), but
- * the intent here is to ensure that no exception is thrown.
- *
- * <p>Since this method stops SIS daemon threads, the SIS library shall
not be used anymore after
- * this method execution.</p>
- *
- * @throws Exception if an error occurred during unregistration of the
supervisor MBean or resource disposal.
- */
- @AfterClass
- @SuppressWarnings("UseOfSystemOutOrSystemErr")
- public static void shutdown() throws Exception {
- if (!skipShutdown) {
- skipShutdown = true;
- TestCase.LOGGER.removeHandler(LogRecordCollector.INSTANCE);
- System.err.flush(); //
Flushs log messages sent by ConsoleHandler.
- try {
- LogRecordCollector.INSTANCE.report(System.out);
- } catch (IOException e) { //
Should never happen.
- throw new UncheckedIOException(e);
- }
- SystemListener.fireClasspathChanged();
- Shutdown.stop(TestSuite.class);
- }
- }
-}
diff --git
a/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
b/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
deleted file mode 100644
index 84a79d26cd..0000000000
---
a/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-utility} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.4
- * @since 0.3
- */
-@Suite.SuiteClasses({
- // Following are testing the test tools.
- org.apache.sis.internal.test.AssertTest.class,
- org.apache.sis.internal.test.TestUtilitiesTest.class,
-
- // Most basic functions of SIS library.
- org.apache.sis.internal.system.LoggersTest.class,
- org.apache.sis.internal.util.NumericsTest.class,
- org.apache.sis.setup.OptionKeyTest.class,
- org.apache.sis.util.ArraysExtTest.class,
- org.apache.sis.util.CharactersTest.class,
- org.apache.sis.util.CharSequencesTest.class,
- org.apache.sis.util.StringBuildersTest.class,
- org.apache.sis.util.ExceptionsTest.class,
- org.apache.sis.util.UtilitiesTest.class,
- org.apache.sis.util.NumbersTest.class,
- org.apache.sis.util.ClassesTest.class,
- org.apache.sis.util.VersionTest.class,
- org.apache.sis.util.LocalesTest.class,
- org.apache.sis.util.resources.LoaderTest.class,
- org.apache.sis.util.resources.IndexedResourceBundleTest.class,
- org.apache.sis.util.ArgumentChecksTest.class, //
Uses resources.
- org.apache.sis.util.logging.PerformanceLevelTest.class,
- org.apache.sis.util.logging.MonolineFormatterTest.class,
- org.apache.sis.math.FractionTest.class,
- org.apache.sis.math.VectorTest.class,
- org.apache.sis.math.RepeatedVectorTest.class,
- org.apache.sis.math.LinearlyDerivedVectorTest.class,
- org.apache.sis.math.MathFunctionsTest.class,
- org.apache.sis.math.DecimalFunctionsTest.class,
- org.apache.sis.math.StatisticsTest.class,
- org.apache.sis.math.StatisticsFormatTest.class,
- org.apache.sis.internal.util.StringsTest.class,
- org.apache.sis.internal.util.DoubleDoubleTest.class,
- org.apache.sis.math.FunctionPropertyTest.class,
- org.apache.sis.math.LineTest.class,
- org.apache.sis.math.PlaneTest.class,
-
- // Collections.
- org.apache.sis.internal.util.BagTest.class,
- org.apache.sis.internal.util.CheckedArrayListTest.class,
- org.apache.sis.internal.util.ListOfUnknownSizeTest.class,
- org.apache.sis.internal.system.ReferenceQueueConsumerTest.class,
- org.apache.sis.util.collection.FrequencySortedSetTest.class,
- org.apache.sis.util.collection.IntegerListTest.class,
- org.apache.sis.util.collection.WeakHashSetTest.class,
- org.apache.sis.util.collection.WeakValueHashMapTest.class,
- org.apache.sis.util.collection.CacheTest.class,
- org.apache.sis.util.collection.DerivedSetTest.class,
- org.apache.sis.util.collection.DerivedMapTest.class,
- org.apache.sis.util.collection.TableColumnTest.class,
- org.apache.sis.util.collection.DefaultTreeTableTest.class,
- org.apache.sis.util.collection.TreeTablesTest.class,
- org.apache.sis.util.collection.CodeListSetTest.class,
- org.apache.sis.internal.util.CollectionsExtTest.class,
- org.apache.sis.internal.util.AbstractMapTest.class,
-
- // GeoAPI most basic types.
- org.apache.sis.internal.util.DefinitionURITest.class,
- org.apache.sis.util.SimpleInternationalStringTest.class,
- org.apache.sis.util.DefaultInternationalStringTest.class,
- org.apache.sis.internal.util.LocalizedParseExceptionTest.class,
-
- // Measurements and formatting.
- org.apache.sis.measure.SexagesimalConverterTest.class,
- org.apache.sis.measure.LinearConverterTest.class,
- org.apache.sis.measure.UnitDimensionTest.class,
- org.apache.sis.measure.SystemUnitTest.class,
- org.apache.sis.measure.PrefixesTest.class,
- org.apache.sis.measure.ConventionalUnitTest.class,
- org.apache.sis.measure.UnitFormatTest.class,
- org.apache.sis.measure.UnitsTest.class,
- org.apache.sis.measure.ScalarTest.class,
- org.apache.sis.measure.QuantitiesTest.class,
- org.apache.sis.measure.UnitServicesTest.class,
- org.apache.sis.measure.RangeTest.class,
- org.apache.sis.measure.DateRangeTest.class,
- org.apache.sis.measure.NumberRangeTest.class,
- org.apache.sis.measure.MeasurementRangeTest.class,
- org.apache.sis.measure.FormattedCharacterIteratorTest.class,
- org.apache.sis.measure.RangeFormatTest.class,
- org.apache.sis.measure.AngleFormatTest.class,
- org.apache.sis.measure.AngleTest.class,
- org.apache.sis.internal.util.X364Test.class,
- org.apache.sis.io.LineAppenderTest.class,
- org.apache.sis.io.LeftMarginTest.class,
- org.apache.sis.io.TabulationExpansionTest.class,
- org.apache.sis.io.WordWrapTest.class,
- org.apache.sis.io.WordWrapWithLineSeparatorTest.class,
- org.apache.sis.io.TableAppenderTest.class,
- org.apache.sis.util.collection.TreeTableFormatTest.class,
- org.apache.sis.util.collection.RangeSetTest.class,
- org.apache.sis.internal.util.StandardDateFormatTest.class,
-
- // Converters.
- org.apache.sis.internal.converter.AngleConverterTest.class,
- org.apache.sis.internal.converter.StringConverterTest.class,
- org.apache.sis.internal.converter.PathConverterTest.class,
- org.apache.sis.internal.converter.FallbackConverterTest.class,
- org.apache.sis.internal.converter.ArrayConverterTest.class,
- org.apache.sis.internal.converter.ConverterRegistryTest.class,
- org.apache.sis.internal.converter.SystemRegistryTest.class,
- org.apache.sis.internal.converter.NumberConverterTest.class //
Shall be after SystemRegistryTest.
-})
-public final class UtilityTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(UtilityTestSuite.class);
- verifyTestList(UtilityTestSuite.class);
- }
-}
diff --git
a/core/sis-utility/src/test/java/org/apache/sis/test/suite/package-info.java
b/core/sis-utility/src/test/java/org/apache/sis/test/suite/package-info.java
deleted file mode 100644
index e8961e649f..0000000000
--- a/core/sis-utility/src/test/java/org/apache/sis/test/suite/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Suites for all SIS tests in dependency order.
- * Each module will typically provide one {@code FooTestSuite} class in this
class,
- * where {@code Foo} is the module name.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.4
- * @since 0.3
- */
-package org.apache.sis.test.suite;
diff --git a/pom.xml b/pom.xml
index 3f9ab52507..7a39c37e8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -675,9 +675,6 @@
<version>3.0.0</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
- <includes>
- <include>**/*TestSuite.java</include>
- </includes>
<systemProperties>
<property>
<name>derby.stream.error.file</name>
diff --git
a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
b/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
deleted file mode 100644
index 75ef9f5513..0000000000
---
a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-french-profile} module, in rough dependency
order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.4
- * @since 0.4
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.profile.fra.DirectReferenceSystemTest.class,
- org.apache.sis.internal.profile.fra.DataIdentificationTest.class,
- org.apache.sis.profile.france.FrenchProfileTest.class
-})
-public final class FrenchProfileTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(FrenchProfileTestSuite.class);
- verifyTestList(FrenchProfileTestSuite.class);
- }
-}
diff --git
a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/package-info.txt
b/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java
b/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java
deleted file mode 100644
index 39966f24b2..0000000000
---
a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-french-profile} module, in rough dependency
order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.4
- * @since 0.4
- */
-@Suite.SuiteClasses({
- org.apache.sis.profile.japan.JapanProfileTest.class
-})
-public final class JapanProfileTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(JapanProfileTestSuite.class);
- verifyTestList(JapanProfileTestSuite.class);
- }
-}
diff --git
a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/package-info.txt
b/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java
b/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java
deleted file mode 100644
index 26db45c327..0000000000
---
a/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-earth-observation} module, in rough
dependency order.
- *
- * @author Thi Phuong Hao Nguyen (VNSC)
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.8
- */
-@Suite.SuiteClasses({
- org.apache.sis.storage.landsat.MetadataReaderTest.class,
- org.apache.sis.storage.landsat.LandsatStoreProviderTest.class
-})
-public final class EarthObservationTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(EarthObservationTestSuite.class);
- verifyTestList(EarthObservationTestSuite.class);
- }
-}
diff --git
a/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java
b/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java
deleted file mode 100644
index 7a84be4b32..0000000000
---
a/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-geotiff} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.4
- * @since 0.8
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.geotiff.CompressionTest.class,
- org.apache.sis.internal.storage.inflater.InflaterTest.class,
- org.apache.sis.internal.storage.inflater.CCITTRLETest.class,
- org.apache.sis.storage.geotiff.TypeTest.class,
- org.apache.sis.storage.geotiff.TagsTest.class,
- org.apache.sis.storage.geotiff.GeoKeysTest.class,
- org.apache.sis.storage.geotiff.GeoCodesTest.class,
- org.apache.sis.storage.geotiff.CRSBuilderTest.class,
- org.apache.sis.storage.geotiff.XMLMetadataTest.class,
- org.apache.sis.storage.geotiff.SelfConsistencyTest.class
-})
-public final class GeoTiffTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(GeoTiffTestSuite.class);
- verifyTestList(GeoTiffTestSuite.class);
- }
-}
diff --git
a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
b/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
deleted file mode 100644
index de5813768b..0000000000
---
a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-netcdf} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.1
- * @since 0.3
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.netcdf.DataTypeTest.class,
- org.apache.sis.internal.netcdf.DecoderTest.class,
- org.apache.sis.internal.netcdf.VariableTest.class,
- org.apache.sis.internal.netcdf.AxisTest.class,
- org.apache.sis.internal.netcdf.GridTest.class,
- org.apache.sis.internal.netcdf.impl.ChannelDecoderTest.class,
- org.apache.sis.internal.netcdf.impl.VariableInfoTest.class,
- org.apache.sis.internal.netcdf.impl.GridInfoTest.class,
- org.apache.sis.internal.netcdf.FeatureSetTest.class,
- org.apache.sis.internal.netcdf.impl.FeatureSetTest.class,
- org.apache.sis.storage.netcdf.MetadataReaderTest.class,
- org.apache.sis.storage.netcdf.NetcdfStoreProviderTest.class,
- org.apache.sis.storage.netcdf.NetcdfStoreTest.class,
- org.apache.sis.storage.netcdf.SelfConsistencyTest.class
-})
-public final class NetcdfTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(NetcdfTestSuite.class);
- verifyTestList(NetcdfTestSuite.class);
- }
-}
diff --git
a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/package-info.txt
b/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
b/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
deleted file mode 100644
index 5295d89d02..0000000000
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-shapefile} module, in rough dependency order.
- */
-@Suite.SuiteClasses({
- org.apache.sis.storage.shapefile.ShapeFileTest.class,
- org.apache.sis.internal.shapefile.jdbc.DBFConnectionTest.class,
- org.apache.sis.internal.shapefile.jdbc.DBFStatementTest.class,
- org.apache.sis.internal.shapefile.jdbc.DBFResultSetTest.class,
- org.apache.sis.internal.shapefile.jdbc.sql.WhereClauseTest.class
-})
-public final class ShapefileTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(ShapefileTestSuite.class);
- verifyTestList(ShapefileTestSuite.class);
- }
-}
diff --git
a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/package-info.txt
b/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java
b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java
deleted file mode 100644
index 5d4f77a24b..0000000000
---
a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-sqlstore} module, in rough dependency order.
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.sql.feature.TemporalValueGetterTest.class,
- org.apache.sis.internal.sql.feature.GeometryGetterTest.class,
- org.apache.sis.internal.sql.feature.SelectionClauseWriterTest.class,
- org.apache.sis.internal.sql.postgis.BandTest.class,
- org.apache.sis.internal.sql.postgis.RasterReaderTest.class,
- org.apache.sis.internal.sql.postgis.RasterWriterTest.class,
- org.apache.sis.internal.sql.postgis.PostgresTest.class,
- org.apache.sis.storage.sql.SQLStoreTest.class
-})
-public final class SQLTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- verifyTestList(SQLTestSuite.class);
- }
-}
diff --git
a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
b/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
deleted file mode 100644
index c60eee4a74..0000000000
---
a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-storage} module, in rough dependency order.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @author Alexis Manin (Geomatys)
- * @version 1.4
- * @since 0.3
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.storage.CodeTypeTest.class,
- org.apache.sis.internal.storage.StoreUtilitiesTest.class,
- org.apache.sis.internal.storage.io.IOUtilitiesTest.class,
- org.apache.sis.internal.storage.io.ChannelDataInputTest.class,
- org.apache.sis.internal.storage.io.ChannelDataOutputTest.class,
- org.apache.sis.internal.storage.io.ChannelImageInputStreamTest.class,
- org.apache.sis.internal.storage.io.ChannelImageOutputStreamTest.class,
- org.apache.sis.internal.storage.io.HyperRectangleReaderTest.class,
- org.apache.sis.internal.storage.io.RewindableLineReaderTest.class,
- org.apache.sis.internal.storage.io.FileCacheByteChannelTest.class,
- org.apache.sis.internal.storage.io.InputStreamArrayGetterTest.class,
- org.apache.sis.internal.storage.MetadataBuilderTest.class,
- org.apache.sis.internal.storage.MemoryGridResourceTest.class,
- org.apache.sis.storage.FeatureNamingTest.class,
- org.apache.sis.storage.ProbeResultTest.class,
- org.apache.sis.storage.StorageConnectorTest.class,
- org.apache.sis.storage.DataStoreProviderTest.class,
- org.apache.sis.storage.event.StoreListenersTest.class,
- org.apache.sis.storage.CoverageSubsetTest.class,
- org.apache.sis.storage.CoverageQueryTest.class,
- org.apache.sis.storage.FeatureQueryTest.class,
- org.apache.sis.internal.storage.xml.MimeTypeDetectorTest.class,
- org.apache.sis.internal.storage.xml.StoreProviderTest.class,
- org.apache.sis.internal.storage.xml.StoreTest.class,
- org.apache.sis.internal.storage.wkt.StoreProviderTest.class,
- org.apache.sis.internal.storage.wkt.StoreTest.class,
- org.apache.sis.internal.storage.csv.StoreProviderTest.class,
- org.apache.sis.internal.storage.csv.StoreTest.class,
- org.apache.sis.internal.storage.image.WorldFileStoreTest.class,
- org.apache.sis.internal.storage.image.SelfConsistencyTest.class,
- org.apache.sis.internal.storage.esri.AsciiGridStoreTest.class,
- org.apache.sis.internal.storage.esri.WritableStoreTest.class,
- org.apache.sis.internal.storage.esri.BSQConsistencyTest.class,
- org.apache.sis.internal.storage.esri.BIPConsistencyTest.class,
- org.apache.sis.internal.storage.esri.BILConsistencyTest.class,
- org.apache.sis.internal.storage.folder.StoreTest.class,
- org.apache.sis.storage.aggregate.JoinFeatureSetTest.class,
- org.apache.sis.storage.aggregate.ConcatenatedFeatureSetTest.class,
- org.apache.sis.storage.aggregate.CoverageAggregatorTest.class,
- org.apache.sis.storage.aggregate.BandAggregateGridResourceTest.class,
- org.apache.sis.storage.DataStoresTest.class
-})
-public final class StorageTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(StorageTestSuite.class);
- verifyTestList(StorageTestSuite.class);
- }
-}
diff --git
a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/package-info.txt
b/storage/sis-storage/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
diff --git
a/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java
b/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java
deleted file mode 100644
index 2dede63903..0000000000
---
a/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/GPXTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.test.suite;
-
-import org.apache.sis.test.TestSuite;
-import org.junit.runners.Suite;
-import org.junit.BeforeClass;
-
-
-/**
- * All tests from the {@code sis-xmlstore} module, in rough dependency order.
- */
-@Suite.SuiteClasses({
- org.apache.sis.internal.storage.gpx.TypesTest.class,
- org.apache.sis.internal.storage.gpx.MetadataTest.class,
- org.apache.sis.internal.storage.gpx.ReaderTest.class,
- org.apache.sis.internal.storage.gpx.WriterTest.class,
- org.apache.sis.internal.storage.gpx.UpdaterTest.class
-})
-public final class GPXTestSuite extends TestSuite {
- /**
- * Verifies the list of tests before to run the suite.
- * See {@link #verifyTestList(Class, Class[])} for more information.
- */
- @BeforeClass
- public static void verifyTestList() {
- assertNoMissingTest(GPXTestSuite.class);
- verifyTestList(GPXTestSuite.class);
- }
-}
diff --git
a/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
b/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
---
a/storage/sis-xmlstore/src/test/java/org/apache/sis/test/suite/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about
collisions.
-This package is initially defined by the sis-utility module, which also
provides
-the package-info.java file.
