Skip to content

Commit cadd675

Browse files
maesenkambellade
authored andcommitted
Fix Spatial functions tests
The TestFactory in CommonFunctionTests no longer created any tests because the `isSupported` function always returned false due to case-mismatch. The case-mismatch is likely due to a change in how the function keys are returned by the SQMFunctionRegistry.
1 parent a75a4d8 commit cadd675

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
@SuppressWarnings("rawtypes")
4242
@RequiresDialectFeature(feature = IsSupportedBySpatial.class)
4343
@SessionFactory
44-
@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "See https://hibernate.atlassian.net/browse/HHH-15669")
44+
@SkipForDialect(dialectClass = OracleDialect.class, reason = "See https://hibernate.atlassian.net/browse/HHH-15669")
4545
public class CommonFunctionTests extends SpatialTestBase {
4646

4747
public final static TestSupport.TestDataPurpose PURPOSE = TestSupport.TestDataPurpose.SpatialFunctionsData;

hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public void injectSessionFactoryScope(SessionFactoryScope scope) {
4040
}
4141

4242
public boolean isSupported(CommonSpatialFunction function) {
43-
return supportedFunctions.contains( function.name() );
43+
return supportedFunctions.contains( function.getKey().getName() ) ||
44+
( function.getKey().getAltName().isPresent() && supportedFunctions.contains( function.getKey().getAltName().get() ) );
4445
}
4546

4647
protected void initH2GISExtensionsForInMemDb() {

0 commit comments

Comments
 (0)