[HK] additional test cases for Catalog.check with Envelope

Change-Id: I1d7e4a3df7d6186875f29af21fbb23c4f17d01e3
Signed-off-by: Frank Gasdorf <[email protected]>

Author: fgdrf

plugins/org.locationtech.udig.catalog.tests2/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.mockito;bundle-version="2.23.0",
  net.bytebuddy.byte-buddy;bundle-version="1.9.0",
- net.bytebuddy.byte-buddy-agent;bundle-version="1.9.0"
+ net.bytebuddy.byte-buddy-agent;bundle-version="1.9.0",
+ org.objenesis;bundle-version="2.6.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Fragment-Host: org.locationtech.udig.catalog;bundle-version="2.3.0"

plugins/org.locationtech.udig.catalog.tests2/src/org/locationtech/udig/catalog/internal/CatalogImplTest.java

@@ -19,8 +19,11 @@
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.locationtech.jts.geom.Envelope;
 import org.locationtech.udig.catalog.IGeoResource;
 import org.locationtech.udig.catalog.IGeoResourceInfo;
 import org.locationtech.udig.catalog.IService;
@@ -39,6 +42,8 @@ public class CatalogImplTest {
 
     private static final String NOT_MATCHING_TEXT = "whatever";
 
+    private static final Envelope ENVELOPE = new Envelope(15, 17, -5, 5);
+
     private static final String MATCHING_TEXT = "test";
 
     private final AST testAST = ASTFactory.parse(MATCHING_TEXT);
@@ -75,14 +80,59 @@ public void checkIsTrueIfResourceInfoTitleMatch() throws Exception {
     }
 
     @Test
-    public void checkIsTrueIfResourceInfoNameMatch() throws Exception {
+    public void checkWithEnvelopeIsTrueIfResourceInfoNameMatch() throws Exception {
         when(geoResourceInfo.getTitle()).thenReturn(NOT_MATCHING_TEXT);
         when(geoResourceInfo.getName()).thenReturn(MATCHING_TEXT);
         when(geoResource.getInfo(any())).thenReturn(geoResourceInfo);
 
         assertTrue(CatalogImpl.check(geoResource, testAST));
     }
 
+    @Test
+    public void checkWithEnvelopeIsTrueIfResourceInfoNameMatchAndEnvelopeIsNull() throws Exception {
+        when(geoResourceInfo.getTitle()).thenReturn(NOT_MATCHING_TEXT);
+        when(geoResourceInfo.getName()).thenReturn(MATCHING_TEXT);
+        when(geoResource.getInfo(any())).thenReturn(geoResourceInfo);
+
+        assertTrue(CatalogImpl.check(geoResource, testAST, null));
+    }
+
+    @Test
+    public void checkWithEnvelopeIsTrueIfResourceInfoNameMatchAndInfoBoundsisNull()
+            throws Exception {
+        when(geoResourceInfo.getTitle()).thenReturn(MATCHING_TEXT);
+        when(geoResourceInfo.getBounds()).thenReturn(null);
+        when(geoResource.getInfo(any())).thenReturn(geoResourceInfo);
+
+        assertTrue(CatalogImpl.check(geoResource, testAST, ENVELOPE));
+    }
+
+    @Test
+    public void checkWithEnvelopeIsTrueIfResourceInfoNameMatchAndInfoWithBounds() throws Exception {
+        when(geoResourceInfo.getTitle()).thenReturn(MATCHING_TEXT);
+        when(geoResourceInfo.getBounds())
+                .thenReturn(new ReferencedEnvelope(10, 20, -10, 10, DefaultGeographicCRS.WGS84));
+        when(geoResource.getInfo(any())).thenReturn(geoResourceInfo);
+
+        assertTrue(CatalogImpl.check(geoResource, testAST, ENVELOPE));
+    }
+
+    @Test
+    public void checkWithEnvelopeIsFalseWithGeoResource() {
+        IGeoResource nullGeoResource = null;
+        assertFalse(CatalogImpl.check(nullGeoResource, testAST, null));
+    }
+
+    @Test
+    public void checkIsTrueIfResourceInfoNameMatchAndEnvelopeIsNullCheck() throws Exception {
+        Envelope envelope = new Envelope();
+        when(geoResourceInfo.getTitle()).thenReturn(NOT_MATCHING_TEXT);
+        when(geoResourceInfo.getName()).thenReturn(MATCHING_TEXT);
+        when(geoResource.getInfo(any())).thenReturn(geoResourceInfo);
+
+        assertTrue(CatalogImpl.check(geoResource, testAST, envelope));
+    }
+
     @Test
     public void checkIsTrueIfResourceInfoAtLeastOneKeywordMatch() throws Exception {
         when(geoResourceInfo.getTitle()).thenReturn(NOT_MATCHING_TEXT);
@@ -185,8 +235,7 @@ public void checkIsTrueIfServiceInfoAbstractMatch() throws Exception {
     @Test
     public void checkIsTrueIfServiceInfoDescriptionMatch() throws Exception {
         when(serviceInfo.getTitle()).thenReturn(NOT_MATCHING_TEXT);
-        when(serviceInfo.getDescription())
-                .thenReturn(MATCHING_TEXT);
+        when(serviceInfo.getDescription()).thenReturn(MATCHING_TEXT);
         when(serviceMock.getInfo(null)).thenReturn(serviceInfo);
 
         assertTrue(CatalogImpl.check(serviceMock, testAST));
@@ -195,8 +244,7 @@ public void checkIsTrueIfServiceInfoDescriptionMatch() throws Exception {
     @Test
     public void checkIsFalseIfServiceNotMatchAnything() throws Exception {
         when(serviceInfo.getTitle()).thenReturn(NOT_MATCHING_TEXT);
-        when(serviceInfo.getDescription())
-                .thenReturn(NOT_MATCHING_TEXT);
+        when(serviceInfo.getDescription()).thenReturn(NOT_MATCHING_TEXT);
         when(serviceMock.getInfo(null)).thenReturn(serviceInfo);
 
         assertFalse(CatalogImpl.check(serviceMock, testAST));