From 01b97b59f9af98aa014705c83a98cc96fe27f03e Mon Sep 17 00:00:00 2001
From: Vest <Vest@users.noreply.github.com>
Date: Sat, 11 Jan 2025 12:25:36 +0100
Subject: [PATCH] Added more logging to PcgenFtlTestCase.java (it will help to
 determine the difference between "golden" and generated files). Trimmed lines
 in base.xml and base-xml.ftl template.

---
 .../test/pcgen/inttest/PcgenFtlTestCase.java  |  2 +-
 code/testsuite/base-xml.ftl                   | 24 ++++++++--------
 code/testsuite/base.xml                       | 28 +++++++++----------
 code/testsuite/csheets/pf_Paladin.xml         |  6 ++--
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/code/src/test/pcgen/inttest/PcgenFtlTestCase.java b/code/src/test/pcgen/inttest/PcgenFtlTestCase.java
index 8a020f71222..ad0ecd4c335 100644
--- a/code/src/test/pcgen/inttest/PcgenFtlTestCase.java
+++ b/code/src/test/pcgen/inttest/PcgenFtlTestCase.java
@@ -128,6 +128,6 @@ public static void runTest(String character, String mode) throws IOException
 				.withTest(Input.fromString(actual))
 				.build();
 
-		assertFalse(myDiff.hasDifferences(), myDiff.toString());
+		assertFalse(myDiff.hasDifferences(), myDiff.fullDescription());
 	}
 }
diff --git a/code/testsuite/base-xml.ftl b/code/testsuite/base-xml.ftl
index 5801f06d4e9..2f83a9bf626 100644
--- a/code/testsuite/base-xml.ftl
+++ b/code/testsuite/base-xml.ftl
@@ -1,6 +1,6 @@
 <#ftl encoding="UTF-8" strip_whitespace=true >
 <?xml version="1.0" encoding="UTF-8"?>
-<#-- 
+<#--
 # Freemarker template for the character integration tests.
 # Copyright James Dempsey, 2013
 #
@@ -57,7 +57,7 @@
 				<sequence>${class}</sequence>
 			</class>
 			</#list>
-			</#if>		
+			</#if>
 			<levels_total><@pcstring tag="TOTALLEVELS"/></levels_total>
 			<levels_ecl><@pcstring tag="ECL"/></levels_ecl>
 			<!-- shortform below should be removed - it can be derived from class info above -->
@@ -187,7 +187,7 @@
 	  ====================================
 	  ====================================-->
 	<abilities>
-<@loop from=0 to=pcvar('COUNT[STATS]-1') ; stat , stat_has_next >	
+<@loop from=0 to=pcvar('COUNT[STATS]-1') ; stat , stat_has_next >
 		<ability>
 			<name>
 				<long><@pcstring tag="STAT.${stat}.LONGNAME"/></long>
@@ -202,7 +202,7 @@
 			<no_temp_score><@pcstring tag="STAT.${stat}.NOTEMP"/></no_temp_score>
 			<no_temp_modifier><@pcstring tag="STAT.${stat}.MOD.NOTEMP"/></no_temp_modifier>
 		</ability>
-</@loop>		
+</@loop>
 	</abilities>
 	<!--
 	  ====================================
@@ -226,7 +226,7 @@
 				<stat><@pcstring tag="HPROLL.${level}.STAT"/></stat>
 				<total><@pcstring tag="HPROLL.${level}.TOTAL"/></total>
 			</roll>
-</@loop>		
+</@loop>
 		</history>
 	</hit_points>
 	<!--
@@ -470,7 +470,7 @@
 				</w2_o>
 			</melee>
 </#macro>
-<#t>	  
+<#t>
 	<weapons>
 		<unarmed>
 			<total><@pcstring tag="WEAPONH.TOTALHIT"/></total>
@@ -483,7 +483,7 @@
 		<#assign weaponCategory>
 			<@pcstring tag="WEAPON.${weap}.CATEGORY" /><#t>
 		</#assign>
-		<#-- For weapons of category 'both' we expect to see two consective 
+		<#-- For weapons of category 'both' we expect to see two consective
 		   - weapons, one defining the melee use and one the ranged use. -->
 		<#if weaponCategory?lower_case?contains('both')>
 			<#if !weaponCategory?lower_case?contains('ranged')>
@@ -852,7 +852,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 		</feat>
-</@loop>	
+</@loop>
 
 		<!-- Auto feats -->
 <@loop from=0 to=pcvar('countdistinct("ABILITIES","CATEGORY=FEAT","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC")-1') ; feat , feat_has_next >
@@ -866,7 +866,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 		</feat>
-</@loop>	
+</@loop>
 
 		<!-- Virtual Feats -->
 <@loop from=0 to=pcvar('COUNT[VFEATS.VISIBLE]-1') ; feat , feat_has_next >
@@ -880,7 +880,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 		</feat>
-</@loop>	
+</@loop>
 		<!-- End Virtual Feats -->
 		<!-- Hidden feats (all feats less the virtual, automatic and visible ones) -->
 <@loop from=0 to=pcvar('COUNT[FEATS.HIDDEN]-1') ; feat , feat_has_next >
@@ -1241,7 +1241,7 @@
 	<memorized_spells/>
 <#else>
 	<memorized_spells>
-		<!-- ### BEGIN innate memorized spell section -->	
+		<!-- ### BEGIN innate memorized spell section -->
 	<#if (pcvar('COUNT[SPELLRACE]') > 0) >
 		<!-- ### BEGIN innate memorized spells ### -->
 		<#assign spellbook = 1 />
@@ -1278,7 +1278,7 @@
 			<!-- ### END class innate memorized spells ### -->
 	</#if>
 		<!-- ### END innate memorized spell section -->
-	
+
 		<!-- ### BEGIN class Spellbook memorized spells ### -->
 	<@loop from=2 to=pcvar('COUNT[SPELLBOOKS]-1') ; spellbook >
 		<#assign foo = pcvar('COUNT[SPELLRACE]') />
diff --git a/code/testsuite/base.xml b/code/testsuite/base.xml
index a8616a1fc79..09a73bacfe8 100644
--- a/code/testsuite/base.xml
+++ b/code/testsuite/base.xml
@@ -95,9 +95,9 @@
 		<hitdice>|HITDICE|</hitdice>
 		<interests>|INTERESTS|</interests>
 		<languages>
-|FOR,%lang,0,COUNT[LANGUAGES]-1,1,0|		
+|FOR,%lang,0,COUNT[LANGUAGES]-1,1,0|
 			<language>|LANGUAGES.%lang|</language>
-|ENDFOR|		
+|ENDFOR|
 			<all>|LANGUAGES|</all>
 		</languages>
 		<location>|LOCATION|</location>
@@ -162,7 +162,7 @@
 	  ====================================
 	  ====================================-->
 	<abilities>
-|FOR,%stat,0,COUNT[STATS]-1,1,0|	
+|FOR,%stat,0,COUNT[STATS]-1,1,0|
 		<ability>
 			<name>
 				<long>|STAT.%stat.LONGNAME|</long>
@@ -177,7 +177,7 @@
 			<no_temp_score>|STAT.%stat.NOTEMP|</no_temp_score>
 			<no_temp_modifier>|STAT.%stat.MOD.NOTEMP|</no_temp_modifier>
 		</ability>
-|ENDFOR|		
+|ENDFOR|
 	</abilities>
 	<!--
 	  ====================================
@@ -201,7 +201,7 @@
 				<stat>|HPROLL.%level.STAT|</stat>
 				<total>|HPROLL.%level.TOTAL|</total>
 			</roll>
-|ENDFOR|		
+|ENDFOR|
 		</history>
 	</hit_points>
 	<!--
@@ -385,7 +385,7 @@
 			<!-- Should be changed to a variable due to improved crit -->
 		</unarmed>
 
-		
+
 |FOR,%weap,0,COUNT[EQTYPE.WEAPON]-1,1,1|
 
 |IIF(WEAPON.%weap.CATEGORY:BOTH)|
@@ -1008,7 +1008,7 @@
 	  ====================================-->
 	<feats>
 		<!-- Visible standard feats (not including the auto feats) -->
-|FOR,%feat,0,countdistinct("ABILITIES","CATEGORY=FEAT","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|	
+|FOR,%feat,0,countdistinct("ABILITIES","CATEGORY=FEAT","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
 		<feat>
 			<name>|ABILITY.FEAT.VISIBLE.%feat|</name>
 			<description>|ABILITY.FEAT.VISIBLE.%feat.DESC|</description>
@@ -1019,10 +1019,10 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 		</feat>
-|ENDFOR|	
+|ENDFOR|
 
 		<!-- Auto feats -->
-|FOR,%feat,0,countdistinct("ABILITIES","CATEGORY=FEAT","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC")-1,1,0|	
+|FOR,%feat,0,countdistinct("ABILITIES","CATEGORY=FEAT","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC")-1,1,0|
 		<feat>
 			<name>|ABILITYAUTO.FEAT.VISIBLE.%feat|</name>
 			<description>|ABILITYAUTO.FEAT.VISIBLE.%feat.DESC|</description>
@@ -1033,10 +1033,10 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 		</feat>
-|ENDFOR|	
+|ENDFOR|
 
 		<!-- Virtual Feats -->
-|FOR,%feat,0,COUNT[VFEATS.VISIBLE]-1,1,0|	
+|FOR,%feat,0,COUNT[VFEATS.VISIBLE]-1,1,0|
 		<feat>
 			<name>|VFEAT.VISIBLE.%feat|</name>
 			<description>|VFEAT.VISIBLE.%feat.DESC|</description>
@@ -1047,7 +1047,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 		</feat>
-|ENDFOR|	
+|ENDFOR|
 		<!-- End Virtual Feats -->
 		<!-- Hidden feats (all feats less the virtual, automatic and visible ones) -->
 |FOR,%feat,0,COUNT[FEATS.HIDDEN]-1,1,0|
@@ -1511,7 +1511,7 @@
 	  ====================================
 	  ====================================-->
 	<companions>
-|%FOLLOWERTYPE.FAMILIAR|	
+|%FOLLOWERTYPE.FAMILIAR|
 		<familiar>
 			<!-- Note that only one familiar is allowed, so no support for multiple familiars -->
 			<name>|FOLLOWERTYPE.FAMILIAR.0.NAME|</name>
@@ -1881,7 +1881,7 @@
 	<memorized_spells/>
 |ELSE|
 	<memorized_spells>
-			<!-- ### BEGIN innate memorized spell section -->	
+			<!-- ### BEGIN innate memorized spell section -->
 |FOR,%spellrace,COUNT[SPELLRACE],COUNT[SPELLRACE],1,0|
 |IIF(%spellrace:0)|
 |ELSE|
diff --git a/code/testsuite/csheets/pf_Paladin.xml b/code/testsuite/csheets/pf_Paladin.xml
index 4d74fa51b36..3ec79c95813 100644
--- a/code/testsuite/csheets/pf_Paladin.xml
+++ b/code/testsuite/csheets/pf_Paladin.xml
@@ -3286,7 +3286,7 @@ BIO
 		</ability_object>
 		<ability_object>
 			<name>Channel Positive Energy</name>
-			<description>You can unleash a wave of positive energy dealing 3d6 (DC 15 for half) /day. You can unleash a wave of positive energy. You must choose to deal 3d6 points of positive energy damage to undead creatures or to heal living creatures of 3d6 points of damage. Creatures that take damage from channeled energy receive a DC 15 Will save to halve the damage. Using this ability consumes two uses of her lay on hands ability.</description>
+			<description>You can unleash a wave of positive energy dealing 3d6 (DC 15 for half) 2/day. You can unleash a wave of positive energy. You must choose to deal 3d6 points of positive energy damage to undead creatures or to heal living creatures of 3d6 points of damage. Creatures that take damage from channeled energy receive a DC 15 Will save to halve the damage. Using this ability consumes two uses of her lay on hands ability.</description>
 			<type>PALADINCLASSFEATURES.SPECIALATTACK.SUPERNATURAL.CHANNEL ENERGY.CHANNEL ENERGY POSITIVE.CHANNEL POSITIVE ENERGY</type>
 			<associated></associated>
 			<count>0</count>
@@ -4878,7 +4878,7 @@ BIO
 		<!-- ### END Known spells ### -->
 		<!-- ### BEGIN memorized spells ### -->
 	<memorized_spells>
-		<!-- ### BEGIN innate memorized spell section -->	
+		<!-- ### BEGIN innate memorized spell section -->
 		<!-- ### BEGIN innate memorized spells ### -->
 		<!-- ### END innate memorized spells ### -->
 		<!-- ### BEGIN class innate memorized spells ### -->
@@ -4917,7 +4917,7 @@ BIO
 		</class_innate_memorized>
 			<!-- ### END class innate memorized spells ### -->
 		<!-- ### END innate memorized spell section -->
-	
+
 		<!-- ### BEGIN class Spellbook memorized spells ### -->
 <!-- Either we do not have a innate race, or if we do we do not have any 0 level spell for the innate race -->
 		<spellbook number="2" name="Class">