svn commit: r1851394 - in /turbine/fulcrum/trunk/xslt: src/test/org/apache/fulcrum/xslt/XSLTServiceFacadeTest.java src/test/org/apache/fulcrum/xslt/XSLTServiceTest.java xdocs/changes.xml

[pa...@apache.org]

Author: painter
Date: Tue Jan 15 16:24:03 2019
New Revision: 1851394

URL: http://svn.apache.org/viewvc?rev=1851394&view=rev
Log:
Move location of changes.xml, update to JUnit 5

Removed:
    turbine/fulcrum/trunk/xslt/xdocs/changes.xml
Modified:
    turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceFacadeTest.java
    turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceTest.java

Modified: turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceFacadeTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceFacadeTest.java?rev=1851394&r1=1851393&r2=1851394&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceFacadeTest.java (original)
+++ turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceFacadeTest.java Tue Jan 15 16:24:03 2019
@@ -1,5 +1,7 @@
 package org.apache.fulcrum.xslt;
 
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +23,7 @@ package org.apache.fulcrum.xslt;
 
 
 import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.junit.jupiter.api.Test;
 
 
 /**
@@ -29,19 +32,10 @@ import org.apache.fulcrum.testcontainer.
  * @author <a href="epugh@upstate.com">Eric Pugh</a>
  * @version $Id$
  */
-public class XSLTServiceFacadeTest extends BaseUnitTest
+public class XSLTServiceFacadeTest extends BaseUnit5Test
 {
-    /**
-     * Defines the testcase name for JUnit.
-     *
-     * @param name the testcase's name.
-     */
-    public XSLTServiceFacadeTest(String name)
-    {
-        super(name);
-    }
-
 
+	@Test
     public void testWorkflowFacadeNotConfigured() throws Exception
     {
         try
@@ -54,6 +48,7 @@ public class XSLTServiceFacadeTest exten
         }
     }
 
+	@Test
     public void testWorkflowFacadeConfigured() throws Exception
     {
     	// this.lookup causes the workflow service to be configured.

Modified: turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceTest.java?rev=1851394&r1=1851393&r2=1851394&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceTest.java (original)
+++ turbine/fulcrum/trunk/xslt/src/test/org/apache/fulcrum/xslt/XSLTServiceTest.java Tue Jan 15 16:24:03 2019
@@ -1,5 +1,6 @@
 package org.apache.fulcrum.xslt;
 
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -20,16 +21,22 @@ package org.apache.fulcrum.xslt;
  */
 
 
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+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.Reader;
 import java.io.FileReader;
-import java.io.Writer;
 import java.io.FileWriter;
+import java.io.Reader;
+import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * XSLTServiceTest
  *
@@ -37,23 +44,14 @@ import java.util.Map;
  * @author <a href="epugh@upstate.com">Eric Pugh</a>
  * @version $Id$
  */
-public class XSLTServiceTest extends BaseUnitTest
+public class XSLTServiceTest extends BaseUnit5Test
 {
     private XSLTService xsltService = null;
 
-    /**
-     * Defines the testcase name for JUnit.
-     *
-     * @param name the testcase's name.
-     */
-    public XSLTServiceTest(String name)
-    {
-        super(name);
-    }
 
+    @BeforeEach
     protected void setUp() throws Exception
     {
-        super.setUp();
         try
         {
             xsltService = (XSLTService) this.lookup(XSLTService.ROLE);
@@ -68,6 +66,7 @@ public class XSLTServiceTest extends Bas
      * Simple test that verify an object can be created and deleted.
      * @throws Exception the test failed
      */
+    @Test
     public void testPath() throws Exception
     {
         assertNotNull(xsltService);
@@ -79,6 +78,7 @@ public class XSLTServiceTest extends Bas
      *
      * @throws Exception the test failed
      */
+    @Test
     public void testTransform() throws Exception
     {
         Reader reader = new FileReader("./pom.xml");
@@ -93,6 +93,7 @@ public class XSLTServiceTest extends Bas
      *
      * @throws Exception the test failed
      */
+    @Test
     public void testTransformXsltOnly() throws Exception
     {
         Map values = new HashMap();