Merge pull request #6 from ydylla/JettySpec

Add JettySpec
eddyson-de · Oct 26, 2018 · eca4837 · eca4837
2 parents fbcd60e + 0f7ac0b
commit eca4837
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 description = "Utilities for Geb-based browser tests of Tapestry applications"
 
 group = "de.eddyson"
-version = "0.42.0"
+version = "0.43.0"
 
 apply plugin: 'groovy'
 apply plugin: 'maven'

diff --git a/src/main/groovy/de/eddyson/tapestrygeb/JettyGebSpec.groovy b/src/main/groovy/de/eddyson/tapestrygeb/JettyGebSpec.groovy
@@ -2,11 +2,7 @@ package de.eddyson.tapestrygeb
 
 import static org.openqa.selenium.logging.LogType.BROWSER
 
-import javax.servlet.ServletContext;
-
-import org.apache.tapestry5.TapestryFilter;
-import org.apache.tapestry5.ioc.Registry;
-import org.eclipse.jetty.webapp.WebAppContext;
+import org.apache.tapestry5.ioc.Registry
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -20,13 +16,11 @@ abstract class JettyGebSpec extends GebReportingSpec {
   protected static Logger logger = LoggerFactory.getLogger(JettyGebSpec)
 
   Registry getRegistry(){
-    WebAppContext webappContext = (WebAppContext) JettyExtension.runner.server.handler
-    ServletContext servletContext = webappContext.getServletContext()
-    (Registry) servletContext.getAttribute(TapestryFilter.REGISTRY_CONTEXT_NAME)
+    return JettyExtension.getRegistry()
   }
 
   def getService(Class serviceInterface){
-    getRegistry().getService(serviceInterface)
+    return getRegistry().getService(serviceInterface)
   }
 
   def setup() {

diff --git a/src/main/groovy/de/eddyson/tapestrygeb/JettySpec.groovy b/src/main/groovy/de/eddyson/tapestrygeb/JettySpec.groovy
@@ -0,0 +1,24 @@
+package de.eddyson.tapestrygeb
+
+import spock.lang.Specification
+import org.apache.tapestry5.ioc.Registry
+
+@RunJetty
+abstract class JettySpec extends Specification {
+
+  Registry getRegistry(){
+    return JettyExtension.getRegistry()
+  }
+
+  def getService(Class serviceInterface){
+    return getRegistry().getService(serviceInterface)
+  }
+
+  def getJettyPort() {
+    return Integer.parseInt(System.getProperty("jettyPort"))
+  }
+
+  def getJettyBaseUrl() {
+    return "http://localhost:" + getJettyPort()
+  }
+}
diff --git a/src/main/java/de/eddyson/tapestrygeb/InjectInterceptor.java b/src/main/java/de/eddyson/tapestrygeb/InjectInterceptor.java
@@ -3,15 +3,10 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
-import javax.servlet.ServletContext;
-
-import org.apache.tapestry5.TapestryFilter;
 import org.apache.tapestry5.ioc.AnnotationProvider;
-import org.apache.tapestry5.ioc.Registry;
 import org.apache.tapestry5.ioc.annotations.Autobuild;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.ioc.annotations.InjectService;
-import org.eclipse.jetty.webapp.WebAppContext;
 import org.spockframework.runtime.extension.AbstractMethodInterceptor;
 import org.spockframework.runtime.extension.IMethodInvocation;
 import org.spockframework.runtime.model.FieldInfo;
@@ -48,25 +43,18 @@ private void injectServices(final Object target, final boolean sharedFields) thr
           || ReflectionUtil.isAnnotationPresent(rawField, "javax.inject.Inject")
           || rawField.isAnnotationPresent(Autobuild.class))
           && rawField.isAnnotationPresent(Shared.class) == sharedFields) {
-        Object value = getRegistry().getObject(rawField.getType(), createAnnotationProvider(field));
+        Object value = JettyExtension.getRegistry().getObject(rawField.getType(), createAnnotationProvider(field));
         rawField.setAccessible(true);
         rawField.set(target, value);
       } else if (rawField.isAnnotationPresent(InjectService.class)) {
         String serviceName = rawField.getAnnotation(InjectService.class).value();
-        Object value = getRegistry().getService(serviceName, rawField.getType());
+        Object value = JettyExtension.getRegistry().getService(serviceName, rawField.getType());
         rawField.setAccessible(true);
         rawField.set(target, value);
       }
     }
   }
 
-  private Registry getRegistry() {
-    WebAppContext webappContext = (WebAppContext) JettyExtension.runner.getServer().getHandler();
-    ServletContext servletContext = webappContext.getServletContext();
-    Registry registry = (Registry) servletContext.getAttribute(TapestryFilter.REGISTRY_CONTEXT_NAME);
-    return registry;
-  }
-
   private static AnnotationProvider createAnnotationProvider(final FieldInfo field) {
     return new AnnotationProvider() {
       @Override

diff --git a/src/main/java/de/eddyson/tapestrygeb/JettyExtension.java b/src/main/java/de/eddyson/tapestrygeb/JettyExtension.java
@@ -1,12 +1,17 @@
 package de.eddyson.tapestrygeb;
 
+import org.apache.tapestry5.TapestryFilter;
+import org.apache.tapestry5.ioc.Registry;
 import org.apache.tapestry5.test.Jetty7Runner;
+import org.eclipse.jetty.webapp.WebAppContext;
 import org.spockframework.runtime.AbstractRunListener;
 import org.spockframework.runtime.extension.AbstractAnnotationDrivenExtension;
 import org.spockframework.runtime.extension.IMethodInterceptor;
 import org.spockframework.runtime.model.FeatureInfo;
 import org.spockframework.runtime.model.SpecInfo;
 
+import javax.servlet.ServletContext;
+
 public class JettyExtension extends AbstractAnnotationDrivenExtension<RunJetty> {
 
   private boolean isSpecAnnotated;
@@ -15,6 +20,12 @@ public class JettyExtension extends AbstractAnnotationDrivenExtension<RunJetty>
 
   private static boolean shutdownHookAdded = false;
 
+  static Registry getRegistry() {
+    WebAppContext webappContext = (WebAppContext) runner.getServer().getHandler();
+    ServletContext servletContext = webappContext.getServletContext();
+    return (Registry) servletContext.getAttribute(TapestryFilter.REGISTRY_CONTEXT_NAME);
+  }
+
   @Override
   public void visitSpec(final SpecInfo spec) {