diff options
| author | Claude Brisson <cbrisson@apache.org> | 2019-03-02 19:01:09 +0000 |
|---|---|---|
| committer | Claude Brisson <cbrisson@apache.org> | 2019-03-02 19:01:09 +0000 |
| commit | b9f52783a3e564f0d68a95f4a9caf7760c4038df (patch) | |
| tree | 7e99906838f0c34c466fd5f4c300d1fe5a9ca1e0 /velocity-engine-core/src/test | |
| parent | 1d84dbaa3f3fde538153f0505602acc71dd3386e (diff) | |
| download | apache-velocity-engine-b9f52783a3e564f0d68a95f4a9caf7760c4038df.tar.gz | |
[engine] Enhance space gobbling LINES mode: keep ending newline after directives wich don't start after a newline
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1854662 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/test')
26 files changed, 459 insertions, 479 deletions
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java index bb8fce78..cc961996 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java @@ -91,6 +91,13 @@ public class EvaluateTestCase extends BaseTestCase assureResultsDirectoryExists(RESULTS_DIR); } + @Override + protected void setUpEngine(VelocityEngine engine) + { + // extension hook + } + + /** * Test basic functionality. * @throws Exception diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java index f8599b99..a9184c2c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java @@ -128,7 +128,7 @@ public class SpaceGobblingTestCase extends BaseTestCase String result = getFileContents(RESULT_DIR, templateFile, mode.toString()); String compare = getFileContents(COMPARE_DIR, templateFile, mode.toString()); - String msg = "Processed template did not match expected output\n"+ + String msg = "Processed template did not match expected output for template " + templateFile + " and mode " + mode + "\n"+ "-----Result-----\n"+ result + "----Expected----\n"+ compare + "----------------"; diff --git a/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp b/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp index 38958d1b..9494eec0 100644 --- a/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp +++ b/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp @@ -40,501 +40,463 @@ provided →<br/> expected ↓ </th> - <th> boolean -</th> - <th> char -</th> - <th> byte -</th> - <th> short -</th> - <th> int -</th> - <th> long -</th> - <th> float -</th> - <th> double -</th> - <th> Boolean -</th> - <th> Character -</th> - <th> Byte -</th> - <th> Short -</th> - <th> Integer -</th> - <th> Long -</th> - <th> Float -</th> - <th> Double -</th> - <th> Number -</th> - <th> String -</th> - <th> Object -</th> + <th>boolean</th> + <th>char</th> + <th>byte</th> + <th>short</th> + <th>int</th> + <th>long</th> + <th>float</th> + <th>double</th> + <th>Boolean</th> + <th>Character</th> + <th>Byte</th> + <th>Short</th> + <th>Integer</th> + <th>Long</th> + <th>Float</th> + <th>Double</th> + <th>Number</th> + <th>String</th> + <th>Object</th> <th>null</th> </tr> <tr> - <th> boolean -</th> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>boolean</th> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> char -</th> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> + <th>char</th> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> byte -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>byte</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> short -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>short</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> int -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>int</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> long -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>long</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> float -</th> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>float</th> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> double -</th> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> + <th>double</th> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> <td><span class="none">none</span></td> </tr> <tr> - <th> Boolean -</th> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Boolean</th> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Character -</th> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Character</th> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Byte -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Byte</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Short -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Short</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Integer -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Integer</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Long -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Long</th> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Float -</th> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Float</th> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Double -</th> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Double</th> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Number -</th> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="none">none</span></td> - <td> <span class="none">none</span></td> - <td> <span class="strict">strict</span></td> + <th>Number</th> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="none">none</span></td> + <td><span class="none">none</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> String -</th> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="explicit">explicit</span></td> - <td> <span class="strict">strict</span></td> + <th>String</th> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="explicit">explicit</span></td> + <td><span class="strict">strict</span></td> </tr> <tr> - <th> Object -</th> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="implicit">implicit</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> - <td> <span class="strict">strict</span></td> + <th>Object</th> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="implicit">implicit</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> + <td><span class="strict">strict</span></td> </tr> </thead> <tbody> diff --git a/velocity-engine-core/src/test/resources/conversion/matrix.vhtml b/velocity-engine-core/src/test/resources/conversion/matrix.vhtml index de87ff38..8ae673bb 100644 --- a/velocity-engine-core/src/test/resources/conversion/matrix.vhtml +++ b/velocity-engine-core/src/test/resources/conversion/matrix.vhtml @@ -3,7 +3,7 @@ #if($string.startsWith("class java.lang.")) #set($string = $string.substring(16)) #end - $string +$string## #end #macro(cell,$type)<span class="$type">$type</span>#end diff --git a/velocity-engine-core/src/test/resources/evaluate/compare/eval2.cmp b/velocity-engine-core/src/test/resources/evaluate/compare/eval2.cmp index 806a45d2..9e87f0ed 100644 --- a/velocity-engine-core/src/test/resources/evaluate/compare/eval2.cmp +++ b/velocity-engine-core/src/test/resources/evaluate/compare/eval2.cmp @@ -3,5 +3,7 @@ basic string test 2: a: 22 test 3: inner eval: 33 + basic string test 4: inner eval: 44 + diff --git a/velocity-engine-core/src/test/resources/evaluate/eval2.vm b/velocity-engine-core/src/test/resources/evaluate/eval2.vm index c6a43177..59a363cb 100644 --- a/velocity-engine-core/src/test/resources/evaluate/eval2.vm +++ b/velocity-engine-core/src/test/resources/evaluate/eval2.vm @@ -2,7 +2,7 @@ ## Test evaluate preserves macros ## #macro (test $a) -a: $a +a: $a## #end test 1: #test(12) #evaluate("basic string") diff --git a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.BC b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.BC index 20207c30..1dffcd61 100644 --- a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.BC +++ b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.BC @@ -56,4 +56,5 @@ y yyy t t t -
\ No newline at end of file + +line1 foo line2 diff --git a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.LINES b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.LINES index 1c5d036e..ebd065cb 100644 --- a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.LINES +++ b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.LINES @@ -56,3 +56,6 @@ y yyy t t t + +line1 foo +line2 diff --git a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.NONE b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.NONE index 326e6ea2..cfc96874 100644 --- a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.NONE +++ b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.NONE @@ -238,3 +238,6 @@ y t + +line1 foo +line2 diff --git a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.STRUCTURED b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.STRUCTURED index 1368c4a8..66e3c349 100644 --- a/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.STRUCTURED +++ b/velocity-engine-core/src/test/resources/gobbling/compare/if.vtl.STRUCTURED @@ -56,3 +56,6 @@ t t t t + +line1 foo +line2 diff --git a/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.LINES b/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.LINES index 76bd9ac7..af63dd07 100644 --- a/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.LINES +++ b/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.LINES @@ -1,3 +1,4 @@ postfix postfix -prefix prefix postfix +prefix +prefix postfix diff --git a/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.STRUCTURED b/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.STRUCTURED index 76bd9ac7..af63dd07 100644 --- a/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.STRUCTURED +++ b/velocity-engine-core/src/test/resources/gobbling/compare/set.vtl.STRUCTURED @@ -1,3 +1,4 @@ postfix postfix -prefix prefix postfix +prefix +prefix postfix diff --git a/velocity-engine-core/src/test/resources/gobbling/if.vtl b/velocity-engine-core/src/test/resources/gobbling/if.vtl index 9dcacbc5..8d1f8e33 100644 --- a/velocity-engine-core/src/test/resources/gobbling/if.vtl +++ b/velocity-engine-core/src/test/resources/gobbling/if.vtl @@ -646,3 +646,6 @@ #{else} t #end + +line1 #if(true) foo #else bar #end +line2 diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1.cmp index c309300a..db1daaa8 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1.cmp @@ -1,3 +1,4 @@ 2 4 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1b.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1b.cmp index 61aa19d8..b9e5d73b 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1b.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_1b.cmp @@ -1,3 +1,4 @@ 8 6 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2.cmp index c309300a..db1daaa8 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2.cmp @@ -1,3 +1,4 @@ 2 4 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2b.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2b.cmp index 61aa19d8..b9e5d73b 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2b.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_2b.cmp @@ -1,3 +1,4 @@ 8 6 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3.cmp index c309300a..db1daaa8 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3.cmp @@ -1,3 +1,4 @@ 2 4 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3b.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3b.cmp index 61aa19d8..b9e5d73b 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3b.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_3b.cmp @@ -1,3 +1,4 @@ 8 6 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4.cmp index c309300a..db1daaa8 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4.cmp @@ -1,3 +1,4 @@ 2 4 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4b.cmp b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4b.cmp index 61aa19d8..b9e5d73b 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4b.cmp +++ b/velocity-engine-core/src/test/resources/parsemacros/compare/parseMacro1_4b.cmp @@ -1,3 +1,4 @@ 8 6 + diff --git a/velocity-engine-core/src/test/resources/parsemacros/parseMacro3.vm b/velocity-engine-core/src/test/resources/parsemacros/parseMacro3.vm index 3d730245..e6e3c5a7 100644 --- a/velocity-engine-core/src/test/resources/parsemacros/parseMacro3.vm +++ b/velocity-engine-core/src/test/resources/parsemacros/parseMacro3.vm @@ -2,4 +2,3 @@ #parse("vm_library2.vm") #foo(1) #bar(2) - diff --git a/velocity-engine-core/src/test/resources/templates/block.vm b/velocity-engine-core/src/test/resources/templates/block.vm index d20d94de..a04f1676 100644 --- a/velocity-engine-core/src/test/resources/templates/block.vm +++ b/velocity-engine-core/src/test/resources/templates/block.vm @@ -73,22 +73,15 @@ True #end ----------- --- Third Test : tight tight tight. Note that \#end eats the \n, which is NOT what people expect, I think. +-- Third Test : tight tight tight. -- one blank line follows blargh #if(true)This follows blargh#end -blargh#if(true)This immedately follows blargh with a following newline -#end --- Fourth Test : another tight tight tight. If you want the \n, then put one *after* the content, not a space after \#end. --- one blank line follows - -blargh #if(true)This follows blargh -#end blargh#if(true)This immedately follows blargh with a following newline #end --- Fifth Test : different kind of tight. blank line follows +-- Fourth Test : different kind of tight. blank line follows blargh #if(true) diff --git a/velocity-engine-core/src/test/resources/templates/compare/block.cmp b/velocity-engine-core/src/test/resources/templates/compare/block.cmp index f76d3201..d20dc8cc 100644 --- a/velocity-engine-core/src/test/resources/templates/compare/block.cmp +++ b/velocity-engine-core/src/test/resources/templates/compare/block.cmp @@ -22,18 +22,13 @@ One blank line follows True ----------- --- Third Test : tight tight tight. Note that #end eats the \n, which is NOT what people expect, I think. --- one blank line follows - -blargh This follows blarghblarghThis immedately follows blargh with a following newline - --- Fourth Test : another tight tight tight. If you want the \n, then put one *after* the content, not a space after #end. +-- Third Test : tight tight tight. -- one blank line follows blargh This follows blargh blarghThis immedately follows blargh with a following newline --- Fifth Test : different kind of tight. blank line follows +-- Fourth Test : different kind of tight. blank line follows blargh blargh2 diff --git a/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp b/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp index 66a9c19c..2513a278 100644 --- a/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp +++ b/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp @@ -49,5 +49,4 @@ $nullToString.toString() -$ -$fooo$fooo.$fooo.bar$fooo.bar($fooo.bar()
\ No newline at end of file +$$fooo$fooo.$fooo.bar$fooo.bar($fooo.bar()
\ No newline at end of file diff --git a/velocity-engine-core/src/test/resources/templates/diabolical.vm b/velocity-engine-core/src/test/resources/templates/diabolical.vm index c4bc4032..c8d8e207 100644 --- a/velocity-engine-core/src/test/resources/templates/diabolical.vm +++ b/velocity-engine-core/src/test/resources/templates/diabolical.vm @@ -66,9 +66,9 @@ $nullToString.toString() $!nullToString $!nullToString.toString() -$#set($foo = $bar) -$fooo#set($foo = $bar) -$fooo.#set($foo = $bar) -$fooo.bar#set($foo = $bar) -$fooo.bar(#set($foo = $bar) -$fooo.bar()#set($foo = $bar) +$#set($foo = $bar)## +$fooo#set($foo = $bar)## +$fooo.#set($foo = $bar)## +$fooo.bar#set($foo = $bar)## +$fooo.bar(#set($foo = $bar)## +$fooo.bar()#set($foo = $bar)## |