Author: davsclaus
Date: Fri Oct 16 09:32:40 2009
New Revision: 825822
URL: http://svn.apache.org/viewvc?rev=825822&view=rev
Log:
MR-254: Added more unit tests.
Added:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
(with props)
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=825822&r1=825821&r2=825822&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Fri Oct 16 09:32:40 2009
@@ -47,7 +47,6 @@
private static final transient Log LOG =
LogFactory.getLog(QuartzComponent.class);
private SchedulerFactory factory;
private Scheduler scheduler;
- private Map<Trigger, JobDetail> triggers;
public QuartzComponent() {
}
@@ -153,14 +152,6 @@
this.scheduler = scheduler;
}
- public Map<Trigger, JobDetail> getTriggers() {
- return triggers;
- }
-
- public void setTriggers(final Map<Trigger, JobDetail> triggers) {
- this.triggers = triggers;
- }
-
// Implementation methods
//
-------------------------------------------------------------------------
protected SchedulerFactory createSchedulerFactory() {
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=825822&r1=825821&r2=825822&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
Fri Oct 16 09:32:40 2009
@@ -17,8 +17,6 @@
package org.apache.camel.component.quartz;
import java.util.Date;
-import java.util.Map;
-import java.util.Set;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -64,20 +62,6 @@
this.scheduler = scheduler;
}
- public void addTriggers(final Map<Trigger, JobDetail> triggerMap) throws
SchedulerException {
- if (triggerMap != null) {
- Set<Map.Entry<Trigger, JobDetail>> entries = triggerMap.entrySet();
- for (Map.Entry<Trigger, JobDetail> entry : entries) {
- Trigger key = entry.getKey();
- JobDetail value = entry.getValue();
- ObjectHelper.notNull(key, "key");
- ObjectHelper.notNull(value, "value");
-
- addTrigger(key, value);
- }
- }
- }
-
public void addTrigger(final Trigger trigger, final JobDetail detail)
throws SchedulerException {
// lets default the trigger name to the job name
if (trigger.getName() == null) {
Added:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java?rev=825822&view=auto
==============================================================================
---
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
(added)
+++
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
Fri Oct 16 09:32:40 2009
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.quartz;
+
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerFactory;
+import org.quartz.impl.StdSchedulerFactory;
+
+/**
+ * @version $Revision$
+ */
+public class QuartzComponentTest extends CamelTestSupport {
+
+ @Test
+ public void testQuartzComponentCustomScheuduler() throws Exception {
+ QuartzComponent comp = new QuartzComponent();
+ comp.setCamelContext(context);
+
+ SchedulerFactory fac = new StdSchedulerFactory();
+ comp.setFactory(fac);
+ assertSame(fac, comp.getFactory());
+
+ Scheduler sch = fac.getScheduler();
+ comp.setScheduler(sch);
+ assertSame(sch, comp.getScheduler());
+
+ comp.start();
+ comp.stop();
+ }
+
+ @Test
+ public void testQuartzComponent() throws Exception {
+ QuartzComponent comp = new QuartzComponent(context);
+ comp.start();
+ comp.stop();
+ }
+
+}
Propchange:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java?rev=825822&r1=825821&r2=825822&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
(original)
+++
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
Fri Oct 16 09:32:40 2009
@@ -45,6 +45,9 @@
for (Exchange exchange : list) {
Message in = exchange.getIn();
log.debug("Received: " + in + " with headers: " + in.getHeaders());
+ // should be quartz message
+ QuartzMessage qm = exchange.getIn(QuartzMessage.class);
+ assertNotNull(qm.getJobExecutionContext());
}
}
