rife2/bld-generated-version
rife2/bld-generated-version
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a method to compare text ignoring line separators and whitespaces

Browse source
This commit is contained in:
Erik C. Thauvin 2025-03-26 21:59:57 -07:00
parent a109d2ad93
commit cfb8839359
Signed by: erik
GPG key ID: 776702A6A2DA330E
1 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/test/java/rife/bld/extension/GeneratedVersionTest.java
View file

@ -82,6 +82,30 @@ class GeneratedVersionTest {
} }
} }
/**
* Compares two strings by removing all line separators and whitespace.
*
* @param text1 The first text to compare
* @param text2 The second text to compare
* @return true if the texts are equivalent when line separators are ignored, false otherwise
*/
static boolean compareTextIgnoringLineSeparators(String text1, String text2) {
// Handle null cases
if (text1 == null && text2 == null) {
return true;
}
if (text1 == null || text2 == null) {
return false;
}
// Remove all line separators and whitespace
var cleanedText1 = text1.replaceAll("\\r?\\n|\\r|\\s", "");
var cleanedText2 = text2.replaceAll("\\r?\\n|\\r|\\s", "");
// Compare the cleaned strings
return cleanedText1.equals(cleanedText2);
}
@Test @Test
void testBuildCustomTemplate() { void testBuildCustomTemplate() {
var gv = new GeneratedVersion(); var gv = new GeneratedVersion();
@ -91,21 +115,18 @@ class GeneratedVersionTest {
gv.setProjectName("My App"); gv.setProjectName("My App");
gv.setClassName("MyVersion"); gv.setClassName("MyVersion");
var eol = System.lineSeparator();
var t = gv.buildTemplate(); var t = gv.buildTemplate();
assertThat(t.getContent()).isEqualTo("package com.example.my;" + eol + assertThat(compareTextIgnoringLineSeparators(t.getContent(),"package com.example.my;" +
eol + "public final class MyVersion {" +
"public final class MyVersion {" + eol + " public static final int PROJECT = \"My App\";" +
" public static final int PROJECT = \"My App\";" + eol + " public static final int MAJOR = 2;" +
" public static final int MAJOR = 2;" + eol + " public static final int MINOR = 1;" +
" public static final int MINOR = 1;" + eol + " public static final int REVISION = 3;" +
" public static final int REVISION = 3;" + eol + " public static final String QUALIFIER = \"\";" +
" public static final String QUALIFIER = \"\";" + eol + " private MyVersion() {" +
eol + " // no-op" +
" private MyVersion() {" + eol + " }" +
" // no-op" + eol + "}")).isTrue();
" }" + eol +
"}" + eol);
} }
@Test @Test