This is an automated email from the ASF dual-hosted git repository.
vishwasbabu pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 702e15e re-enable commented out test (which actually passes)
new cd83995 Merge pull request #596 from
vorburger/enable-TemplateMergeServiceTest-compileHelloTemplate
702e15e is described below
commit 702e15e0f4bbb607d26124dec325509b0eb41e40
Author: Michael Vorburger ⛑️ <[email protected]>
AuthorDate: Thu Jun 20 19:33:22 2019 +0000
re-enable commented out test (which actually passes)
---
.../template/TemplateMergeServiceTest.java | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git
a/fineract-provider/src/test/java/org/apache/fineract/template/TemplateMergeServiceTest.java
b/fineract-provider/src/test/java/org/apache/fineract/template/TemplateMergeServiceTest.java
index 16a1ce5..ed28d4e 100644
---
a/fineract-provider/src/test/java/org/apache/fineract/template/TemplateMergeServiceTest.java
+++
b/fineract-provider/src/test/java/org/apache/fineract/template/TemplateMergeServiceTest.java
@@ -31,6 +31,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
import org.apache.fineract.organisation.monetary.domain.MoneyHelper;
import org.apache.fineract.portfolio.loanaccount.LoanScheduleTestDataHelper;
@@ -43,17 +50,10 @@ import org.joda.time.LocalDate;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-
public class TemplateMergeServiceTest {
private TemplateMergeService tms = new TemplateMergeService();
-
+
@Before
public void setUpForEachTestCase() throws Exception {
@@ -62,7 +62,7 @@ public class TemplateMergeServiceTest {
field.set(null, RoundingMode.HALF_EVEN);
}
-
+
@Test
public void compileHelloTemplate() throws Exception {
@@ -89,8 +89,7 @@ public class TemplateMergeServiceTest {
String expectedOutput =
Resources.toString(Resources.getResource("template-expected.html"),
Charsets.UTF_8);
String output = compileTemplateText(templateText, scopes);
- // System.out.println(output);
- // assertEquals(expectedOutput, output);
+ assertEquals(expectedOutput, output);
}
@Test
@@ -124,7 +123,7 @@ public class TemplateMergeServiceTest {
Template template = new Template("TemplateName", templateText, null,
null, mappers);
return tms.compile(template, scope);
}
-
+
protected Map<String, Object> createMapFromJSON(String jsonText) {
Gson gson = new Gson();
Type ssMap = new TypeToken<Map<String, Object>>(){}.getType();