Skip to content

Commit c35b0a2

Browse files
authored
Fix/tms 37529 html (#224)
* feature: 2.9.0 release * fix TMS-37529: update regex tag pattern match
1 parent b4ab2a2 commit c35b0a2

4 files changed

Lines changed: 49 additions & 2 deletions

File tree

.github/workflows/local-test.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: local tests
2+
run-name: "#${{ github.run_number }} test by ${{ github.triggering_actor }}"
3+
on:
4+
pull_request:
5+
paths:
6+
- "testit-java-commons/**"
7+
- "build.gradle.kts"
8+
- "gradle.properties"
9+
- "settings.gradle.kts"
10+
- ".github/**/test.yml"
11+
env:
12+
JAVA_DISTRIBUTION: "temurin"
13+
JAVA_VERSION: 17
14+
jobs:
15+
16+
test-gradle:
17+
name: gradle testing
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout adapters-java
22+
uses: actions/checkout@v4
23+
24+
- name: Setup java
25+
uses: actions/setup-java@v4
26+
with:
27+
distribution: ${{ env.JAVA_DISTRIBUTION }}
28+
java-package: jdk
29+
java-version: ${{ env.JAVA_VERSION }}
30+
31+
- name: Run tests
32+
run: |
33+
./gradlew test
34+

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.9.0
1+
version=2.9.1
22

33
org.gradle.daemon=true
44
org.gradle.parallel=true

testit-java-commons/src/main/java/ru/testit/services/HtmlEscapeUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ private HtmlEscapeUtils() {}
1515

1616
// Regex pattern to detect HTML tags
1717
private static final Pattern HTML_TAG_PATTERN = Pattern.compile(
18-
"<\\S.*?(?:>|/>)"
18+
"<\\S.*[^>]*>"
1919
);
2020

2121
// Regex patterns to escape only non-escaped characters

testit-java-commons/src/test/java/ru/testit/services/UtilsEscapeTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,19 @@ void testEscapeHtmlInObjectWithEmptyList() {
212212
Assertions.assertTrue(obj.tags.isEmpty());
213213
}
214214

215+
@Test
216+
void testEscapeHtmlInObjectWithSomeParameter() {
217+
// Test object with empty list
218+
TestObjectWithStringList obj = new TestObjectWithStringList();
219+
obj.name = "Test <object href=\"\">";
220+
obj.tags = new ArrayList<>(); // empty list
221+
222+
HtmlEscapeUtils.escapeHtmlInObject(obj);
223+
224+
Assertions.assertEquals("Test &lt;object href=\"\"&gt;", obj.name);
225+
Assertions.assertTrue(obj.tags.isEmpty());
226+
}
227+
215228
@Test
216229
void testEscapeHtmlInObjectWithNullList() {
217230
// Test object with null list

0 commit comments

Comments
 (0)