From 31b674d5bf3fe79d9d5fc037d3d5f10ac592adf3 Mon Sep 17 00:00:00 2001 From: "Daniel Cunha (soro)" Date: Fri, 22 May 2015 14:55:45 -0300 Subject: [PATCH] Fixed: DELTASPIKE-908 org.apache.deltaspike.test.scheduler.custom.CustomSchedulerWarFileTest fails with Weld --- .../scheduler/custom/CustomSchedulerTest.java | 12 ++++++--- .../test/scheduler/custom/DeleteJob.java | 26 +++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/DeleteJob.java diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java index b7ec80029..7b965ae22 100644 --- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java +++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java @@ -89,12 +89,16 @@ public void checkManualSchedulerJobManagement() Assert.assertTrue(this.scheduler.isExecutingJob(ManualJob.class)); Assert.assertEquals(0, testJobManager.getRegisteredJobs().size()); this.scheduler.interruptJob(ManualJob.class); + } - this.scheduler.registerNewJob(AutoRegisteredJob.class); - Assert.assertEquals(1, testJobManager.getRegisteredJobs().size()); + @Test + public void checkDeleteJob() { - this.scheduler.deleteJob(AutoRegisteredJob.class); - Assert.assertEquals(0, testJobManager.getRegisteredJobs().size()); + this.scheduler.registerNewJob(DeleteJob.class); + Assert.assertTrue(testJobManager.getRegisteredJobs().contains(DeleteJob.class)); + + this.scheduler.deleteJob(DeleteJob.class); + Assert.assertFalse(testJobManager.getRegisteredJobs().contains(DeleteJob.class)); } @Test diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/DeleteJob.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/DeleteJob.java new file mode 100644 index 000000000..6f540c521 --- /dev/null +++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/DeleteJob.java @@ -0,0 +1,26 @@ +/* + * 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.deltaspike.test.scheduler.custom; + +import org.apache.deltaspike.scheduler.api.Scheduled; + +@Scheduled(cronExpression = "*/1 * * * * ?", onStartup = false) +public class DeleteJob implements CustomJob +{ +}