raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

=all #3837 Make akkaScalaNightly compile on scala 2.11.0-M8

Browse source
This commit is contained in:
Björn Antonsson 2014-01-31 11:14:13 +01:00
parent 85698688e4
commit 179faba453
82 changed files with 651 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
View file

@ -10,7 +10,7 @@ import org.apache.camel._
import org.apache.camel.impl.{ DefaultProducer, DefaultEndpoint, DefaultComponent }
import akka.actor._
import akka.pattern._
import scala.reflect.BeanProperty
import scala.beans.BeanProperty
import scala.concurrent.duration._
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.control.NonFatal

2
akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
View file

@ -26,7 +26,7 @@ class ActivationIntegrationTest extends WordSpec with Matchers with SharedCamelS
"ActivationAware should be notified when endpoint is activated" in {
val latch = new TestLatch(0)
val actor = system.actorOf(Props(new TestConsumer("direct:actor-1", latch)), "act-direct-actor-1")
Await.result(camel.activationFutureFor(actor), 10 seconds) should equal(actor)
Await.result(camel.activationFutureFor(actor), 10 seconds) should be(actor)
template.requestBody("direct:actor-1", "test") should be("received test")
}

14
akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala
View file

@ -21,30 +21,30 @@ class CamelConfigSpec extends WordSpec with Matchers {
}
"CamelConfigSpec" must {
"have correct activationTimeout config" in {
settings.ActivationTimeout should equal(config.getMillisDuration("akka.camel.consumer.activation-timeout"))
settings.ActivationTimeout should be(config.getMillisDuration("akka.camel.consumer.activation-timeout"))
}
"have correct autoAck config" in {
settings.AutoAck should equal(config.getBoolean("akka.camel.consumer.auto-ack"))
settings.AutoAck should be(config.getBoolean("akka.camel.consumer.auto-ack"))
}
"have correct replyTimeout config" in {
settings.ReplyTimeout should equal(config.getMillisDuration("akka.camel.consumer.reply-timeout"))
settings.ReplyTimeout should be(config.getMillisDuration("akka.camel.consumer.reply-timeout"))
}
"have correct streamingCache config" in {
settings.StreamingCache should equal(config.getBoolean("akka.camel.streamingCache"))
settings.StreamingCache should be(config.getBoolean("akka.camel.streamingCache"))
}
"have correct jmxStatistics config" in {
settings.JmxStatistics should equal(config.getBoolean("akka.camel.jmx"))
settings.JmxStatistics should be(config.getBoolean("akka.camel.jmx"))
}
"have correct body conversions config" in {
val conversions = config.getConfig("akka.camel.conversions")
conversions.getString("file") should equal("java.io.InputStream")
conversions.entrySet.size should equal(1)
conversions.getString("file") should be("java.io.InputStream")
conversions.entrySet.size should be(1)
}
}
}

8
akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala
View file

@ -23,19 +23,19 @@ class DurationConverterSpec extends WordSpec with Matchers {
}
"DurationTypeConverter must throw if invalid format" in {
tryConvertTo(classOf[Duration], "abc nanos") should equal(null)
tryConvertTo(classOf[Duration], "abc nanos") should be(null)
intercept[TypeConversionException] {
mandatoryConvertTo(classOf[Duration], "abc nanos") should be(10 nanos)
}.getValue should equal("abc nanos")
}.getValue should be("abc nanos")
}
"DurationTypeConverter must throw if doesn't end with time unit" in {
tryConvertTo(classOf[Duration], "10233") should equal(null)
tryConvertTo(classOf[Duration], "10233") should be(null)
intercept[TypeConversionException] {
mandatoryConvertTo(classOf[Duration], "10233") should be(10 nanos)
}.getValue should equal("10233")
}.getValue should be("10233")
}
}