aboutsummaryrefslogtreecommitdiff
path: root/velocity-engine-core/src
diff options
context:
space:
mode:
authorSergiu Dumitriu <sdumitriu@apache.org>2016-11-07 16:45:06 +0000
committerSergiu Dumitriu <sdumitriu@apache.org>2016-11-07 16:45:06 +0000
commit3fa16f8067b06a36805499a17264a8e2dec78bc8 (patch)
treef6d4bf2828f34776c2aefd97b8864ce931099f13 /velocity-engine-core/src
parent2c393ca819cb07cd79c1c44bebe12d4f5f0ef333 (diff)
downloadapache-velocity-engine-3fa16f8067b06a36805499a17264a8e2dec78bc8.tar.gz
[cleanup] Use platform newlines
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1768552 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src')
-rw-r--r--velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java152
-rw-r--r--velocity-engine-core/src/test/resources/issues/velocity-747/vel.props12
2 files changed, 82 insertions, 82 deletions
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
index 21f8a86b..1cd770c7 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
@@ -1,76 +1,76 @@
-package org.apache.velocity.test.issues;
-
-/*
- * 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 org.apache.velocity.test.BaseTestCase;
-
-/**
- * This class tests VELOCITY-736.
- */
-public class Velocity736TestCase extends BaseTestCase
-{
- public Velocity736TestCase(String name)
- {
- super(name);
- DEBUG = true;
- }
-
- public void testPublicMethodInheritedFromAbstractProtectedClass() throws Exception
- {
- try
- {
- toobig(100);
- }
- catch (Exception e)
- {
- context.put("e", e);
- assertEvalEquals("100", "$e.permittedSize");
- }
- }
-
- public void toobig(long permitted) throws Exception
- {
- throw new FileSizeLimitExceededException(permitted);
- }
-
- public static class FileUploadException extends Exception {}
-
- protected abstract static class SizeException extends FileUploadException
- {
- private final long permitted;
- protected SizeException(long permitted)
- {
- this.permitted = permitted;
- }
- public long getPermittedSize()
- {
- return this.permitted;
- }
- }
-
- public static class FileSizeLimitExceededException extends SizeException
- {
- public FileSizeLimitExceededException(long permitted)
- {
- super(permitted);
- }
- }
-
-}
+package org.apache.velocity.test.issues;
+
+/*
+ * 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 org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-736.
+ */
+public class Velocity736TestCase extends BaseTestCase
+{
+ public Velocity736TestCase(String name)
+ {
+ super(name);
+ DEBUG = true;
+ }
+
+ public void testPublicMethodInheritedFromAbstractProtectedClass() throws Exception
+ {
+ try
+ {
+ toobig(100);
+ }
+ catch (Exception e)
+ {
+ context.put("e", e);
+ assertEvalEquals("100", "$e.permittedSize");
+ }
+ }
+
+ public void toobig(long permitted) throws Exception
+ {
+ throw new FileSizeLimitExceededException(permitted);
+ }
+
+ public static class FileUploadException extends Exception {}
+
+ protected abstract static class SizeException extends FileUploadException
+ {
+ private final long permitted;
+ protected SizeException(long permitted)
+ {
+ this.permitted = permitted;
+ }
+ public long getPermittedSize()
+ {
+ return this.permitted;
+ }
+ }
+
+ public static class FileSizeLimitExceededException extends SizeException
+ {
+ public FileSizeLimitExceededException(long permitted)
+ {
+ super(permitted);
+ }
+ }
+
+}
diff --git a/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props b/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
index 083c46e0..5f379a61 100644
--- a/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
+++ b/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
@@ -1,6 +1,6 @@
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = -1
-
-velocimacro.permissions.allow.inline.local.scope = true
-directive.set.null.allowed = true
-velocimacro.max.depth = -1
+file.resource.loader.cache = true
+file.resource.loader.modificationCheckInterval = -1
+
+velocimacro.permissions.allow.inline.local.scope = true
+directive.set.null.allowed = true
+velocimacro.max.depth = -1