Author: gk
Date: Tue Dec 18 15:43:23 2018
New Revision: 1849183
URL: http://svn.apache.org/viewvc?rev=1849183&view=rev
Log:
- Update changes, site info
- Reorder imports
Modified:
turbine/fulcrum/trunk/testcontainer/src/changes/changes.xml
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
turbine/fulcrum/trunk/testcontainer/xdocs/index.xml
Modified: turbine/fulcrum/trunk/testcontainer/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/changes/changes.xml?rev=1849183&r1=1849182&r2=1849183&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/src/changes/changes.xml Tue Dec 18
15:43:23 2018
@@ -24,11 +24,27 @@
<!-- author email="[email protected]">Quinton McCombs</author -->
</properties>
<body>
- <release version="1.0.8" date="in Subversion">
- <action type="update" dev="gk">
- Add support for JUnit 5
- </action>
- </release>
+ <release version="1.0.8" date="in Subversion">
+ <action type="update" dev="painter">
+ Update Fulcrum dependencies
+ </action>
+ <action type="update" dev="gk">
+ Add support for JUnit 5.
+ Use in surefire testing now the default fork model ( reuseForks =
true, forkCount=1).
+ </action>
+ <action type="update" dev="gk">
+ Update to Log4J2 Core with Log4J1.2 bridge v2.11.1, Jupiter v5.3.2,
Platform v1.3.2.
+ </action>
+ <action type="fix" dev="painter">
+ Fix build, Javadoc, Update Mockito v2.23.0
+ </action>
+ <action type="update" dev="tv">
+ Update parent
+ </action>
+ <action type="update" dev="sgoeschl">
+ Clean up the source code and javadocs.
+ </action>
+ </release>
<release version="1.0.7" date="2015-08-08">
<action type="update" dev="gk">
Added JUnit 4 Support
Modified:
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java?rev=1849183&r1=1849182&r2=1849183&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
Tue Dec 18 15:43:23 2018
@@ -57,7 +57,6 @@ import org.mockito.stubbing.Answer;
* @author <a href="mailto:[email protected]";>Quinton McCombs</a>
* @version $Id$
*/
-//@RunWith(JUnitPlatform.class)
public class BaseUnit5Test
{
public static final String CONTAINER_ECM = "CONTAINER_ECM";
Modified:
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java?rev=1849183&r1=1849182&r2=1849183&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
Tue Dec 18 15:43:23 2018
@@ -1,17 +1,5 @@
package org.apache.fulcrum.testcontainer;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.io.File;
-
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,6 +19,17 @@ import org.junit.jupiter.api.Test;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.File;
+
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
/**
* Basic testing of the Container
Modified: turbine/fulcrum/trunk/testcontainer/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/xdocs/index.xml?rev=1849183&r1=1849182&r2=1849183&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/xdocs/index.xml Tue Dec 18 15:43:23 2018
@@ -31,26 +31,25 @@
<section name="Overview">
<p> This component is really just a test container for testing the other
components. This
container is not meant to be used in a production environment. </p>
- <p> In order to save you a little coding, a base class has been provided
for your test cases.
- Simply extend
<code>org.apache.fulcrum.testcontainer.BaseUnitTest</code> for JUnit3,
<code>org.apache.fulcrum.testcontainer.BaseUnit4Test</code> for JUnit 4 and
<code>org.apache.fulcrum.testcontainer.BaseUnit5Test</code> JUnit 5 support and
you are ready to go.</p>
-
- <p>Find more Information about <a
href="https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4-running";>migration
to Junit5 here</a>.
- </p>
+
+ <subsection name="JUnit Integration">
+ <p>Find more information about <a
href="https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4-running";>migration
to Junit5 here</a>. JUnit 3 and JUnit 4
((<code>org.apache.fulcrum.testcontainer.BaseUnitTest</code>,
<code>org.apache.fulcrum.testcontainer.BaseUnit4Test</code>) are still
supported.
+ IDEs (Eclipse/IntelliJ 2018.x) and Surefire Plugin 3.x should be able
to handle all flavors. Running a JUnit 4 test in older IDE versions may require
a test class annotation (@RunWith(JUnitPlatform.class)).</p>
+ </subsection>
</section>
<section name="Usage">
+
+ <subsection name="Extending the test case">
+ <p> In order to save you a little coding, a base class has been
provided for your test cases.
+ Simply extend
<code>org.apache.fulcrum.testcontainer.BaseUnit5Test</code> for JUnit 5 and you
are ready to go!</p>
- <subsection name="Extending the test case">
- <p> In order to save you a little coding, a base class has been
provided for your test
- cases. Simply extend
<code>org.apache.fulcrum.testcontainer.BaseUnitTest</code> and you
- are ready to go.
- </p>
- <p> The <code>lookup</code> and <code>tearDown</code> methods of
<code>BaseUnitTest</code>
+ <p> The <code>lookup</code> and <code>tearDown</code> methods of
<code>BaseUnit5Test</code>
will handle the lifecycle of the container for you. Each test will
have a freshly
initialized container in which to run.
</p>
<p> To lookup and release components, call the <code>lookup</code> and
<code>release</code>
- methods of <code>BaseUnitTest</code>.
+ methods of <code>BaseUnit5Test</code>.
</p>
<p> By default, all tests will use the configuration files
<code>TestComponentConfig.xml</code> and
<code>TestRoleConfig.xml</code> located in the
@@ -64,8 +63,8 @@
running in (e.g. src/test/YOUR_CONFIG.xml).
</p>
<p> You can choose between two container implementations, the ECM and
Fulcrum YAAFI. For this
- just assign one of the values BaseUnitTest.CONTAINER_ECM or
BaseUnitTest.CONTAINER_YAAFI to
- the static variable BaseUnitTest.containerType before doing the
first lookup. The default
+ just assign one of the values BaseUnit5Test.CONTAINER_ECM or
BaseUnit5Test.CONTAINER_YAAFI to
+ the static variable BaseUnit5Test.containerType before doing the
first lookup. The default
container is Fulcrum YAAFI.
</p>
</subsection>
