Skip to content

Commit 2af1e50

Browse files
committed
F!! Adding options to VelocityApprovals
1 parent 11efe0f commit 2af1e50

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

approvaltests-tests/src/test/java/org/approvaltests/DocumentHelpersTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ else if (simpleName.equals("JsonApprovals"))
6060
{
6161
modifier = 2;
6262
}
63+
else if (simpleName.equals("VelocityApprovals"))
64+
{
65+
modifier = 2;
66+
}
6367
else
6468
{
6569
throw new FormattedException("Unknown modifier (%s) for class %s", modifier, simpleName);

approvaltests-tests/src/test/java/org/approvaltests/DocumentHelpersTest.listAllVerifyFunctions.approved.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,5 @@
5252
* JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L25-L28) (Object)
5353
* JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L29-L32) (Object,Function1)
5454
* JsonApprovals. [verifyJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L17-L20) (String)
55+
* VelocityApprovals. [verify ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java#L16-L19) (ContextAware)
56+
* VelocityApprovals. [verify ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java#L24-L27) (ContextAware,String)

approvaltests-tests/src/test/java/org/approvaltests/OptionsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.approvaltests.reporters.FirstWorkingReporter;
1010
import org.approvaltests.reporters.UseReporter;
1111
import org.approvaltests.reporters.UseReporterTest;
12+
import org.approvaltests.velocity.VelocityApprovals;
1213
import org.junit.jupiter.api.Test;
1314
import org.lambda.query.Query;
1415
import org.lambda.query.Queryable;
@@ -78,7 +79,7 @@ void testEachMethodHasOneWithOptions()
7879
}
7980
public static List<Class<?>> getApprovalClasses()
8081
{
81-
return Arrays.asList(Approvals.class, CombinationApprovals.class, AwtApprovals.class, JsonApprovals.class);
82+
return Arrays.asList(Approvals.class, CombinationApprovals.class, AwtApprovals.class, JsonApprovals.class, VelocityApprovals.class);
8283
}
8384
private void verifyEachVerifyMethodHasOneWithOptions(Class<?> approvalsClass)
8485
{

approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,30 @@
44
import com.spun.util.velocity.ContextAware;
55
import com.spun.util.velocity.VelocityParser;
66
import org.approvaltests.Approvals;
7+
import org.approvaltests.core.Options;
78
import org.approvaltests.namer.ApprovalNamer;
89

910
public class VelocityApprovals
1011
{
1112
public static void verify(ContextAware context)
1213
{
13-
verify(context, ".txt");
14+
verify(context, new Options());
15+
}
16+
public static void verify(ContextAware context, Options options)
17+
{
18+
verify(context, ".txt", options);
1419
}
1520
public static void verify(ContextAware context, String fileExtentsionWithDot)
21+
{
22+
verify(context, fileExtentsionWithDot, new Options());
23+
}
24+
public static void verify(ContextAware context, String fileExtentsionWithDot, Options options)
1625
{
1726
ApprovalNamer namer = Approvals.createApprovalNamer();
1827
String file = namer.getSourceFilePath() + namer.getApprovalName() + ".template" + fileExtentsionWithDot;
1928
FileUtils.createIfNeeded(file);
2029
String text = VelocityParser.parseFile(file, context);
21-
Approvals.verify(text, fileExtentsionWithDot.substring(1));
30+
options = options.forFile().withExtension(fileExtentsionWithDot);
31+
Approvals.verify(text, options);
2232
}
2333
}

0 commit comments

Comments
 (0)