Skip to content

Commit

Permalink
Update unit test case
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-ng-tm committed Sep 13, 2024
1 parent 94e1840 commit b8d93f7
Show file tree
Hide file tree
Showing 18 changed files with 80 additions and 167 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ public boolean render(InternalContextAdapter context,
writer.append(prefixedContent);
//Mod end

node.jjtGetChild(0).getColumn();


} catch (StopCommand stop) {
if (!stop.isFor(this)) {
throw stop;
Expand Down
87 changes: 0 additions & 87 deletions src/main/java/com/norconex/commons/lang/config/vlt/test.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

class ConfigurationLoaderTest {

private static final String CFG_BASE_PATH = "src/test/resources/config/vlt/";
private static final String CFG_BASE_PATH = "src/test/resources/config/";

private ConfigurationLoader configLoader;

Expand Down Expand Up @@ -113,11 +113,12 @@ void testLoadToString() throws Exception {
}
@Test
void testIndentToString() throws Exception {

var loader = ConfigurationLoader.builder()
.variablesFile(cfgPath("main_item_template7.vm"))
.variablesFile(cfgPath("vlt_item7.vm"))
.build();
var str = SystemUtil.callWithProperty("VAR_E", "beans",
() -> loader.toString(cfgPath("main_template.vm")));
var str = SystemUtil.callWithProperty("date", "2024-08-20",
() -> loader.toString(cfgPath("vlt_indent.yaml")));
// "varB" should not be resolved as it comes from an #include
// directive (as opposed to parse)
assertThat(StringUtils.remove(str, '\r')).isEqualTo(
Expand All @@ -126,65 +127,61 @@ void testIndentToString() throws Exception {
date: $date
title: template title
date: 2024-08-20
depth1_include_tst_1:
- template2
key: template2
depth_test
depth1_include_vlt_item2:
title: $title
date: $date
key: value
depth_vlt_item2:
title: $title
date: $date
depth1_parse_tst2:
- template2
key: template2
depth_test
depth1_parse_vlt_item2:
key: value
depth_vlt_item2:
title: template title
date: 2024-08-20
depth_tst2:
tst_depth_2_1:
- template2
key: template2
depth_test
multi_depth_vlt_item2:
multi_depth_vlt_item2_1:
key: value
depth_vlt_item2:
title: $title
date: $date
- template2
key: template2
depth_test
key: value
depth_vlt_item2:
title: template title
date: 2024-08-20
depth_tst_3:
depth_tst_3_1:
3333: 3333333333
3333: 3333333333
recursive_depth_vlt_item3:
depth_vlt_item3:
key: value
title: $title
date: $date
title: template title
date: 2024-08-20
depth_tst_3_1:
depth_vlt_item3_1:
tst_depth_3_1_1:
3333: 3333333333
key: value
title: $title
date: $date
3333: 3333333333
key: value
tst_depth_3_1_2:
title: template title
date: 2024-08-20
- template2
key: template2
depth_test
key: value
depth_vlt_item2:
title: template title
date: 2024-08-20
tst_depth_3_1_2-1
- 5555: 55555555
5555: 5555555555
depth_tst_4_ifelse_and_loop:
Name: Alice
key: value
key: value
ifelse_loop_depth_vlt_item6:
Name: Alice
Age: 10
Feels: very old.
age: you are nothing.
Name: Bob
Age: 30
age: you are nothing.
Feels: very old
Name: Charlie
Age: 50
age: you are nothing.
Feels: very old
""");

// null path
Expand Down
5 changes: 0 additions & 5 deletions src/test/resources/config/vlt/main_item_template2.vm

This file was deleted.

7 changes: 0 additions & 7 deletions src/test/resources/config/vlt/main_item_template3.vm

This file was deleted.

8 changes: 0 additions & 8 deletions src/test/resources/config/vlt/main_item_template4.vm

This file was deleted.

3 changes: 0 additions & 3 deletions src/test/resources/config/vlt/main_item_template5.vm

This file was deleted.

14 changes: 0 additions & 14 deletions src/test/resources/config/vlt/main_template.vm

This file was deleted.

14 changes: 14 additions & 0 deletions src/test/resources/config/vlt_indent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include("vlt_item1.vm")
#parse("vlt_item1.vm")
depth1_include_vlt_item2:
#include("vlt_item1.vm","vlt_item2.vm")
depth1_parse_vlt_item2:
#parse("vlt_item2.vm")
multi_depth_vlt_item2:
multi_depth_vlt_item2_1:
#include("vlt_item2.vm")
#parse("vlt_item2.vm")
recursive_depth_vlt_item3:
#parse("vlt_item3.vm")
ifelse_loop_depth_vlt_item6:
#parse("vlt_item6.vm")
File renamed without changes.
4 changes: 4 additions & 0 deletions src/test/resources/config/vlt_item2.vm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
key: value
depth_vlt_item2:
title: $title
date: $date
6 changes: 6 additions & 0 deletions src/test/resources/config/vlt_item3.vm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
depth_vlt_item3:
key: value
#include("vlt_item1.vm")
#parse("vlt_item1.vm")
depth_vlt_item3_1:
#parse("vlt_item3_1.vm")
8 changes: 8 additions & 0 deletions src/test/resources/config/vlt_item3_1.vm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
tst_depth_3_1_1:
key: value
#include("vlt_item1.vm")
key: value
tst_depth_3_1_2:
#parse("vlt_item1.vm")
#parse("vlt_item2.vm")
#parse("vlt_item3_2.vm")
3 changes: 3 additions & 0 deletions src/test/resources/config/vlt_item3_2.vm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tst_depth_3_1_2-1
key: value
key: value
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#set($names = ["Alice", "Bob", "Charlie"])
#set($age = [10, 30, 50])
#set($size = $names.size() - 1) ## todo need to debug
#set($size = $names.size() - 1)
#set($index = 0)
#foreach($name in $names)
Name: $name
Age: $age[$index]
#if($age[$index] >= 18)
#set($x = $name)
#set($y = $age[$index])
#parse("vlt_item6_1.vm")
#if($age[$index] < 18)
age: you are nothing.
#else
Feels: very old.
Feels: very old
#end
#set($index = $index + 1)
#end
2 changes: 2 additions & 0 deletions src/test/resources/config/vlt_item6_1.vm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Name: $x
Age: $y
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
title = template title
date = 2024-08-20

0 comments on commit b8d93f7

Please sign in to comment.