Author: painter
Date: Fri Feb 22 18:56:25 2019
New Revision: 1854166
URL: http://svn.apache.org/viewvc?rev=1854166&view=rev
Log:
Finish moving unit tests to JUnit 5, enforce turbine coding practices, remove
references to logging that are no longer required in the pom.xml
Modified:
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/quartz/src/changes/changes.xml
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
turbine/fulcrum/trunk/quartz/src/test/quartz.xml
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Fri Feb 22 18:56:25 2019
@@ -90,72 +90,52 @@
<version>1.1</version>
<scope>runtime</scope>
</dependency>
-
-
- <!-- Testing dependencies -->
+
+ <!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
+ <artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
+ <artifactId>fulcrum-yaafi</artifactId>
<version>1.0.8</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>1.7.25</version>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.*</include>
- <include>**/*TestCase.*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
-
+
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.*</include>
+
<include>**/*TestCase.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+
+
</build>
<properties>
<turbine.site.path>fulcrum/fulcrum-quartz</turbine.site.path>
- <log4j.version>2.11.1</log4j.version>
</properties>
</project>
Modified: turbine/fulcrum/trunk/quartz/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/changes/changes.xml?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/changes/changes.xml Fri Feb 22 18:56:25
2019
@@ -25,6 +25,12 @@
<body>
<release version="1.1.1" date="in SVN">
+ <action dev="painter" type="update">
+ Update unit tests to BaseUnit5Test
+ </action>
+ <action dev="painter" type="update">
+ Update to yaafi-1.0.8 and testcontainer 1.0.8
+ </action>
<action dev="tv" type="update">
Update dependency to quartz-2.2.1
</action>
Modified:
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
---
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java
(original)
+++
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java
Fri Feb 22 18:56:25 2019
@@ -1,3 +1,5 @@
+package org.apache.fulcrum.quartz;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.fulcrum.quartz;
-
import org.quartz.Scheduler;
/**
Modified:
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
---
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
(original)
+++
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
Fri Feb 22 18:56:25 2019
@@ -1,3 +1,5 @@
+package org.apache.fulcrum.quartz.impl;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,7 +19,6 @@
* under the License.
*/
-package org.apache.fulcrum.quartz.impl;
import java.util.ArrayList;
import java.util.List;
@@ -267,7 +268,9 @@ public class QuartzSchedulerImpl
}
// === Service Implementation ===========================================
-
+ /**
+ * @throws SchedulerException generic exception
+ */
private void logSchedulerConfiguration() throws SchedulerException
{
for (String jobGroup : getScheduler().getJobGroupNames())
Modified:
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
---
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java
(original)
+++
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java
Fri Feb 22 18:56:25 2019
@@ -1,3 +1,13 @@
+package org.apache.fulcrum.quartz;
+
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.fulcrum.quartz.test.NotSoSimpleJob;
+import org.apache.fulcrum.quartz.test.SimpleJob;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,43 +27,41 @@
* under the License.
*/
-package org.apache.fulcrum.quartz;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import org.apache.avalon.framework.logger.Log4JLogger;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.fulcrum.quartz.test.NotSoSimpleJob;
-import org.apache.fulcrum.quartz.test.SimpleJob;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;
+
/**
* Handle looking up and then the icky cleanup of Quartz.
*
* @author <a href="mailto:[email protected]";>Eric Pugh
</a>
*/
@RunWith(JUnitPlatform.class)
-public class BaseQuartzTestCase extends BaseUnit5Test {
+public class BaseQuartzTestCase extends BaseUnit5Test
+{
private final String preDefinedOutput =
"{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
QuartzScheduler quartz = null;
Logger logger;
+ /**
+ * @throws Exception generic exception
+ */
@BeforeEach
- public void setUp() throws Exception {
- logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
+ public void setUp() throws Exception
+ {
SimpleJob.reset();
NotSoSimpleJob.reset();
- try {
+ try
+ {
quartz = (QuartzScheduler) this.lookup(QuartzScheduler.ROLE);
- } catch (Throwable e) {
+ }
+ catch (Throwable e)
+ {
fail(e.getMessage());
}
assertNotNull(quartz);
@@ -63,8 +71,9 @@ public class BaseQuartzTestCase extends
/* (non-Javadoc)
* @see org.apache.fulcrum.testcontainer.BaseUnit5Test#tearDown()
*/
- @After
- public void tearDown() {
+ @AfterEach
+ public void tearDown()
+ {
release(QuartzScheduler.ROLE);
SimpleJob.reset();
NotSoSimpleJob.reset();
Modified:
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
---
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
(original)
+++
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
Fri Feb 22 18:56:25 2019
@@ -1,3 +1,7 @@
+package org.apache.fulcrum.quartz;
+
+
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,10 +21,6 @@
* under the License.
*/
-package org.apache.fulcrum.quartz;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import java.util.Date;
import java.util.List;
@@ -28,7 +28,6 @@ import java.util.Set;
import org.apache.fulcrum.quartz.test.NotSoSimpleJob;
import org.apache.fulcrum.quartz.test.SimpleJob;
-import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.quartz.DateBuilder;
import org.quartz.JobDetail;
@@ -40,12 +39,18 @@ import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
import org.quartz.impl.matchers.GroupMatcher;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* @author <a href="mailto:[email protected]";>Leandro Rodrigo Saad
* Cruz</a>
* @author <a href="mailto:[email protected]";>Eric Pugh
</a>
*/
-public class DefaultQuartzSchedulerImplTest extends BaseQuartzTestCase {
+public class DefaultQuartzSchedulerImplTest extends BaseQuartzTestCase
+{
/**
* Make sure that the Quartz scheduler is up and running
@@ -53,10 +58,11 @@ public class DefaultQuartzSchedulerImplT
* @throws Exception generic exception
*/
@Test
- public void testService() throws Exception {
+ public void testService() throws Exception
+ {
Scheduler scheduler = quartz.getScheduler();
- Assert.assertNotNull(scheduler);
- Assert.assertNotNull(scheduler.getContext());
+ assertNotNull(scheduler);
+ assertNotNull(scheduler.getContext());
}
/**
@@ -66,7 +72,8 @@ public class DefaultQuartzSchedulerImplT
* @throws Exception generic exception
*/
@Test
- public void testAddRemoveTrigger() throws Exception {
+ public void testAddRemoveTrigger() throws Exception
+ {
Scheduler scheduler = quartz.getScheduler();
TriggerKey triggerKey = TriggerKey.triggerKey("someTrigger",
"TURBINE");
@@ -94,11 +101,12 @@ public class DefaultQuartzSchedulerImplT
* @throws Exception generic exception
*/
@Test
- public void testGetJobs() throws Exception {
+ public void testGetJobs() throws Exception
+ {
Scheduler scheduler = quartz.getScheduler();
- Assert.assertNotNull(scheduler);
+ assertNotNull(scheduler);
Set<JobKey> jobNames =
scheduler.getJobKeys(GroupMatcher.jobGroupEquals("TURBINE"));
- Assert.assertEquals("Expected two registered jobs", 2,
jobNames.size());
+ assertEquals(2, jobNames.size(), "Expected two registered
jobs");
}
/**
@@ -111,10 +119,10 @@ public class DefaultQuartzSchedulerImplT
public void testJobDetailMap() throws Exception {
JobDetail jobDetail =
quartz.getScheduler().getJobDetail(JobKey.jobKey("simpleJob", "TURBINE"));
- Assert.assertNotNull(jobDetail);
- Assert.assertEquals("simpleJob", jobDetail.getKey().getName());
- Assert.assertNotNull(jobDetail.getJobDataMap());
- Assert.assertEquals(2, jobDetail.getJobDataMap().size());
+ assertNotNull(jobDetail);
+ assertEquals("simpleJob", jobDetail.getKey().getName());
+ assertNotNull(jobDetail.getJobDataMap());
+ assertEquals(2, jobDetail.getJobDataMap().size());
}
/**
@@ -126,8 +134,8 @@ public class DefaultQuartzSchedulerImplT
public void testGetTriggersOfJob() throws Exception {
List<? extends Trigger> triggers = quartz.getScheduler()
.getTriggersOfJob(JobKey.jobKey("notSoSimpleJob", "TURBINE"));
- Assert.assertEquals(1, triggers.size());
- Assert.assertEquals("cronTrigger", ((Trigger)
triggers.get(0)).getKey().getName());
+ assertEquals(1, triggers.size());
+ assertEquals("cronTrigger", ((Trigger)
triggers.get(0)).getKey().getName());
}
/**
@@ -138,14 +146,14 @@ public class DefaultQuartzSchedulerImplT
@Test
public void testJobExecution() throws Exception {
Thread.sleep(2000);
- Assert.assertTrue("SimpleJob was not executed",
SimpleJob.wasExecuted);
- Assert.assertTrue("NotSoSimpleJob was not executed",
NotSoSimpleJob.wasExecuted);
- Assert.assertTrue("NotSoSimpleJob was not serviced",
NotSoSimpleJob.wasServiced);
+ assertTrue(SimpleJob.wasExecuted, "SimpleJob was not executed");
+ assertTrue(NotSoSimpleJob.wasExecuted, "NotSoSimpleJob was not
executed");
+ assertTrue(NotSoSimpleJob.wasServiced, "NotSoSimpleJob was not
executed");
SimpleJob.reset();
NotSoSimpleJob.reset();
Thread.sleep(2000);
- Assert.assertTrue("SimpleJob was not executed",
SimpleJob.wasExecuted);
- Assert.assertTrue("NotSoSimpleJob was not executed",
NotSoSimpleJob.wasExecuted);
- Assert.assertTrue("NotSoSimpleJob was not serviced",
NotSoSimpleJob.wasServiced);
+ assertTrue(SimpleJob.wasExecuted, "SimpleJob was not executed");
+ assertTrue(NotSoSimpleJob.wasExecuted, "NotSoSimpleJob was not
executed");
+ assertTrue(NotSoSimpleJob.wasServiced, "NotSoSimpleJob was not
serviced");
}
}
Modified: turbine/fulcrum/trunk/quartz/src/test/quartz.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/quartz.xml?rev=1854166&r1=1854165&r2=1854166&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/test/quartz.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/test/quartz.xml Fri Feb 22 18:56:25 2019
@@ -34,7 +34,7 @@
file), and over-write is false, ignore them rather then
generating an error -->
<ignore-duplicates>false</ignore-duplicates>
</processing-directives>
-<schedule>
+ <schedule>
<job>
<name>simpleJob</name>
<group>TURBINE</group>
