You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2014/08/09 19:03:08 UTC
svn commit: r1616993 - in /turbine/core/trunk/src/test/org/apache/turbine:
modules/ modules/actions/ modules/layouts/ modules/pages/
services/avaloncomponent/ services/jsonrpc/ services/schedule/
services/template/ services/template/modules/layouts/ se...
Author: tv
Date: Sat Aug 9 17:03:07 2014
New Revision: 1616993
URL: http://svn.apache.org/r1616993
Log:
Clean up tests for Junit 4
Modified:
turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
turbine/core/trunk/src/test/org/apache/turbine/modules/layouts/TestVelocityOnlyLayout.java
turbine/core/trunk/src/test/org/apache/turbine/modules/pages/TestVelocityPage.java
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/jsonrpc/JsonrpcServicelTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/DefaultsTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/ExistPageWithClass.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/PageWithClass.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/dflt/Default.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/ExistPageWithClass.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/PageWithClass.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/dflt/Default.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/ExistPageWithClass.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/PageWithClass.java
turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/dflt/Default.java
turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java
turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java
turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java Sat Aug 9 17:03:07 2014
@@ -19,13 +19,11 @@
package org.apache.turbine.modules;
-import static org.junit.Assert.assertEquals;
-
import java.util.Vector;
import javax.servlet.http.HttpServletResponse;
-import junit.framework.Assert;
+import static org.junit.Assert.*;
import org.apache.turbine.modules.layouts.TestVelocityOnlyLayout;
import org.apache.turbine.om.security.User;
@@ -53,7 +51,7 @@ public class LayoutLoaderTest extends Ba
private EnhancedMockHttpServletRequest request = null;
private EnhancedMockHttpSession session = null;
private HttpServletResponse response = null;
-
+
@BeforeClass
public static void init() {
tc = new TurbineConfig(
@@ -108,14 +106,14 @@ public class LayoutLoaderTest extends Ba
LayoutLoader.getInstance().exec(pipelineData, data.getLayout());
} catch (Exception e) {
e.printStackTrace();
- Assert.fail("Should not have thrown an exception.");
+ fail("Should not have thrown an exception.");
}
assertEquals(numberOfCalls+1,TestVelocityOnlyLayout.numberOfCalls);
}
catch (Exception e)
{
e.printStackTrace();
- Assert.fail("Should not have thrown an exception.");
+ fail("Should not have thrown an exception.");
}
}
@Test
@@ -130,14 +128,14 @@ public class LayoutLoaderTest extends Ba
LayoutLoader.getInstance().exec(data, data.getLayout());
} catch (Exception e) {
e.printStackTrace();
- Assert.fail("Should not have thrown an exception.");
+ fail("Should not have thrown an exception.");
}
assertEquals(numberOfCalls+1,TestVelocityOnlyLayout.numberOfCalls);
}
catch (Exception e)
{
e.printStackTrace();
- Assert.fail("Should not have thrown an exception.");
+ fail("Should not have thrown an exception.");
}
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java Sat Aug 9 17:03:07 2014
@@ -20,7 +20,7 @@ package org.apache.turbine.modules.actio
*/
-import junit.framework.Assert;
+import static org.junit.Assert.*;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -46,6 +46,7 @@ public class VelocityActionDoesNothing e
* @param context Context to populate
* @exception Exception Thrown on error
*/
+ @Override
public void doPerform(RunData data, Context context) throws Exception
{
log.debug("Calling doPerform");
@@ -60,12 +61,13 @@ public class VelocityActionDoesNothing e
* @param context Context to populate
* @exception Exception Thrown on error
*/
+ @Override
public void doPerform(PipelineData pipelineData, Context context) throws Exception
{
log.debug("Calling doPerform(PipelineData)");
VelocityActionDoesNothing.numberOfCalls++;
RunData rd = (RunData)pipelineData;
- Assert.assertNotNull("RunData object was Null.", rd);
+ assertNotNull("RunData object was Null.", rd);
VelocityActionDoesNothing.pipelineDataCalls++;
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java Sat Aug 9 17:03:07 2014
@@ -20,7 +20,7 @@ package org.apache.turbine.modules.actio
*/
-import junit.framework.Assert;
+import static org.junit.Assert.*;
import org.apache.fulcrum.factory.FactoryService;
import org.apache.turbine.annotation.TurbineService;
@@ -54,6 +54,7 @@ public class VelocityActionWithServiceIn
* @param context Context to populate
* @exception Exception Thrown on error
*/
+ @Override
public void doPerform(RunData data, Context context) throws Exception
{
log.debug("Calling doPerform");
@@ -66,14 +67,15 @@ public class VelocityActionWithServiceIn
* @param context Context to populate
* @exception Exception Thrown on error
*/
+ @Override
public void doPerform(PipelineData pipelineData, Context context) throws Exception
{
log.debug("Calling doPerform(PipelineData)");
- Assert.assertNotNull("runDataService object was Null.", runDataService);
+ assertNotNull("runDataService object was Null.", runDataService);
log.debug("Injected service is " + runDataService.getName());
- Assert.assertNotNull("runDataService2 object was Null.", runDataService2);
+ assertNotNull("runDataService2 object was Null.", runDataService2);
log.debug("Injected service is " + runDataService2.getName());
- Assert.assertNotNull("factory object was Null.", factory);
+ assertNotNull("factory object was Null.", factory);
log.debug("Injected service is " + factory.getClass());
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/layouts/TestVelocityOnlyLayout.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/layouts/TestVelocityOnlyLayout.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/layouts/TestVelocityOnlyLayout.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/layouts/TestVelocityOnlyLayout.java Sat Aug 9 17:03:07 2014
@@ -19,7 +19,7 @@ package org.apache.turbine.modules.layou
* under the License.
*/
-import junit.framework.Assert;
+import static org.junit.Assert.*;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -32,16 +32,18 @@ public class TestVelocityOnlyLayout exte
{
public static int numberOfCalls = 0;
+ @Override
public void doBuild(PipelineData pipelineData)
{
numberOfCalls++;
RunData data = getRunData(pipelineData);
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doBuild(RunData runData)
{
numberOfCalls++;
- Assert.assertNotNull("RunData object is null.", runData);
+ assertNotNull("RunData object is null.", runData);
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/pages/TestVelocityPage.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/pages/TestVelocityPage.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/pages/TestVelocityPage.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/pages/TestVelocityPage.java Sat Aug 9 17:03:07 2014
@@ -19,7 +19,7 @@ package org.apache.turbine.modules.pages
* under the License.
*/
-import junit.framework.Assert;
+import static org.junit.Assert.*;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -32,57 +32,65 @@ public class TestVelocityPage extends Ve
public static int numberOfCalls = 0;
+ @Override
public void doBuild(PipelineData pipelineData) throws Exception
{
numberOfCalls++;
super.doBuild(pipelineData);
RunData data = getRunData(pipelineData);
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doBuild(RunData runData) throws Exception
{
numberOfCalls++;
super.doBuild(runData);
- Assert.assertNotNull("RunData object is null.", runData);
+ assertNotNull("RunData object is null.", runData);
}
+ @Override
public void doBuildBeforeAction(PipelineData pipelineData) throws Exception
{
numberOfCalls++;
RunData data = getRunData(pipelineData);
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doPostBuild(PipelineData pipelineData) throws Exception
{
numberOfCalls++;
RunData data = getRunData(pipelineData);
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doBuildBeforeAction(RunData data) throws Exception
{
numberOfCalls++;
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doPostBuild(RunData data) throws Exception
{
numberOfCalls++;
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doBuildAfterAction(RunData data) throws Exception
{
numberOfCalls++;
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
+ @Override
public void doBuildAfterAction(PipelineData pipelineData) throws Exception
{
numberOfCalls++;
RunData data = getRunData(pipelineData);
- Assert.assertNotNull("RunData object is null.", data);
+ assertNotNull("RunData object is null.", data);
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java Sat Aug 9 17:03:07 2014
@@ -21,7 +21,8 @@ package org.apache.turbine.services.aval
*/
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
@@ -29,8 +30,6 @@ import org.apache.turbine.services.Servi
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.test.TestComponent;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/jsonrpc/JsonrpcServicelTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/jsonrpc/JsonrpcServicelTest.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/jsonrpc/JsonrpcServicelTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/jsonrpc/JsonrpcServicelTest.java Sat Aug 9 17:03:07 2014
@@ -25,14 +25,11 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.services.pull.tools.UIToolTest;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
import com.metaparadigm.jsonrpc.JSONRPCBridge;
@@ -41,7 +38,7 @@ public class JsonrpcServicelTest
{
private static TurbineConfig turbineConfig = null;
-
+
@BeforeClass
public static void setUp() throws Exception {
// serviceManager = TurbineServices.getInstance();
@@ -54,7 +51,7 @@ public class JsonrpcServicelTest
turbineConfig = new TurbineConfig(".", initParams);
turbineConfig.initialize();
}
-
+
@AfterClass
public static void destroy() throws Exception {
turbineConfig.dispose();
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=1616993&r1=1616992&r2=1616993&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 Sat Aug 9 17:03:07 2014
@@ -83,10 +83,10 @@ public class TurbineNonPersistentSchedul
try
{
TurbineScheduler.startScheduler();
- assertEquals(true, TurbineScheduler.isEnabled());
+ assertTrue(TurbineScheduler.isEnabled());
TurbineScheduler.stopScheduler();
- assertEquals(false, TurbineScheduler.isEnabled());
+ assertFalse(TurbineScheduler.isEnabled());
}
catch (Exception e)
{
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/DefaultsTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/DefaultsTest.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/DefaultsTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/DefaultsTest.java Sat Aug 9 17:03:07 2014
@@ -22,6 +22,8 @@ package org.apache.turbine.services.temp
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
@@ -42,7 +44,7 @@ public class DefaultsTest
private static TurbineConfig tc = null;
private static TemplateService ts = null;
-
+
@BeforeClass
public static void setUp() throws Exception {
tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
@@ -61,13 +63,13 @@ public class DefaultsTest
public void testDefaults()
{
// Test if the caching property was loaded correctly. (key:module.cache)
- assertEquals("isCaching failed!",false, ts.isCaching());
+ assertFalse("isCaching failed!", ts.isCaching());
// Test if the default values for Template and Extension were loaded correctly
assertEquals("Default Extension failed", ts.getDefaultExtension(), "");
assertEquals("Default Template failed", ts.getDefaultTemplate(), TemplateService.DEFAULT_TEMPLATE_VALUE);
}
-
+
@Test
public void testTemplateDefaults()
{
@@ -78,7 +80,7 @@ public class DefaultsTest
assertEquals("Default Navigation failed", TemplateService.DEFAULT_TEMPLATE_VALUE, ts.getDefaultNavigation());
assertEquals("Default LayoutTemplate failed", TemplateService.DEFAULT_TEMPLATE_VALUE, ts.getDefaultLayoutTemplate());
}
-
+
@Test
public void testVelocityDefaults()
{
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/ExistPageWithClass.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/ExistPageWithClass.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/ExistPageWithClass.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/ExistPageWithClass.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.layout
public class ExistPageWithClass
extends VelocityOnlyLayout
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/PageWithClass.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/PageWithClass.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/PageWithClass.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/PageWithClass.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.layout
public class PageWithClass
extends VelocityOnlyLayout
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/dflt/Default.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/dflt/Default.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/dflt/Default.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/layouts/existing/dflt/Default.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.layout
public class Default
extends VelocityOnlyLayout
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/ExistPageWithClass.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/ExistPageWithClass.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/ExistPageWithClass.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/ExistPageWithClass.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.naviga
public class ExistPageWithClass
extends VelocityNavigation
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/PageWithClass.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/PageWithClass.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/PageWithClass.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/PageWithClass.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.naviga
public class PageWithClass
extends VelocityNavigation
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/dflt/Default.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/dflt/Default.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/dflt/Default.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/navigations/existing/dflt/Default.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.naviga
public class Default
extends VelocityNavigation
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/ExistPageWithClass.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/ExistPageWithClass.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/ExistPageWithClass.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/ExistPageWithClass.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.screen
public class ExistPageWithClass
extends VelocityScreen
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/PageWithClass.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/PageWithClass.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/PageWithClass.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/PageWithClass.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.screen
public class PageWithClass
extends VelocityScreen
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/dflt/Default.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/dflt/Default.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/dflt/Default.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/template/modules/screens/existing/dflt/Default.java Sat Aug 9 17:03:07 2014
@@ -33,5 +33,6 @@ import org.apache.turbine.modules.screen
public class Default
extends VelocityScreen
{
+ // empty
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java Sat Aug 9 17:03:07 2014
@@ -61,6 +61,7 @@ public class HsqlDB
}
catch (Exception e)
{
+ // ignore
}
}
@@ -72,11 +73,11 @@ public class HsqlDB
{
statement = connection.createStatement();
String commands = getFileContents(fileName);
-
+
for (int targetPos = commands.indexOf(';'); targetPos > -1; targetPos = commands.indexOf(';'))
{
String cmd = commands.substring(0, targetPos + 1).trim();
-
+
if (cmd.startsWith("--"))
{
// comment
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java Sat Aug 9 17:03:07 2014
@@ -40,14 +40,19 @@ public class TestComponentImpl
{
private String appRoot;
+ @Override
public void initialize() throws Exception
{
+ // empty
}
+ @Override
public void dispose()
{
+ // empty
}
+ @Override
public void test()
{
setupLogger(this, "TestComponent");
@@ -55,6 +60,7 @@ public class TestComponentImpl
getLogger().debug("componentAppRoot = "+appRoot);
}
+ @Override
public void contextualize(Context context) throws ContextException
{
appRoot = (String) context.get("componentAppRoot");
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java Sat Aug 9 17:03:07 2014
@@ -23,6 +23,8 @@ package org.apache.turbine.util.parser;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import java.math.BigDecimal;
@@ -70,7 +72,7 @@ public class BaseValueParserTest extends
try
{
parserService = (ParserService)TurbineServices.getInstance().getService(ParserService.ROLE);
- parser = (BaseValueParser) parserService.getParser(BaseValueParser.class);
+ parser = parserService.getParser(BaseValueParser.class);
}
catch (InstantiationException e)
{
@@ -84,7 +86,7 @@ public class BaseValueParserTest extends
@AfterClass
public static void tearDown()
{
- if (tc != null)
+ if (tc != null)
{
tc.dispose();
}
@@ -496,30 +498,30 @@ public class BaseValueParserTest extends
{
// no param
boolean result = parser.getBoolean("invalid");
- assertEquals(result, false);
+ assertFalse(result);
// default
result = parser.getBoolean("default", true);
- assertEquals(result, true);
+ assertTrue(result);
// true values - Case is intentional
parser.add("true1", "trUe");
result = parser.getBoolean("true1");
- assertEquals(result, true);
+ assertTrue(result);
parser.add("true2", "yEs");
result = parser.getBoolean("true2");
- assertEquals(result, true);
+ assertTrue(result);
parser.add("true3", "1");
result = parser.getBoolean("true3");
- assertEquals(result, true);
+ assertTrue(result);
parser.add("true4", "oN");
result = parser.getBoolean("true4");
- assertEquals(result, true);
+ assertTrue(result);
// unparsable value
parser.add("unparsable", "a");
result = parser.getBoolean("unparsable");
- assertEquals(result, false);
+ assertFalse(result);
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java?rev=1616993&r1=1616992&r2=1616993&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java Sat Aug 9 17:03:07 2014
@@ -20,6 +20,8 @@ package org.apache.turbine.util.uri;
*/
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import org.apache.fulcrum.parser.DefaultParameterParser;
import org.apache.fulcrum.parser.ParameterParser;
@@ -35,7 +37,7 @@ import org.junit.Test;
/**
* Testing of the TurbineURI class
- *
+ *
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
* @version $Id$
@@ -59,12 +61,12 @@ public class TurbineURITest extends Base
/**
* Performs any initialization that must happen before each test is run.
*/
-
- @Before
+
+ @Before
public void setup()
{
// Setup configuration
-
+
ServerData sd = new ServerData("www.testserver.com",
URIConstants.HTTP_PORT, URIConstants.HTTP, "/servlet/turbine",
"/context");
@@ -79,44 +81,33 @@ public class TurbineURITest extends Base
@AfterClass
public static void tearDown()
{
- if (tc != null)
+ if (tc != null)
{
tc.dispose();
}
-
+
}
@Test public void testAddRemove()
{
- assertEquals("TurbineURI should not have a pathInfo", false, turi
- .hasPathInfo());
- assertEquals("TurbineURI must not have a queryData", false, turi
- .hasQueryData());
+
+ assertFalse("TurbineURI should not have a pathInfo", turi.hasPathInfo());
+ assertFalse("TurbineURI must not have a queryData", turi.hasQueryData());
turi.addPathInfo("test", "x");
- assertEquals("TurbineURI must have a pathInfo", true, turi
- .hasPathInfo());
- assertEquals("TurbineURI must not have a queryData", false, turi
- .hasQueryData());
+ assertTrue("TurbineURI must have a pathInfo", turi.hasPathInfo());
+ assertFalse("TurbineURI must not have a queryData", turi.hasQueryData());
turi.removePathInfo("test");
- assertEquals("TurbineURI must not have a pathInfo", false, turi
- .hasPathInfo());
- assertEquals("TurbineURI must not have a queryData", false, turi
- .hasQueryData());
-
- assertEquals("TurbineURI should not have a queryData", false, turi
- .hasQueryData());
- assertEquals("TurbineURI must not have a pathInfo", false, turi
- .hasPathInfo());
+ assertFalse("TurbineURI must not have a pathInfo", turi.hasPathInfo());
+ assertFalse("TurbineURI must not have a queryData", turi.hasQueryData());
+
+ assertFalse("TurbineURI should not have a queryData", turi.hasQueryData());
+ assertFalse("TurbineURI must not have a pathInfo", turi.hasPathInfo());
turi.addQueryData("test", "x");
- assertEquals("TurbineURI must have a queryData", true, turi
- .hasQueryData());
- assertEquals("TurbineURI must not have a pathInfo", false, turi
- .hasPathInfo());
+ assertTrue("TurbineURI must have a queryData", turi.hasQueryData());
+ assertFalse("TurbineURI must not have a pathInfo", turi.hasPathInfo());
turi.removeQueryData("test");
- assertEquals("TurbineURI must not have a queryData", false, turi
- .hasQueryData());
- assertEquals("TurbineURI must not have a pathInfo", false, turi
- .hasPathInfo());
+ assertFalse("TurbineURI must not have a queryData", turi.hasQueryData());
+ assertFalse("TurbineURI must not have a pathInfo", turi.hasPathInfo());
}
@Test public void testEmptyAndNullQueryData()
@@ -163,15 +154,15 @@ public class TurbineURITest extends Base
@Test public void testAddParameterParser() throws InstantiationException
{
- ParameterParser pp = (ParameterParser) parserService.getParser(DefaultParameterParser.class);
+ ParameterParser pp = parserService.getParser(DefaultParameterParser.class);
pp.add("test", "");
turi.add(1, pp); // 1 = query data
assertEquals("/context/servlet/turbine?test=", turi.getRelativeLink());
turi.removeQueryData("test");
assertEquals("/context/servlet/turbine", turi.getRelativeLink());
-
+
parserService.putParser(pp);
- pp = (ParameterParser) parserService.getParser(DefaultParameterParser.class);
+ pp = parserService.getParser(DefaultParameterParser.class);
pp.add("test", (String) null);
turi.add(1, pp); // 1 = query data
// Should make the following work so as to be consistent with directly