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 2021/02/06 16:54:04 UTC
svn commit: r1886259 [2/2] - in /turbine/core/trunk/src:
java/org/apache/turbine/ java/org/apache/turbine/annotation/
java/org/apache/turbine/modules/ java/org/apache/turbine/modules/actions/
java/org/apache/turbine/modules/screens/ java/org/apache/tur...
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java Sat Feb 6 16:54:03 2021
@@ -22,7 +22,6 @@ import java.util.ArrayList;
*/
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
/**
@@ -47,10 +46,10 @@ public class FormMessages
*/
public FormMessages()
{
- forms_messages = new Hashtable<String, List<String>>();
- fields_messages = new Hashtable<String, List<String>>();
- messages_fields = new Hashtable<String, List<String>>();
- forms_fields = new Hashtable<String, List<String>>();
+ forms_messages = new Hashtable<>();
+ fields_messages = new Hashtable<>();
+ messages_fields = new Hashtable<>();
+ forms_fields = new Hashtable<>();
}
/**
@@ -94,7 +93,7 @@ public class FormMessages
if ( !table.containsKey( key ) )
{
- values = new ArrayList<String>();
+ values = new ArrayList<>();
values.add( value );
table.put( key, values );
}
@@ -140,9 +139,9 @@ public class FormMessages
messageName = messages.get( i );
result[i].setMessage( messageName );
fields = getValues( messages_fields, messageName );
- for ( int j = 0; j < fields.size(); j++ )
+ for (String field : fields)
{
- fieldName = fields.get( j );
+ fieldName = field;
if ( formHasField( formName, fieldName ) )
{
result[i].setFieldName( fieldName );
@@ -192,9 +191,9 @@ public class FormMessages
private boolean formHasField( String formName, String fieldName )
{
List<String> fields = getValues( forms_fields, formName );
- for ( Iterator<String> iter = fields.iterator(); iter.hasNext(); )
+ for (String field : fields)
{
- if ( fieldName.equals( iter.next().toString() ) )
+ if ( fieldName.equals( field.toString() ) )
{
return true;
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java Sat Feb 6 16:54:03 2021
@@ -141,7 +141,7 @@ public class LocaleUtils
String charSet = Turbine.getConfiguration()
.getString(TurbineConstants.LOCALE_DEFAULT_CHARSET_KEY,
TurbineConstants.LOCALE_DEFAULT_CHARSET_DEFAULT);
-
+
if (StringUtils.isNotEmpty(charSet))
{
defaultCharSet = charSetForName(charSet);
@@ -177,7 +177,7 @@ public class LocaleUtils
log.debug("Charset now {}", charset);
}
}
-
+
// The fallback to end all fallbacks
if (charset == null)
{
@@ -214,21 +214,21 @@ public class LocaleUtils
{
String charset = Turbine.getConfiguration()
.getString(TurbineConstants.LOCALE_OVERRIDE_CHARSET_KEY);
-
+
if (StringUtils.isEmpty(charset))
{
return null;
}
-
+
return charSetForName(charset);
}
/**
* Get a Charset object for a given name
* This method does not throw exceptions on illegal input but returns null.
- *
+ *
* @param charSet the charset name
- *
+ *
* @return the Charset or null if it does not exist
*/
private static Charset charSetForName(String charSet)
@@ -241,8 +241,8 @@ public class LocaleUtils
{
log.error("Illegal default charset {}", charSet);
}
-
+
return null;
}
-
+
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java Sat Feb 6 16:54:03 2021
@@ -110,7 +110,7 @@ public class SecurityCheck
throws Exception
{
boolean value = false;
- TurbineAccessControlList acl = data.getACL();
+ TurbineAccessControlList<?> acl = data.getACL();
if (acl == null ||
!acl.hasRole(role))
{
@@ -173,7 +173,7 @@ public class SecurityCheck
throws Exception
{
boolean value = false;
- TurbineAccessControlList acl = data.getACL();
+ TurbineAccessControlList<?> acl = data.getACL();
if (acl == null ||
!acl.hasPermission(permission))
{
@@ -217,7 +217,7 @@ public class SecurityCheck
securityService.getPermissionManager().addPermission(permissionObject);
Role role = null;
- TurbineAccessControlList acl = data.getACL();
+ TurbineAccessControlList<?> acl = data.getACL();
RoleSet roles = acl.getRoles();
if(roles.size() > 0)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java Sat Feb 6 16:54:03 2021
@@ -179,7 +179,7 @@ public class TurbineConfig
*
* This is a specialized constructor that allows to configure
* Turbine easily in the common setups.
- *
+ *
* Check also {@link TurbineXmlConfig} to load a {@link #CONFIGURATION_PATH_KEY}.
*
* @param path The web application root (i.e. the path for file lookup).
@@ -307,7 +307,7 @@ public class TurbineConfig
@Override
public Enumeration<String> getInitParameterNames()
{
- return new Vector<String>(initParams.keySet()).elements();
+ return new Vector<>(initParams.keySet()).elements();
}
/**
@@ -440,7 +440,7 @@ public class TurbineConfig
@Override
public Enumeration<String> getAttributeNames()
{
- return new Vector<String>(attributes.keySet()).elements();
+ return new Vector<>(attributes.keySet()).elements();
}
// Unimplemented methods follow
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java Sat Feb 6 16:54:03 2021
@@ -34,9 +34,9 @@ package org.apache.turbine.util;
* printStackTrace()</code> methods, the stacktrace will contain
* the information about all exceptions thrown and caught on the way.
* </p>
- *
+ *
* <p> Running the following program </p>
- *
+ *
* <pre>
* 1 import org.apache.turbine.util.TurbineException;
* 2
@@ -69,10 +69,10 @@ package org.apache.turbine.util;
* 29 throw new Exception("baz");
* 30 }
* 31 }
- * </pre>
- *
+ * </pre>
+ *
* <p>Yields the following stacktrace: </p>
- *
+ *
* <pre>
* java.lang.Exception: baz: bar: foo
* at Test.c(Test.java:29)
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java Sat Feb 6 16:54:03 2021
@@ -25,16 +25,16 @@ import java.util.Map;
/**
* A class used for initialization of Turbine without a servlet container.
- *
+ *
* <p>
* If you need to use Turbine outside of a servlet container, you can
* use this class for initialization of the Turbine servlet.
* </p>
- *
+ *
* <pre>
* TurbineXmlConfig config = new TurbineXmlConfig(".", "conf/TurbineResources.properties");
* </pre>
- *
+ *
* <p>
* All paths referenced in TurbineResources.properties and the path to
* the properties file itself (the second argument) will be resolved
@@ -43,14 +43,14 @@ import java.util.Map;
* discarding the references to objects created above. They are not needed,
* once everything is initialized.
* </p>
- *
+ *
* <p>
* In order to initialize the Services Framework outside of the Turbine Servlet,
* you need to call the <code>init()</code> method. By default, this will
* initialize the Resource and Logging Services and any other services you
* have defined in your TurbineResources.properties file.
* </p>
- *
+ *
* TODO Make this class enforce the lifecycle contracts
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java Sat Feb 6 16:54:03 2021
@@ -41,12 +41,12 @@ import org.apache.turbine.services.pull.
* class, layour template, or anywhere else. The get methods should be used in
* your layout template(s) to construct the appropriate HTML tags.
* </p>
- *
+ *
*<p>
* Example usage of this tool to build the HEAD and BODY tags in your layout
* templates:
* </p>
- *
+ *
* <p>
* <code>
* ## Set defaults for all pages using this layout. Anything set here can<br>
@@ -88,7 +88,7 @@ import org.apache.turbine.services.pull.
* >
* </code>
* </p>
- *
+ *
* <p>
* Example usages of this tool in your screen templates:<br>
* <code>$page.addScript($content.getURI("myJavascript.js")<br>
@@ -107,22 +107,22 @@ public class HtmlPageAttributes
private String title;
/** Body Attributes */
- private final Map<String, String> bodyAttributes = new LinkedHashMap<String, String>();
+ private final Map<String, String> bodyAttributes = new LinkedHashMap<>();
/** Script references */
- private final List<String> scripts = new ArrayList<String>();
+ private final List<String> scripts = new ArrayList<>();
/** External references */
- private final List<LinkTag> linkTags = new ArrayList<LinkTag>();
+ private final List<LinkTag> linkTags = new ArrayList<>();
/** Inline styles */
- private final List<String> styles = new ArrayList<String>();
+ private final List<String> styles = new ArrayList<>();
/** Meta tags for the HEAD */
- private final Map<String, String> metaTags = new LinkedHashMap<String, String>();
+ private final Map<String, String> metaTags = new LinkedHashMap<>();
/** http-equiv tags */
- private final Map<String, String> httpEquivs = new LinkedHashMap<String, String>();
+ private final Map<String, String> httpEquivs = new LinkedHashMap<>();
/** Doctype */
private String doctype = null;
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java Sat Feb 6 16:54:03 2021
@@ -64,7 +64,7 @@ public class TemplateInfo
public TemplateInfo(RunData data)
{
this.data = data;
- tempStorage = new HashMap<String, Object>(10);
+ tempStorage = new HashMap<>(10);
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java Sat Feb 6 16:54:03 2021
@@ -99,7 +99,7 @@ public class TemplateSecurityCheck
return false;
}
- TurbineAccessControlList acl = data.getACL();
+ TurbineAccessControlList<?> acl = data.getACL();
if (acl == null || !acl.hasRole(role))
{
data.setScreen(getFailScreen());
@@ -122,7 +122,7 @@ public class TemplateSecurityCheck
throws Exception
{
boolean value = true;
- TurbineAccessControlList acl = data.getACL();
+ TurbineAccessControlList<?> acl = data.getACL();
if (acl == null || !acl.hasPermission(permission))
{
data.setScreen(getFailScreen());
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java Sat Feb 6 16:54:03 2021
@@ -1,28 +1,6 @@
package org.apache.turbine.util.uri;
-/*
- * 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.
- */
-
-
-import java.util.Iterator;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.util.RunData;
@@ -263,12 +241,13 @@ public class TemplateURI
* @param type Type of insertion (@see #add(char type, String name, String value))
* @param pp A ParameterParser.
*/
+ @Override
protected void add(int type,
ParameterParser pp)
{
- for(Iterator<?> it = pp.keySet().iterator(); it.hasNext();)
+ for (Object name : pp.keySet())
{
- String key = (String) it.next();
+ String key = (String) name;
if (!key.equalsIgnoreCase(CGI_ACTION_PARAM) &&
!key.equalsIgnoreCase(CGI_SCREEN_PARAM) &&
@@ -277,9 +256,9 @@ public class TemplateURI
String[] values = pp.getStrings(key);
if(values != null)
{
- for (int i = 0; i < values.length; i++)
+ for (String value : values)
{
- add(type, key, values[i]);
+ add(type, key, value);
}
}
else
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java Sat Feb 6 16:54:03 2021
@@ -894,10 +894,7 @@ public class TurbineURI
*/
protected void add(int type, List<URIParam> list)
{
- for (URIParam uriParam : list)
- {
- dataVectors[type].add(uriParam);
- }
+ dataVectors[type].addAll(list);
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java Sat Feb 6 16:54:03 2021
@@ -125,7 +125,7 @@ public class VelocityHtmlEmail extends H
{
this();
this.context = context;
- embmap = new Hashtable<String, String>();
+ embmap = new Hashtable<>();
}
/**
Modified: turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java Sat Feb 6 16:54:03 2021
@@ -56,7 +56,7 @@ public class ConfigurationTest extends B
private TurbineConfig tc = null;
private TurbineXmlConfig txc = null;
-
+
@After
public void close() {
if (tc != null) tc.dispose();
@@ -140,7 +140,7 @@ public class ConfigurationTest extends B
throw e;
}
}
-
+
@Test
public void testCreateTurbineWithIncludedConfiguration() throws Exception
{
@@ -148,7 +148,7 @@ public class ConfigurationTest extends B
try
{
tc.initialize();
-
+
Configuration configuration = Turbine.getConfiguration();
assertNotNull("No Configuration Object found!", configuration);
assertFalse("Make sure we have values", configuration.isEmpty());
Modified: turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java Sat Feb 6 16:54:03 2021
@@ -83,8 +83,8 @@ public class TurbineTest extends BaseTes
public void testDefaultInputEncoding() throws Exception
{
Turbine t = tc.getTurbine();
- assertNotNull(t.getDefaultInputEncoding());
- assertEquals(TurbineConstants.PARAMETER_ENCODING_DEFAULT, t.getDefaultInputEncoding());
+ assertNotNull(Turbine.getDefaultInputEncoding());
+ assertEquals(TurbineConstants.PARAMETER_ENCODING_DEFAULT, Turbine.getDefaultInputEncoding());
t.destroy();
}
@@ -92,8 +92,8 @@ public class TurbineTest extends BaseTes
public void testNonDefaultEncoding()
{
Turbine t = tc.getTurbine();
- t.getConfiguration().setProperty(TurbineConstants.PARAMETER_ENCODING_KEY, "UTF-8");
- assertNotNull(t.getDefaultInputEncoding());
- assertEquals("UTF-8", t.getDefaultInputEncoding());
+ Turbine.getConfiguration().setProperty(TurbineConstants.PARAMETER_ENCODING_KEY, "UTF-8");
+ assertNotNull(Turbine.getDefaultInputEncoding());
+ assertEquals("UTF-8", Turbine.getDefaultInputEncoding());
}
}
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -1,6 +1,11 @@
package org.apache.turbine.annotation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,8 +28,6 @@ package org.apache.turbine.annotation;
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;
@@ -39,7 +42,6 @@ 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.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -139,7 +141,7 @@ public class AnnotationProcessorTest
public void testRequiredRoleMethodProcess() throws Exception
{
RunData data = mock(RunData.class);
- TurbineAccessControlList acl = mock(TurbineAccessControlList.class);
+ TurbineAccessControlList<?> acl = mock(TurbineAccessControlList.class);
Role role = mock(Role.class);
when(role.getName()).thenReturn( "user" );
// Group group = mock(Group.class);
@@ -164,7 +166,7 @@ public class AnnotationProcessorTest
public void testRequiredRoleAdminMethodProcess() throws Exception
{
RunData data = mock(RunData.class);
- TurbineAccessControlList acl = mock(TurbineAccessControlList.class);
+ TurbineAccessControlList<?> acl = mock(TurbineAccessControlList.class);
Role role = mock(Role.class);
when(role.getName()).thenReturn( "user" );
// Group group = mock(Group.class);
@@ -187,7 +189,7 @@ public class AnnotationProcessorTest
public void testUnguardedMethodWProcessDefault() throws Exception
{
RunData data = mock(RunData.class);
- TurbineAccessControlList acl = mock(TurbineAccessControlList.class);
+ TurbineAccessControlList<?> acl = mock(TurbineAccessControlList.class);
Role role = mock(Role.class);
when(role.getName()).thenReturn( "user" );
// Group group = mock(Group.class);
@@ -203,7 +205,7 @@ public class AnnotationProcessorTest
}
}
- //@Disabled("For performance tests only")
+ //@Disabled("For performance tests only")
@Tag("performance") // ignore in surefire, activating seems to be still buggy ?
@Test
public void testProcessingPerformance() throws TurbineException
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java Sat Feb 6 16:54:03 2021
@@ -124,7 +124,7 @@ public class ActionLoaderTest extends Ba
when(request.getParameterValues("eventSubmit_doCauseexception")).thenReturn(new String[] { "foo" });
RunData data = getRunData(request, response, config);
PipelineData pipelineData = new DefaultPipelineData();
- Map<Class<?>, Object> runDataMap = new HashMap<Class<?>, Object>();
+ Map<Class<?>, Object> runDataMap = new HashMap<>();
runDataMap.put(RunData.class, data);
pipelineData.put(RunData.class, runDataMap);
data.setAction("VelocityActionThrowsException");
@@ -165,7 +165,7 @@ public class ActionLoaderTest extends Ba
assertFalse(Turbine.getConfiguration().getBoolean("action.event.bubbleexception"));
RunData data = getRunData(request, response, config);
PipelineData pipelineData = new DefaultPipelineData();
- Map<Class<?>, Object> runDataMap = new HashMap<Class<?>, Object>();
+ Map<Class<?>, Object> runDataMap = new HashMap<>();
runDataMap.put(RunData.class, data);
pipelineData.put(RunData.class, runDataMap);
data.setAction("VelocityActionThrowsException");
@@ -204,7 +204,7 @@ public class ActionLoaderTest extends Ba
when(request.getParameterValues("eventSubmit_doCauseexception")).thenReturn(new String[] { "foo" });
RunData data = getRunData(request, response, config);
PipelineData pipelineData = new DefaultPipelineData();
- Map<Class<?>, Object> runDataMap = new HashMap<Class<?>, Object>();
+ Map<Class<?>, Object> runDataMap = new HashMap<>();
runDataMap.put(RunData.class, data);
pipelineData.put(RunData.class, runDataMap);
data.setAction("VelocityActionThrowsException");
@@ -267,7 +267,7 @@ public class ActionLoaderTest extends Ba
{
RunData data = getRunData(request, response, config);
PipelineData pipelineData = new DefaultPipelineData();
- Map<Class<?>, Object> runDataMap = new HashMap<Class<?>, Object>();
+ Map<Class<?>, Object> runDataMap = new HashMap<>();
runDataMap.put(RunData.class, data);
pipelineData.put(RunData.class, runDataMap);
data.setAction("ImaginaryAction");
Modified: turbine/core/trunk/src/test/org/apache/turbine/om/MockRetrieverFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/om/MockRetrieverFactory.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/om/MockRetrieverFactory.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/om/MockRetrieverFactory.java Sat Feb 6 16:54:03 2021
@@ -33,14 +33,7 @@ public class MockRetrieverFactory implem
@Override
public Retriever getInstance(String className) throws Exception
{
- return new Retriever()
- {
- @Override
- public Object retrieve(String key) throws Exception
- {
- return new String(key);
- }
- };
+ return key -> new String(key);
}
}
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -97,7 +97,7 @@ public class DefaultLoginValveTest exten
@Test
public void testDefaults() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(LoginUser.CGI_USERNAME);
v.add(LoginUser.CGI_PASSWORD);
when(request.getParameterNames()).thenReturn(v.elements());
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -82,7 +82,7 @@ public class DefaultSessionTimeoutValveT
Turbine.getConfiguration().setProperty(TurbineConstants.SESSION_TIMEOUT_KEY,
Integer.valueOf(TurbineConstants.SESSION_TIMEOUT_DEFAULT));
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(URIConstants.CGI_ACTION_PARAM);
when(request.getParameterNames()).thenReturn(v.elements());
when(request.getParameterValues(URIConstants.CGI_ACTION_PARAM)).thenReturn(new String[] { "TestAction" });
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -44,7 +44,6 @@ import org.apache.turbine.test.BaseTestC
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
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;
@@ -85,7 +84,7 @@ public class DefaultSessionValidationVal
*/
@Test public void testAnonymousUser() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(LoginUser.CGI_USERNAME);
v.add(LoginUser.CGI_PASSWORD);
when(request.getParameterNames()).thenReturn(v.elements());
@@ -112,7 +111,7 @@ public class DefaultSessionValidationVal
@Test public void testLoggedInUser() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(LoginUser.CGI_USERNAME);
v.add(LoginUser.CGI_PASSWORD);
when(request.getParameterNames()).thenReturn(v.elements());
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -70,7 +70,7 @@ public class DetermineActionValveTest ex
request = getMockRequest();
response = mock(HttpServletResponse.class);
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(URIConstants.CGI_ACTION_PARAM);
when(request.getParameterNames()).thenReturn(v.elements());
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -76,7 +76,7 @@ public class DetermineTargetValveTest ex
*/
@Test public void testScreenSet() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(URIConstants.CGI_SCREEN_PARAM);
when(request.getParameterNames()).thenReturn(v.elements());
@@ -95,7 +95,7 @@ public class DetermineTargetValveTest ex
@Test public void testScreenNotSet() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(URIConstants.CGI_SCREEN_PARAM);
when(request.getParameterNames()).thenReturn(v.elements());
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -43,7 +43,6 @@ import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
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;
@@ -84,7 +83,7 @@ public class ExecutePageValveTest extend
@Test public void testValve() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(URIConstants.CGI_TEMPLATE_PARAM);
when(request.getParameterNames()).thenReturn(v.elements());
@@ -118,7 +117,7 @@ public class ExecutePageValveTest extend
@Test public void testValveWithSecureAction() throws Exception
{
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.add(URIConstants.CGI_TEMPLATE_PARAM);
when(request.getParameterNames()).thenReturn(v.elements());
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=1886259&r1=1886258&r2=1886259&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 Sat Feb 6 16:54:03 2021
@@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Asse
import java.io.StringWriter;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -67,8 +66,8 @@ public class PipelineTest
/**
* Tests the Pipeline throughput.
*/
- //@Disabled("For performance tests only")
- @Tag("performance")
+ //@Disabled("For performance tests only")
+ @Tag("performance")
@Test public void testPipelinePerformance() throws Exception
{
StringWriter writer = new StringWriter();
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=1886259&r1=1886258&r2=1886259&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 Feb 6 16:54:03 2021
@@ -43,7 +43,7 @@ public class JsonrpcServicelTest
// serviceManager = TurbineServices.getInstance();
// serviceManager.setApplicationRoot(".");
- Map<String, String> initParams = new HashMap<String, String>();
+ Map<String, String> initParams = new HashMap<>();
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, "conf/test/CompleteTurbineResources.properties"); // "conf/test/TurbineResources.properties"
initParams.put(TurbineConstants.LOGGING_ROOT_KEY, "target/test-logs");
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/localization/BarBundle_en_US.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/localization/BarBundle_en_US.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/localization/BarBundle_en_US.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/localization/BarBundle_en_US.java Sat Feb 6 16:54:03 2021
@@ -34,6 +34,7 @@ public class BarBundle_en_US extends Lis
{ "key4", "value4" }
};
+ @Override
protected Object[][] getContents()
{
return CONTENTS;
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java Sat Feb 6 16:54:03 2021
@@ -52,7 +52,7 @@ public class UIToolTest extends BaseTest
@BeforeClass
public static void setUp() throws Exception
{
- Map<String, String> initParams = new HashMap<String, String>();
+ Map<String, String> initParams = new HashMap<>();
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, "/conf/test/CompleteTurbineResources.properties"); // "conf/test/TurbineResources.properties"
initParams.put(TurbineConstants.LOGGING_ROOT_KEY, "target/test-logs");
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java Sat Feb 6 16:54:03 2021
@@ -199,11 +199,11 @@ public class TurbineURLMapperYAMLService
// /**
// * Not implemented Test for MappedTemplateLink:
-// * - To work with <i>MappedTemplateLink</i>, we need access to the urlmapperservice in order to
+// * - To work with <i>MappedTemplateLink</i>, we need access to the urlmapperservice in order to
// * - simulate a request without pipeline (setting velocity context and initializing the service):
// */
// @Test
-// public void testMappedURILink() {
+// public void testMappedURILink() {
// MappedTemplateLink ml = MappedTemplateLink.class.getDeclaredConstructor().newInstance();
// assertNotNull(ml);
// ml.setUrlMapperService(urlMapper);
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java Sat Feb 6 16:54:03 2021
@@ -29,12 +29,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Properties;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -42,17 +39,11 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.apache.turbine.TurbineConstants;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.util.RunData;
import org.junit.BeforeClass;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
/**
* Base functionality to be extended by all Apache Turbine test cases. Test
@@ -87,7 +78,7 @@ public abstract class BaseTestCase
return runData;
}
- protected Map<String,Object> attributes = new HashMap<String,Object>();
+ protected Map<String,Object> attributes = new HashMap<>();
protected int maxInactiveInterval = 0;
@SuppressWarnings("boxing")
@@ -96,48 +87,26 @@ public abstract class BaseTestCase
HttpServletRequest request = mock(HttpServletRequest.class);
HttpSession session = mock(HttpSession.class);
- doAnswer(new Answer<Object>()
- {
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable
- {
- String key = (String) invocation.getArguments()[0];
- return attributes.get(key);
- }
+ doAnswer(invocation -> {
+ String key = (String) invocation.getArguments()[0];
+ return attributes.get(key);
}).when(session).getAttribute(anyString());
- doAnswer(new Answer<Object>()
- {
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable
- {
- String key = (String) invocation.getArguments()[0];
- Object value = invocation.getArguments()[1];
- attributes.put(key, value);
- return null;
- }
+ doAnswer(invocation -> {
+ String key = (String) invocation.getArguments()[0];
+ Object value = invocation.getArguments()[1];
+ attributes.put(key, value);
+ return null;
}).when(session).setAttribute(anyString(), any());
when(session.getMaxInactiveInterval()).thenReturn(maxInactiveInterval);
- doAnswer(new Answer<Integer>()
- {
- @Override
- public Integer answer(InvocationOnMock invocation) throws Throwable
- {
- return Integer.valueOf(maxInactiveInterval);
- }
- }).when(session).getMaxInactiveInterval();
-
- doAnswer(new Answer<Object>()
- {
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable
- {
- Integer value = (Integer) invocation.getArguments()[0];
- maxInactiveInterval = value.intValue();
- return null;
- }
+ doAnswer(invocation -> Integer.valueOf(maxInactiveInterval)).when(session).getMaxInactiveInterval();
+
+ doAnswer(invocation -> {
+ Integer value = (Integer) invocation.getArguments()[0];
+ maxInactiveInterval = value.intValue();
+ return null;
}).when(session).setMaxInactiveInterval(anyInt());
when(session.isNew()).thenReturn(true);
@@ -158,7 +127,7 @@ public abstract class BaseTestCase
when(request.getHeader("Content-type")).thenReturn("html/text");
when(request.getHeader("Accept-Language")).thenReturn("en-US");
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
when(request.getParameterNames()).thenReturn(v.elements());
return request;
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/BaseTurbineTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/BaseTurbineTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/BaseTurbineTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/BaseTurbineTest.java Sat Feb 6 16:54:03 2021
@@ -44,7 +44,7 @@ public abstract class BaseTurbineTest
{
if (turbineConfig == null)
{
- Map<String, String> initParams = new HashMap<String, String>();
+ Map<String, String> initParams = new HashMap<>();
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, config); // "conf/test/TurbineResources.properties"
initParams.put(TurbineConstants.LOGGING_ROOT_KEY, "target/test-logs");
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=1886259&r1=1886258&r2=1886259&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 Feb 6 16:54:03 2021
@@ -1,25 +1,8 @@
package org.apache.turbine.test;
-/*
- * 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.
- */
-
-import java.io.FileReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -68,10 +51,8 @@ public class HsqlDB
private void loadSqlFile(String fileName)
throws Exception
{
- Statement statement = null;
- try
+ try (Statement statement = connection.createStatement())
{
- statement = connection.createStatement();
String commands = getFileContents(fileName);
for (int targetPos = commands.indexOf(';'); targetPos > -1; targetPos = commands.indexOf(';'))
@@ -102,30 +83,14 @@ public class HsqlDB
commands = commands.substring(targetPos + 2);
}
}
- finally
- {
- if (statement != null)
- {
- statement.close();
- }
- }
}
private String getFileContents(String fileName)
throws Exception
{
- FileReader fr = new FileReader(fileName);
-
- char fileBuf[] = new char[1024];
- StringBuffer sb = new StringBuffer(1000);
- int res = -1;
+ byte[] bytes = Files.readAllBytes(Paths.get(fileName));
- while ((res = fr.read(fileBuf, 0, 1024)) > -1)
- {
- sb.append(fileBuf, 0, res);
- }
- fr.close();
- return sb.toString();
+ return new String(bytes, StandardCharsets.ISO_8859_1);
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/TestComponent.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/TestComponent.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/TestComponent.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/TestComponent.java Sat Feb 6 16:54:03 2021
@@ -34,7 +34,7 @@ public interface TestComponent
extends Component
{
- static final String ROLE = "org.apache.turbine.test.TestComponent";
+ String ROLE = "org.apache.turbine.test.TestComponent";
void test();
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/testcontainer/BuildContainerWithDockerfileTest.java Sat Feb 6 16:54:03 2021
@@ -30,7 +30,7 @@ import org.testcontainers.junit.jupiter.
* Steps to run this
*
* Requirements:
- * <li>Unix: (Debian stretch tested):set <code>DOCKER_HOST=unix:///var/run/docker.sock</code> in docker-java.properties
+ * <li>Unix: (Debian stretch tested):set <code>DOCKER_HOST=unix:///var/run/docker.sock</code> in docker-java.properties
* (find the template in conf/docker-resources/db/dj.p.template) and comment out all other environment keys.
* <li>Windows 10: Docker Desktop should provide all required configuration by default or
* you need to create a local machine, e.g. with <code>docker-machine -d hyperv <vmname-default></code>
@@ -38,7 +38,7 @@ import org.testcontainers.junit.jupiter.
* <li>Windows 7/VirtualBox: copy DOCKER_* properties to ~/.docker-java.properties or docker-java.properties in classpath..
* To get the environment run: <code>docker-machine env default</code>, if your default docker machine is named default.
* Verify the name with <code>docker-machine ls</code>.
- *
+ *
* Turbine pom.xml has folder conf/docker-resources enabled as test-resource, you may put the files there.
* You may need to copy machines/<docker-machine-name>/certs from DOCKER_CERT_PATH to local path ~/.docker/machine/certs
*
@@ -48,10 +48,10 @@ import org.testcontainers.junit.jupiter.
* <li>To get results from <code>docker images</code>, you have to set the environment variables, see output from <code>docker-machine env <vmname></code>.
*
* Lookup of repository:
- *
- * Testcontainers checks
+ *
+ * Testcontainers checks
* <li>~/.testcontainers.properties, then <code>classpath/testcontainers.properties</code>
- * <li>~/.docker-java.properties, then docker-java.properties -> set DOCKER_* properties,
+ * <li>~/.docker-java.properties, then docker-java.properties -> set DOCKER_* properties,
* may set DOCKER_CERT_PATHalways with forward slashes.
* <li>At last also ~/.docker/config.json is checked for username/password for docker.io
* Additional
@@ -59,7 +59,7 @@ import org.testcontainers.junit.jupiter.
* <li>https://www.testcontainers.org/modules/databases/mysql/
* <li>https://www.testcontainers.org/modules/databases/#using-an-init-script-from-a-file
*
- * Bugs: docker virtualbox vm seems to auto pause.
+ * Bugs: docker virtualbox vm seems to auto pause.
* Check your docker vm with <code>docker-machine ls</code> and <code>docker-machine start <vmname></code>.
*
* @author gkallidis
@@ -69,28 +69,28 @@ import org.testcontainers.junit.jupiter.
@Testcontainers
@Tag("docker")
class BuildContainerWithDockerfileTest {
-
-
+
+
public static final String DOCKERFILE = "conf/docker-resources/db/Dockerfile";
-
+
private static Logger log = LogManager.getLogger();
-
+
public static int SERVICE_PORT = 3306;
public static String DATABASE_NAME = "default";
Connection connection;
-
+
@Container
//@ClassRule
public static GenericContainer MY_SQL_CONTAINER = new GenericContainer<>(
new ImageFromDockerfile()
// .withFileFromPath(
-// ".",
+// ".",
// new File("./conf/docker-resources/db/mysql/initdb.d").toPath())
-// .withDockerfileFromBuilder(
+// .withDockerfileFromBuilder(
// builder -> builder.from( "mysql:5.7.26" )
-// .add( "data.sql","/docker-entrypoint-initdb.d" )
+// .add( "data.sql","/docker-entrypoint-initdb.d" )
// )
.withDockerfile(new File(DOCKERFILE).toPath())
).withExposedPorts( SERVICE_PORT ) //.withStartupAttempts( 2 )
@@ -98,13 +98,13 @@ class BuildContainerWithDockerfileTest {
.withEnv( "MYSQL_USER", "userdb" )
.withEnv( "MYSQL_PASSWORD", "test1234" )
.withEnv( "MYSQL_ROOT_PASSWORD","test1234" );
-
+
// reduce dependencies, but might use for debugging
// MY_SQL_CONTAINER = new MySQLContainer<>()
// .withDatabaseName( DATABASE_NAME).withUsername( "userdb" ).withPassword( "test1234" )
// .withInitScript( "./db/mysql/initdb.d/data.sql" )
// .withExposedPorts( SERVICEPORT )
-
+
@BeforeAll
public static void init() {
@@ -148,7 +148,7 @@ class BuildContainerWithDockerfileTest {
resultSet.close();
}
}
-
+
@Test
@Order(3)
void selectNewUser() throws SQLException {
@@ -173,7 +173,7 @@ class BuildContainerWithDockerfileTest {
.getConnection(jdbcStr, "userdb", "test1234");
}
- // https://www.testcontainers.org/modules/databases/
+ // https://www.testcontainers.org/modules/databases/
// String.format("jdbc:tc:mysql:5.7.22://%s/%s", "dummy_host",
// "test"); this will use database test, but allows e.g. custom cfg: ?TC_MY_CNF=x.cfg
// TODO inform torque about mapped port, use overriding configuration in torque 4.1
@@ -182,22 +182,22 @@ class BuildContainerWithDockerfileTest {
if (!MY_SQL_CONTAINER.isRunning()) {
MY_SQL_CONTAINER.start();
}
-
+
String serviceHost = MY_SQL_CONTAINER.getContainerIpAddress();
Integer mappedPort = MY_SQL_CONTAINER.getMappedPort(SERVICE_PORT);// e.g. 32811
log.info("generate jdbc url from {}, mapped Port: {}, bounded port: {}", serviceHost, mappedPort, MY_SQL_CONTAINER.getBoundPortNumbers());
// if (MY_SQL_CONTAINER instanceof MySQLContainer) {
// String genJDBC = ((MySQLContainer)MY_SQL_CONTAINER).getJdbcUrl();
-// log.info( "generated connect url: {}", genJDBC);
+// log.info( "generated connect url: {}", genJDBC);
// }
- String targetJDBC =
+ String targetJDBC =
String.format("jdbc:mysql://%s:%d/%s?loggerLevel=OFF", serviceHost,
mappedPort, DATABASE_NAME);
- // changing the jdbc string prefix to jdbc:tc:mysql does handle the test database setup,
+ // changing the jdbc string prefix to jdbc:tc:mysql does handle the test database setup,
// https://www.testcontainers.org/modules/databases/jdbc/
log.info( "used connect url: {}", targetJDBC);
return targetJDBC;
}
-
+
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/testcontainer/UserManagerWithContainerTest.java Sat Feb 6 16:54:03 2021
@@ -33,7 +33,7 @@ import org.testcontainers.junit.jupiter.
*
* TODO
* This test might be more useful in a running turbine environment,
- * e.g. created by archetypes or in torque-test testing databases.
+ * e.g. created by archetypes or in torque-test testing databases.
*
* @author gkallidis
*
@@ -41,7 +41,7 @@ import org.testcontainers.junit.jupiter.
@TestMethodOrder(OrderAnnotation.class)
@Testcontainers
@Tag("docker")
-// requires manual port mapping in docker-manager/TorqueTest.properties,
+// requires manual port mapping in docker-manager/TorqueTest.properties,
//@Disabled
class UserManagerWithContainerTest {
@@ -51,12 +51,12 @@ class UserManagerWithContainerTest {
static TurbineConfig tc;
boolean onDeleteCascade = true;
-
+
private static Logger log = LogManager.getLogger();
-
+
@Container
private static GenericContainer MY_SQL_CONTAINER = BuildContainerWithDockerfileTest.MY_SQL_CONTAINER;
-
+
@BeforeAll
public static void init() {
@@ -67,7 +67,7 @@ class UserManagerWithContainerTest {
// get Torque component configuration and override torque.dsfactory.default.connection.url with url containing mapped port.
//Connection c = BuildContainerWithDockerfileTest.getConnection();
//MY_SQL_CONTAINER.getMappedPort( BuildContainerWithDockerfileTest.SERVICE_PORT );
-
+
String jdbcConnectionString = BuildContainerWithDockerfileTest.generateJdbcUrl();
String customUrl = "torque.dsfactory.default.connection.url="+ jdbcConnectionString;
// override and set mapped port in url, which is known only at runtime.
@@ -110,7 +110,7 @@ class UserManagerWithContainerTest {
assertTrue( turbineSecurityService.accountExists( user ) );
//assertTrue( turbineSecurityService.getUserManager().checkExists( user ) );
}
-
+
@Test
@Order(2)
@Tag("docker")
@@ -120,9 +120,9 @@ class UserManagerWithContainerTest {
try {
ringo = turbineSecurityService.getUser("ringo");
assertEquals("ringo", ringo.getFirstName());
-
+
deleteUser(ringo);
-
+
} catch (Exception sqle) {
log.error( "new user error",sqle);
fail();
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/template/HtmlPageAttributesTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/template/HtmlPageAttributesTest.java?rev=1886259&r1=1886258&r2=1886259&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/template/HtmlPageAttributesTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/template/HtmlPageAttributesTest.java Sat Feb 6 16:54:03 2021
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
*/
public class HtmlPageAttributesTest extends BaseTestCase
{
-
+
@TurbineConfiguration( TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_KEY )
private String defaultHtmlDoctypeRootElement = TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_DEFAULT;
@@ -49,7 +49,7 @@ public class HtmlPageAttributesTest exte
@TurbineConfiguration( TurbineConstants.DEFAULT_HTML_DOCTYPE_URI_KEY )
private String defaultHtmlDoctypeUri;
-
+
private static TurbineConfig tc = null;
@BeforeAll
@@ -71,14 +71,14 @@ public class HtmlPageAttributesTest exte
{
// do nothing
}
-
+
@Test public void testBuildDoctype() throws TurbineException
{
HtmlPageAttributes page = new HtmlPageAttributes();
assertEquals("<!DOCTYPE html>", page.getDoctype("html", null, null));
assertEquals("<!DOCTYPE html>", page.getDoctype("html", "", ""));
assertEquals("<!DOCTYPE html SYSTEM \"bla\">", page.getDoctype("html", "", "bla"));
-
+
// by default empty in HTML 5
assertEquals("<!DOCTYPE HTML>",
page.getDoctype(TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_DEFAULT,
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=1886259&r1=1886258&r2=1886259&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 Feb 6 16:54:03 2021
@@ -171,7 +171,7 @@ public class TurbineURITest extends Base
// added values.
assertEquals("/context/servlet/turbine?test=null",
turi.getRelativeLink());
-
+
turi.removeQueryData("test");
assertEquals("/context/servlet/turbine", turi.getRelativeLink());