Author: davsclaus
Date: Fri Jan 21 21:04:27 2011
New Revision: 1062027
URL: http://svn.apache.org/viewvc?rev=1062027&view=rev
Log:
Fixed test.
Added:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java
(contents, props changed)
- copied, changed from r1062025,
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharachersEncoderTest.java
Removed:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharachersEncoderTest.java
Modified:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java
Modified:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java?rev=1062027&r1=1062026&r2=1062027&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java
(original)
+++
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java
Fri Jan 21 21:04:27 2011
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.util.CastUtils;
@@ -44,12 +45,14 @@ public class JMXRouteStatisticsTest exte
List<RouteDefinition> list = routes.getRoutes();
Object exchangesCompleted = statistics.getRouteStatistic(camelContext,
list.get(0).getId(), "ExchangesCompleted");
assertEquals("JMX value incorrect, should be 0", new Long(0),
exchangesCompleted);
-
+
+ NotifyBuilder notify = new
NotifyBuilder(camelContext).whenDone(1).create();
+
ProducerTemplate template = camelContext.createProducerTemplate();
template.sendBody("seda:foo", "test");
-
- Thread.sleep(100);
-
+
+ notify.matchesMockWaitTime();
+
exchangesCompleted = statistics.getRouteStatistic(camelContext,
list.get(0).getId(), "ExchangesCompleted");
assertEquals("JMX value incorrect, should be 1", new Long(1),
exchangesCompleted);
}
Copied:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java
(from r1062025,
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharachersEncoderTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharachersEncoderTest.java&r1=1062025&r2=1062027&rev=1062027&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharachersEncoderTest.java
(original)
+++
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java
Fri Jan 21 21:04:27 2011
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.junit.Assert;
import org.junit.Test;
+public class UriCharactersEncoderTest extends Assert {
-public class UriCharachersEncoderTest extends Assert {
@Test
public void testEncoder() {
String afterEncoding = "direct:%2F%2Fstart";
Propchange:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/UriCharactersEncoderTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date