From 079671626a1706bf1e57f4564ad51d3e43b1cb93 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 12 Aug 2023 11:06:23 -0700
Subject: [PATCH] Added more tests

---
 .idea/misc.xml                                |   4 +++
 lib/bld/bld-wrapper.jar                       | Bin 27258 -> 27258 bytes
 lib/bld/bld-wrapper.properties                |   3 +-
 .../rife/render/TemplateRenderersBuild.java   |  15 +++++++--
 src/test/java/rife/render/TestCase.java       |   7 ++++
 src/test/java/rife/render/TestFormat.java     |   4 ++-
 .../java/rife/render/TestRenderUtils.java     |  30 ++++++++++++++++++
 7 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e31f3a2..7f0ae93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <pattern value="rife.render.TemplateRenderersBuild" method="jacoco" />
+    <pattern value="rife.render.TemplateRenderersBuild" method="pmd" />
+  </component>
   <component name="PDMPlugin">
     <option name="customRuleSets">
       <list>
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 1071c19cf282e26420d13f8e75c81cedce221d86..777d784a9335461421d746c040eb0b55bf9df106 100644
GIT binary patch
delta 145
zcmex$h4I%FM!o=VW)=|!4h{~6Jw80)6ZvXcK=j6bEn_fa^IqdFCJ4*h?0_zW#h-GH
y5yE<yY5<X)ESg~l7MdKM;RIpK&G3LQUS<SC7!H{(5JpF4EL1Af55lm{vIhXgh%vSR

delta 145
zcmex$h4I%FM!o=VW)=|!4h{~6FU4!ZCi2y?fas0=TE<|;=Do&UOc0j0*#TV$i$CQY
yBZT!Z)c_(pSv12AEHpVh!wJHeo8bXryvzuOFdQ;nAdHU8Sg2H{AB16@We)&e<Ug7K

diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 60f348e..b405f1a 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,6 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.1-SNAPSHOT
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2-SNAPSHOT
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0-SNAPSHOT
 bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.2.0
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
diff --git a/src/bld/java/rife/render/TemplateRenderersBuild.java b/src/bld/java/rife/render/TemplateRenderersBuild.java
index 5e42cd4..534b9f0 100644
--- a/src/bld/java/rife/render/TemplateRenderersBuild.java
+++ b/src/bld/java/rife/render/TemplateRenderersBuild.java
@@ -2,6 +2,7 @@ package rife.render;
 
 import rife.bld.BuildCommand;
 import rife.bld.Project;
+import rife.bld.extension.JacocoReportOperation;
 import rife.bld.extension.PmdOperation;
 import rife.bld.extension.TestsBadgeOperation;
 import rife.bld.publish.PublishDeveloper;
@@ -9,6 +10,7 @@ import rife.bld.publish.PublishInfo;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
+import java.io.IOException;
 import java.util.List;
 
 import static rife.bld.dependencies.Repository.*;
@@ -60,8 +62,8 @@ public class TemplateRenderersBuild extends Project {
         scope(compile)
                 .include(dependency("com.uwyn.rife2", "rife2", version(1, 7, 0)));
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)))
                 .include(dependency("org.assertj:assertj-core:3.24.2"));
     }
 
@@ -69,8 +71,15 @@ public class TemplateRenderersBuild extends Project {
         new TemplateRenderersBuild().start(args);
     }
 
+    @BuildCommand(summary = "Generates Jacoco Reports")
+    public void jacoco() throws IOException {
+        new JacocoReportOperation()
+                .fromProject(this)
+                .execute();
+    }
+
     @BuildCommand(summary = "Runs PMD analysis")
-    public void pmd() throws Exception {
+    public void pmd() {
         new PmdOperation()
                 .fromProject(this)
                 .failOnViolation(true)
diff --git a/src/test/java/rife/render/TestCase.java b/src/test/java/rife/render/TestCase.java
index cebd066..ae88154 100644
--- a/src/test/java/rife/render/TestCase.java
+++ b/src/test/java/rife/render/TestCase.java
@@ -40,6 +40,9 @@ class TestCase {
         var bean = new ValueBean("this IS a TEST.");
         t.setBean(bean);
         assertThat(t.getContent()).isEqualTo(bean.getValue() + ": this is a test.");
+        bean = new ValueBean("");
+        t.setBean(bean);
+        assertThat(t.getContent()).isEqualTo(bean.getValue() + ": ");
     }
 
     @Test
@@ -54,6 +57,8 @@ class TestCase {
         var t = TemplateFactory.TXT.get("trim");
         t.setAttribute(FOO, "\t" + SAMPLE_TEXT + " \n");
         assertThat(t.getContent()).isEqualTo(SAMPLE_TEXT);
+        t.setAttribute(FOO, "");
+        assertThat(t.getContent()).isEmpty();
     }
 
     @Test
@@ -68,5 +73,7 @@ class TestCase {
         var t = TemplateFactory.TXT.get("uppercase");
         t.setAttribute("bar", SAMPLE_TEXT);
         assertThat(t.getContent()).isEqualTo(SAMPLE_TEXT.toUpperCase(Localization.getLocale()));
+        t.setAttribute("bar", "");
+        assertThat(t.getContent()).isEmpty();
     }
 }
\ No newline at end of file
diff --git a/src/test/java/rife/render/TestFormat.java b/src/test/java/rife/render/TestFormat.java
index 38917e2..970d728 100644
--- a/src/test/java/rife/render/TestFormat.java
+++ b/src/test/java/rife/render/TestFormat.java
@@ -44,7 +44,9 @@ class TestFormat {
         t.setAttribute(TestCase.FOO, "374380141731053");
         assertThat(t.getContent()).as("UK AMEX").isEqualTo("1053");
         t.setAttribute(TestCase.FOO, "000000000000001");
-        assertThat(t.getContent()).isEmpty();
+        assertThat(t.getContent()).as("000000000000001").isEmpty();
+        t.setAttribute(TestCase.FOO, "");
+        assertThat(t.getContent()).as("").isEmpty();
     }
 
     @Test
diff --git a/src/test/java/rife/render/TestRenderUtils.java b/src/test/java/rife/render/TestRenderUtils.java
index 6854bf5..712dd6a 100644
--- a/src/test/java/rife/render/TestRenderUtils.java
+++ b/src/test/java/rife/render/TestRenderUtils.java
@@ -35,11 +35,17 @@ class TestRenderUtils {
 
         assertThat(RenderUtils.abbreviate(TestCase.SAMPLE_TEXT, -1, "")).as("max=-1")
                 .isEqualTo(TestCase.SAMPLE_TEXT);
+
+        assertThat(RenderUtils.abbreviate("", 10, "")).as("").isEmpty();
     }
 
     @Test
     void testEncode() {
         var p = new Properties();
+        p.put(RenderUtils.ENCODING_PROPERTY, "blah");
+        assertThat(RenderUtils.encode(TestCase.SAMPLE_TEXT, p)).as("invalid encoding").isEqualTo(TestCase.SAMPLE_TEXT);
+        p.put(RenderUtils.ENCODING_PROPERTY, "json");
+        assertThat(RenderUtils.encode("This is a \"•test\"", p)).as("json").isEqualTo("This is a \\\"\\u2022test\\\"");
         p.put(RenderUtils.ENCODING_PROPERTY, "html");
         assertThat(RenderUtils.encode("<a test &>", p)).as("html").isEqualTo("&lt;a test &amp;&gt;");
         p.put(RenderUtils.ENCODING_PROPERTY, "js");
@@ -52,8 +58,22 @@ class TestRenderUtils {
         assertThat(RenderUtils.encode("Joe's Café & Bar", p)).as("xml").isEqualTo("Joe&apos;s Café &amp; Bar");
     }
 
+    @Test
+    void testEncodeJs() {
+        assertThat(RenderUtils.encodeJs("")).isEmpty();
+    }
+
+    @Test
+    void testFetchUrl() {
+        var s = "default";
+        assertThat(RenderUtils.fetchUrl("blah", s)).isEqualTo(s);
+        assertThat(RenderUtils.fetchUrl("https://www.google.com/404", s)).isEqualTo(s);
+        assertThat(RenderUtils.fetchUrl("https://www.notreallythere.com/", s)).isEqualTo(s);
+    }
+
     @Test
     void testHtmlEntities() {
+        assertThat(RenderUtils.htmlEntities("")).isEmpty();
         assertThat(RenderUtils.htmlEntities(SAMPLE_GERMAN))
                 .isEqualTo("&#77;&#246;&#99;&#104;&#116;&#101;&#110;&#32;&#83;&#105;&#101;&#32;&#101;&#105;&#110;&#32;&#112;&#97;&#97;&#114;&#32;&#196;&#112;&#102;&#101;&#108;&#63;");
     }
@@ -62,6 +82,8 @@ class TestRenderUtils {
     void testMask() {
         var foo = "4342256562440179";
 
+        assertThat(RenderUtils.mask("", " ", 2, false)).isEmpty();
+
         assertThat(RenderUtils.mask(foo, "?", 4, false)).as("mask=?")
                 .isEqualTo("????????????0179");
 
@@ -74,18 +96,26 @@ class TestRenderUtils {
 
     @Test
     void testNormalize() {
+        assertThat(RenderUtils.normalize("")).isEmpty();
         assertThat(RenderUtils.normalize(SAMPLE_GERMAN)).isEqualTo("mochten-sie-ein-paar-apfel");
     }
 
+    @Test
+    void testQrCode() {
+        assertThat(RenderUtils.qrCode("", "12")).isEmpty();
+    }
+
     @Test
     void testRot13() {
         var encoded = "Zöpugra Fvr rva cnne Äcsry?";
+        assertThat(RenderUtils.rot13("")).isEmpty();
         assertThat(RenderUtils.rot13(SAMPLE_GERMAN)).as("encode").isEqualTo(encoded);
         assertThat(RenderUtils.rot13(encoded)).as("decode").isEqualTo(SAMPLE_GERMAN);
     }
 
     @Test
     void testSwapCase() {
+        assertThat(RenderUtils.swapCase("")).isEmpty();
         assertThat(RenderUtils.swapCase(SAMPLE_GERMAN)).isEqualTo("mÖCHTEN sIE EIN PAAR äPFEL?");
     }