Fixing Guice integration tests that got broken during backports from …

…master
resteasy · Jan 18, 2017 · 79f6889 · 79f6889
1 parent 436d736
commit 79f6889
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/resteasy-guice/pom.xml b/resteasy-guice/pom.xml
@@ -23,6 +23,11 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>

diff --git a/resteasy-guice/src/main/java/org/jboss/resteasy/plugins/guice/ext/JaxrsModule.java b/resteasy-guice/src/main/java/org/jboss/resteasy/plugins/guice/ext/JaxrsModule.java
@@ -4,6 +4,8 @@
 import com.google.inject.Module;
 import org.jboss.resteasy.client.ClientExecutor;
 import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor;
+import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
+import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
@@ -16,6 +18,7 @@ public class JaxrsModule implements Module
    public void configure(final Binder binder)
    {
       binder.bind(ClientExecutor.class).to(ApacheHttpClient4Executor.class);
+      binder.bind(ClientHttpEngine.class).to(ApacheHttpClient4Engine.class);
       binder.bind(RuntimeDelegate.class).toInstance(RuntimeDelegate.getInstance());
       binder.bind(Response.ResponseBuilder.class).toProvider(ResponseBuilderProvider.class);
       binder.bind(UriBuilder.class).toProvider(UriBuilderProvider.class);

diff --git a/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/GuiceContextTest.java b/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/GuiceContextTest.java
@@ -25,7 +25,6 @@
 import com.google.inject.Guice;
 import com.google.inject.Module;
 
-@org.junit.Ignore
 public class GuiceContextTest
 {
    private NettyJaxrsServer server;
@@ -62,7 +61,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("method", resource.getName());
       dispatcher.getRegistry().removeRegistrations(MethodTestResource.class);
    }
@@ -80,7 +79,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("field", resource.getName());
       dispatcher.getRegistry().removeRegistrations(FieldTestResource.class);
    }
@@ -115,7 +114,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("constructor", resource.getName());
       dispatcher.getRegistry().removeRegistrations(ConstructorTestResource.class);
    }

diff --git a/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/GuiceProviderTest.java b/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/GuiceProviderTest.java
@@ -18,7 +18,6 @@
 import com.google.inject.Guice;
 import com.google.inject.Module;
 
-@org.junit.Ignore
 public class GuiceProviderTest
 {
    private static NettyJaxrsServer server;
@@ -56,7 +55,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("exception", resource.getName());
       dispatcher.getRegistry().removeRegistrations(TestResource.class);
    }

diff --git a/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/ResourceTest.java b/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/ResourceTest.java
@@ -16,7 +16,6 @@
 import com.google.inject.Inject;
 import com.google.inject.Module;
 
-@org.junit.Ignore
 public class ResourceTest
 {
    private static NettyJaxrsServer server;
@@ -53,7 +52,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("name", resource.getName());
       dispatcher.getRegistry().removeRegistrations(TestResource.class);
    }
@@ -72,7 +71,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("injected-name", resource.getName());
       dispatcher.getRegistry().removeRegistrations(TestResource.class);
    }

diff --git a/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/ext/JaxrsModuleTest.java b/resteasy-guice/src/test/java/org/jboss/resteasy/plugins/guice/ext/JaxrsModuleTest.java
@@ -22,7 +22,6 @@
 import com.google.inject.Inject;
 import com.google.inject.Module;
 
-@org.junit.Ignore
 public class JaxrsModuleTest
 {
    private static NettyJaxrsServer server;
@@ -59,7 +58,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module, new JaxrsModule()));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("ok", resource.getName());
       dispatcher.getRegistry().removeRegistrations(TestResource.class);
    }

diff --git a/...easy-guice/src/test/java/org/jboss/resteasy/plugins/guice/ext/RequestScopeModuleTest.java b/...easy-guice/src/test/java/org/jboss/resteasy/plugins/guice/ext/RequestScopeModuleTest.java
@@ -25,7 +25,6 @@
 import com.google.inject.Module;
 import com.google.inject.Provider;
 
-@org.junit.Ignore
 public class RequestScopeModuleTest
 {
    private static NettyJaxrsServer server;
@@ -62,7 +61,7 @@ public void configure(final Binder binder)
       };
       final ModuleProcessor processor = new ModuleProcessor(dispatcher.getRegistry(), dispatcher.getProviderFactory());
       processor.processInjector(Guice.createInjector(module, new RequestScopeModule()));
-      final TestResource resource = TestPortProvider.createProxy(TestResource.class, TestPortProvider.generateBaseUrl());
+      final TestResource resource = TestPortProvider.createProxy(TestResource.class);
       Assert.assertEquals("ok", resource.getName());
       dispatcher.getRegistry().removeRegistrations(TestResource.class);
    }