Add Unit tests for route detection for Servlet-3.0

instrumentation-security/servlet-3.0/src/test/java/com/nr/agent/security/instrumentation/servlet30/ApiEndpointTest.java

@@ -2,14 +2,20 @@
 
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
+import com.newrelic.api.agent.Trace;
 import com.newrelic.api.agent.security.instrumentation.helpers.URLMappingsHelper;
 import com.newrelic.api.agent.security.schema.ApplicationURLMapping;
-import org.apache.catalina.servlets.DefaultServlet;
+import com.newrelic.api.agent.security.schema.Framework;
+import com.newrelic.api.agent.security.schema.SecurityMetaData;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Iterator;
 
 @RunWith(SecurityInstrumentationTestRunner.class)
@@ -32,4 +38,21 @@ public void testURLMappings() {
         ApplicationURLMapping mapping2 = mappings.next();
         Assert.assertEquals("URL Mappings", new ApplicationURLMapping(method, "/test", handler), mapping2);
     }
+
+    @Test
+    public void testRoute() throws IOException, URISyntaxException {
+        connect();
+        SecurityMetaData metaData = SecurityInstrumentationTestRunner.getIntrospector().getSecurityMetaData();
+        Assert.assertEquals( "Incorrect Route Detected","/test", metaData.getRequest().getRoute());
+        Assert.assertEquals("Incorrect Framework detected", Framework.SERVLET.name(), metaData.getMetaData().getFramework());
+    }
+
+    @Trace(dispatcher = true)
+    private void connect() throws IOException, URISyntaxException {
+        URL u = server.getEndPoint().toURL();
+        HttpURLConnection conn = (HttpURLConnection) u.openConnection();
+        conn.setRequestProperty("content-type", "text/plain; charset=utf-8");
+        conn.connect();
+        conn.getResponseCode();
+    }
 }

instrumentation-security/servlet-3.0/src/test/java/com/nr/agent/security/instrumentation/servlet30/HttpServletServer.java

@@ -3,7 +3,6 @@
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.connector.Connector;
-import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
 import org.apache.tomcat.util.http.fileupload.FileUtils;
@@ -19,6 +18,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.Set;
 
@@ -91,6 +92,10 @@ private void stop() {
             }
         }
     }
+
+    public URI getEndPoint() throws URISyntaxException {
+        return new URI("http://localhost:" + port + "/test");
+    }
 }
 class MyServlet extends HttpServlet {
     @Override