[sling-org-apache-sling-capabilities] branch master updated: Verify servlet service properties

[bdelacretaz]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-capabilities.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c821b5  Verify servlet service properties
3c821b5 is described below

commit 3c821b5bc2c9d30ae29e76992ceb65e0e0309107
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Thu Jun 21 15:48:52 2018 +0200

    Verify servlet service properties
---
 .../capabilities/internal/CapabilitiesServlet.java    |  1 -
 .../capabilities/internal/CapabilitesServletTest.java | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/capabilities/internal/CapabilitiesServlet.java 
b/src/main/java/org/apache/sling/capabilities/internal/CapabilitiesServlet.java
index 35e2819..7f0793a 100644
--- 
a/src/main/java/org/apache/sling/capabilities/internal/CapabilitiesServlet.java
+++ 
b/src/main/java/org/apache/sling/capabilities/internal/CapabilitiesServlet.java
@@ -36,7 +36,6 @@ import 
org.osgi.service.component.annotations.ReferencePolicyOption;
 property = {
     "sling.servlet.resourceTypes=sling/capabilities",
     "sling.servlet.methods=GET",
-    "sling.servlet.selectors=capabilities",
     "sling.servlet.extensions=json"
 })
 
diff --git 
a/src/test/java/org/apache/sling/capabilities/internal/CapabilitesServletTest.java
 
b/src/test/java/org/apache/sling/capabilities/internal/CapabilitesServletTest.java
index 80017e0..55265c9 100644
--- 
a/src/test/java/org/apache/sling/capabilities/internal/CapabilitesServletTest.java
+++ 
b/src/test/java/org/apache/sling/capabilities/internal/CapabilitesServletTest.java
@@ -23,6 +23,7 @@ import java.io.StringReader;
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
+import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
@@ -36,7 +37,11 @@ import org.junit.Test;
 import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
 import org.apache.sling.testing.mock.sling.MockSling;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
 
 /** Test the JSONCapabilitiesWriter */
 public class CapabilitesServletTest {
@@ -75,4 +80,18 @@ public class CapabilitesServletTest {
         assertEquals("VALUE_1_F", 
json.getJsonObject("F").getString("KEY_1_F"));
         assertEquals("VALUE_42_G", 
json.getJsonObject("G").getString("KEY_42_G"));
     }
+    
+    @Test
+    public void verifyServiceProperties() throws ServletException, 
IOException, InvalidSyntaxException {
+        final ServiceRegistration reg = 
bundleContext.registerService(Servlet.class.getName(), servlet, null);
+        
+        try {
+            assertNotNull("Expecting a non-null ServiceRegistration", reg);
+            assertEquals("sling/capabilities", 
reg.getReference().getProperty("sling.servlet.resourceTypes"));
+            assertEquals("GET", 
reg.getReference().getProperty("sling.servlet.methods"));
+            assertEquals("json", 
reg.getReference().getProperty("sling.servlet.extensions"));
+        } finally {
+            reg.unregister();
+        }
+    }
 }
\ No newline at end of file