diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java index 72456c202d6d..557a147068c7 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java @@ -41,7 +41,7 @@ @SuppressWarnings("rawtypes") @RequiresDialectFeature(feature = IsSupportedBySpatial.class) @SessionFactory -@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "See https://hibernate.atlassian.net/browse/HHH-15669") +@SkipForDialect(dialectClass = OracleDialect.class, reason = "See https://hibernate.atlassian.net/browse/HHH-15669") public class CommonFunctionTests extends SpatialTestBase { public final static TestSupport.TestDataPurpose PURPOSE = TestSupport.TestDataPurpose.SpatialFunctionsData; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java index 92c709918d28..121bf6da6796 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java @@ -40,7 +40,8 @@ public void injectSessionFactoryScope(SessionFactoryScope scope) { } public boolean isSupported(CommonSpatialFunction function) { - return supportedFunctions.contains( function.name() ); + return supportedFunctions.contains( function.getKey().getName() ) || + ( function.getKey().getAltName().isPresent() && supportedFunctions.contains( function.getKey().getAltName().get() ) ); } protected void initH2GISExtensionsForInMemDb() {