Author: gk
Date: Thu Feb 7 16:14:46 2019
New Revision: 1853146
URL: http://svn.apache.org/viewvc?rev=1853146&view=rev
Log:
- use log4j-test.xml in tests
- until conf based logging is not removed, e.g. by setting log4.j into
ressources, fix bug
- pom.xml update surefire, mimetype, optional loading of jacoco code coverage
tool
- update test packages to JUnit 5
Added:
turbine/core/trunk/conf/test/log4j2-test.xml (with props)
Modified:
turbine/core/trunk/conf/test/log4j2.xml
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
Added: turbine/core/trunk/conf/test/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/log4j2-test.xml?rev=1853146&view=auto
==============================================================================
--- turbine/core/trunk/conf/test/log4j2-test.xml (added)
+++ turbine/core/trunk/conf/test/log4j2-test.xml Thu Feb 7 16:14:46 2019
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<Configuration status="info" verbose="true">
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </Console>
+ <File name="logfile" fileName="target/turbine-test.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.fulcrum" level="info" additivity="false">
+ <AppenderRef ref="logfile"/>
+ </Logger>
+ <Logger name="org.apache.turbine" level="debug" additivity="false">
+ <AppenderRef ref="logfile" />
+ <AppenderRef ref="console" level="info"/>
+ </Logger>
+ <Logger name="avalon" level="info" additivity="false">
+ <AppenderRef ref="logfile"/>
+ </Logger>
+ <Logger name="org.apache.logging.log4j" level="debug" additivity="false">
+ <AppenderRef ref="logfile"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="logfile"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: turbine/core/trunk/conf/test/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/core/trunk/conf/test/log4j2.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/log4j2.xml?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/log4j2.xml (original)
+++ turbine/core/trunk/conf/test/log4j2.xml Thu Feb 7 16:14:46 2019
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<Configuration status="trace" verbose="true">
+<!-- may change status to debug or trace -->
+<Configuration status="info" verbose="true">
<Appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Feb 7 16:14:46 2019
@@ -510,7 +510,7 @@
</resources>
<!-- cft. loading path https://logging.apache.org/log4j/2.x/manual/configuration.html -->
- <!--testResources>
+ <testResources>
<testResource>
<targetPath />
<directory>conf/test</directory>
@@ -518,7 +518,7 @@
<include>log4j2-test.xml</include>
</includes>
</testResource>
- </testResources-->
+ </testResources>
<plugins>
<!-- run optionally, use not as reporting plugin, as it exposes file
paths to artifacts and
@@ -552,11 +552,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0-M3</version><!-- override parent -->
<configuration>
<!--default setting is forkCount=1/reuseForks=true -->
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
+ <groups>!performance</groups>
</configuration>
</plugin>
<plugin>
@@ -822,6 +823,33 @@
</dependencies>
</plugin>
<!-- no fat jar -->
+ <!-- not activated, agent seems to block gpg agent ? -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.3</version>
+ <configuration>
+ <skip>true</skip> <!-- not skipping in profile apache-release by
setting -Djacoco.skip=true or in pom property -->
+ <excludes>
+ <exclude>*/*Test*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -834,8 +862,9 @@
<aggregate>false</aggregate>
</configuration>
</plugin>
- <plugin><!-- since 2.7 running the old report requires to register it
explicitely, otherwise the build may fail -->
+ <!-- since 2.7 running the old report requires to register it explicitely,
otherwise the build may fail -->
<!-- TODO resolve log4j2 logback double binding in parent, wait for
cobertura 2.8 probably, see
https://github.com/mojohaus/cobertura-maven-plugin/issues/36 -->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<reportSets>
@@ -846,6 +875,18 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <!-- select non-aggregate reports -->
+ <report>report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
@@ -959,7 +1000,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-mimetype</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.torque</groupId>
@@ -1131,6 +1172,14 @@
<skip>false</skip>
</configuration>
</plugin>
+ <!-- set active, may block gpg agent, use -Dgpg.useagent=false or kill
gpg agent before start -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <skip>${jacoco.skip}</skip><!-- by default false, but set in pom
-->
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -1191,6 +1240,7 @@
<log4j2.version>2.11.1</log4j2.version>
<dependency.check.skip>true</dependency.check.skip>
<torque.version>4.0</torque.version>
+ <jacoco.skip>true</jacoco.skip>
</properties>
</project>
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Thu Feb 7
16:14:46 2019
@@ -948,10 +948,19 @@ public class Turbine extends HttpServlet
if ( logConfPath != null )
{
- Path logFilePath = logConfPath.resolve( log4jFile );
+ Path log4jFilePath = Paths.get(log4jFile);
+ Path logFilePath = logConfPath.resolve( log4jFilePath );
if ( logFilePath != null && logFilePath.toFile().exists() )
{
log4jTarget = logFilePath.normalize();
+ } else {
+ // fall back just using the filename, if path match
+ if (log4jFilePath != null && log4jFilePath.getParent() != null
&& logConfPath.endsWith(log4jFilePath.getParent() )) {
+ logFilePath = logConfPath.resolve(
log4jFilePath.getFileName());
+ if ( logFilePath != null &&
logFilePath.toFile().exists() ) {
+ log4jTarget = logFilePath.normalize();
+ }
+ }
}
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java Thu
Feb 7 16:14:46 2019
@@ -49,6 +49,8 @@ public interface TurbineConstants
/** The key for the Log4J File */
String LOG4J2_CONFIG_FILE = "log4j2.file";
+ /** old key as a reminder */
+ String LOG4J_CONFIG_FILE = "log4j.file";
/** The default value for the Log4J File */
String LOG4J2_CONFIG_FILE_DEFAULT = "/WEB-INF/conf/log4j2.xml";
Modified:
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
Thu Feb 7 16:14:46 2019
@@ -1,5 +1,6 @@
package org.apache.turbine.annotation;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,13 +20,11 @@ package org.apache.turbine.annotation;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.lang.reflect.Method;
import java.util.List;
@@ -40,11 +39,12 @@ import org.apache.turbine.services.assem
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
/**
* Tests the various annotations
@@ -85,21 +85,21 @@ public class AnnotationProcessorTest
@TurbineService
private FactoryService factory;
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception
{
tc = new TurbineConfig(".",
"/conf/test/CompleteTurbineResources.properties");
tc.initialize();
}
- @AfterClass
+ @AfterAll
public static void destroy()
throws Exception
{
tc.dispose();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
// do nothing
@@ -203,7 +203,9 @@ public class AnnotationProcessorTest
}
}
- @Ignore("For performance tests only") @Test
+ //@Disabled("For performance tests only")
+ @Tag("performance") // ignore in surefire, activating seems to be still
buggy ?
+ @Test
public void testProcessingPerformance() throws TurbineException
{
long startTime = System.currentTimeMillis();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
Thu Feb 7 16:14:46 2019
@@ -22,9 +22,9 @@ package org.apache.turbine.pipeline;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.mockito.Mockito.mock;
import javax.servlet.ServletConfig;
@@ -37,11 +37,10 @@ import org.apache.turbine.om.security.Us
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
*
@@ -56,7 +55,7 @@ public class DefaultACLCreationValveTest
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -65,7 +64,7 @@ public class DefaultACLCreationValveTest
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -97,7 +96,7 @@ public class DefaultACLCreationValveTest
assertNotNull(runData.getACL());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
Thu Feb 7 16:14:46 2019
@@ -21,10 +21,10 @@ package org.apache.turbine.pipeline;
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -43,10 +43,11 @@ import org.apache.turbine.services.secur
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -64,7 +65,7 @@ public class DefaultLoginValveTest exten
private HttpSession session = null;
private SecurityService securityService = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -73,7 +74,7 @@ public class DefaultLoginValveTest exten
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -149,7 +150,7 @@ public class DefaultLoginValveTest exten
assertFalse(user.hasLoggedIn());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
Thu Feb 7 16:14:46 2019
@@ -19,7 +19,7 @@ package org.apache.turbine.pipeline;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,10 +35,10 @@ import org.apache.turbine.test.BaseTestC
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -55,7 +55,7 @@ public class DefaultSessionTimeoutValveT
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -64,7 +64,7 @@ public class DefaultSessionTimeoutValveT
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -122,7 +122,7 @@ public class DefaultSessionTimeoutValveT
assertEquals(3600, runData.getSession().getMaxInactiveInterval());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
Thu Feb 7 16:14:46 2019
@@ -21,11 +21,12 @@ package org.apache.turbine.pipeline;
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.assertFalse;
import static org.mockito.Mockito.mock;
+
import static org.mockito.Mockito.when;
import java.util.Vector;
@@ -42,10 +43,11 @@ import org.apache.turbine.om.security.Us
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -61,7 +63,7 @@ public class DefaultSessionValidationVal
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -70,7 +72,7 @@ public class DefaultSessionValidationVal
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -140,7 +142,7 @@ public class DefaultSessionValidationVal
assertTrue(user.hasLoggedIn());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSetEncodingValveTest.java
Thu Feb 7 16:14:46 2019
@@ -19,7 +19,7 @@ package org.apache.turbine.pipeline;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,10 +32,10 @@ import org.apache.turbine.TurbineConstan
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -52,7 +52,7 @@ public class DefaultSetEncodingValveTest
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -61,7 +61,7 @@ public class DefaultSetEncodingValveTest
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -115,7 +115,7 @@ public class DefaultSetEncodingValveTest
assertEquals("UTF-8", runData.getCharSet());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
Thu Feb 7 16:14:46 2019
@@ -21,7 +21,7 @@ package org.apache.turbine.pipeline;
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,10 +35,10 @@ import org.apache.turbine.test.BaseTestC
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -54,7 +54,7 @@ public class DetermineActionValveTest ex
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -63,7 +63,7 @@ public class DetermineActionValveTest ex
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -94,7 +94,7 @@ public class DetermineActionValveTest ex
assertEquals("TestAction",runData.getAction());
}
- @AfterClass
+ @AfterAll
public static void destroy() {
tc.dispose();
}
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
Thu Feb 7 16:14:46 2019
@@ -21,7 +21,7 @@ package org.apache.turbine.pipeline;
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,10 +35,10 @@ import org.apache.turbine.test.BaseTestC
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -54,7 +54,7 @@ public class DetermineTargetValveTest ex
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -63,7 +63,7 @@ public class DetermineTargetValveTest ex
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -113,7 +113,7 @@ public class DetermineTargetValveTest ex
assertEquals("",runData.getScreen());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
Thu Feb 7 16:14:46 2019
@@ -19,11 +19,10 @@ package org.apache.turbine.pipeline;
* specific language governing permissions and limitations
* 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.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -43,10 +42,11 @@ import org.apache.turbine.test.BaseTestC
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests ExecutePageValve.
@@ -62,7 +62,7 @@ public class ExecutePageValveTest extend
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- @BeforeClass
+ @BeforeAll
public static void init()
{
tc = new TurbineConfig(
@@ -71,7 +71,7 @@ public class ExecutePageValveTest extend
tc.initialize();
}
- @Before
+ @BeforeEach
public void setUpBefore() throws Exception
{
config = mock(ServletConfig.class);
@@ -109,7 +109,7 @@ public class ExecutePageValveTest extend
int numberOfCalls = VelocityActionDoesNothing.numberOfCalls;
pipeline.invoke(pipelineData);
- assertEquals("Assert action was called",numberOfCalls
+1,VelocityActionDoesNothing.numberOfCalls);
+ assertEquals(numberOfCalls +1,VelocityActionDoesNothing.numberOfCalls,
"Assert action was called");
User user = runData.getUser();
assertNotNull(user);
assertEquals("username", user.getName());
@@ -144,15 +144,15 @@ public class ExecutePageValveTest extend
int numberOfCalls = VelocitySecureActionDoesNothing.numberOfCalls;
int isAuthorizedCalls =
VelocitySecureActionDoesNothing.isAuthorizedCalls;
pipeline.invoke(pipelineData);
- assertEquals("Assert action was called",numberOfCalls
+1,VelocitySecureActionDoesNothing.numberOfCalls);
- assertEquals("Assert authorization was called",isAuthorizedCalls
+1,VelocitySecureActionDoesNothing.isAuthorizedCalls);
+ assertEquals(numberOfCalls +1,VelocitySecureActionDoesNothing.numberOfCalls,
"Assert action was called");
+ assertEquals(isAuthorizedCalls
+1,VelocitySecureActionDoesNothing.isAuthorizedCalls, "Assert authorization was
called");
User user = runData.getUser();
assertNotNull(user);
assertEquals("username", user.getName());
assertTrue(user.hasLoggedIn());
}
- @AfterClass
+ @AfterAll
public static void destroy()
{
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java
Thu Feb 7 16:14:46 2019
@@ -19,8 +19,9 @@ package org.apache.turbine.pipeline;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.StringReader;
import java.io.StringWriter;
@@ -29,8 +30,9 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -42,7 +44,7 @@ public class PipelineCreationTest
{
private Pipeline pipeline;
- @Before
+ @BeforeEach
public void setUp()
{
pipeline = new TurbinePipeline();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineTest.java
(original)
+++ turbine/core/trunk/src/test/org/apache/turbine/pipeline/PipelineTest.java
Thu Feb 7 16:14:46 2019
@@ -21,12 +21,13 @@ package org.apache.turbine.pipeline;
*/
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
import java.io.StringWriter;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
/**
* Tests TurbinePipeline.
@@ -66,7 +67,9 @@ public class PipelineTest
/**
* Tests the Pipeline throughput.
*/
- @Ignore("For performance tests only") @Test public void
testPipelinePerformance() throws Exception
+ //@Disabled("For performance tests only")
+ @Tag("performance")
+ @Test public void testPipelinePerformance() throws Exception
{
StringWriter writer = new StringWriter();
Pipeline pipeline = new TurbinePipeline();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java?rev=1853146&r1=1853145&r2=1853146&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
Thu Feb 7 16:14:46 2019
@@ -152,9 +152,9 @@ public class TurbineNonPersistentSchedul
try
{
int beforeCount = SimpleJob.getCounter();
- Thread.sleep(1200);
+ Thread.sleep(1600);// expect at least less than about two seconds
int afterCount = SimpleJob.getCounter();
- assertTrue(beforeCount < afterCount);
+ assertTrue(beforeCount + " should be before " + afterCount,
beforeCount < afterCount);
}
catch (Exception e)
