Merging with master

akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala

@@ -90,6 +90,18 @@ class ConsumerIntegrationTest extends WordSpec with MustMatchers with NonSharedC
     camel.routeCount must be(0)
   }
 
+  "Consumer must register on uri passed in through constructor" in {
+    val consumer = start(new TestActor("direct://test"))
+    camel.awaitActivation(consumer, defaultTimeout seconds)
+
+    camel.routeCount must be > (0)
+    camel.routes.get(0).getEndpoint.getEndpointUri must be("direct://test")
+    system.stop(consumer)
+    camel.awaitDeactivation(consumer, defaultTimeout seconds)
+
+    camel.routeCount must be(0)
+  }
+
   "Error passing consumer supports error handling through route modification" in {
     start(new ErrorThrowingConsumer("direct:error-handler-test") with ErrorPassing {
       override def onRouteDefinition(rd: RouteDefinition) = {
@@ -171,5 +183,5 @@ trait ErrorPassing {
 }
 
 trait ManualAckConsumer extends Consumer {
-  override def autoack = false
+  override def autoAck = false
 }