You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2022/10/26 11:54:02 UTC
[struts] branch WW-4692-encoder-decoder updated: WW-4692 Improves code coverage
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-4692-encoder-decoder
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/WW-4692-encoder-decoder by this push:
new 6e6c95f6e WW-4692 Improves code coverage
6e6c95f6e is described below
commit 6e6c95f6e9dce083fb5448338e31501303766f61
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed Oct 26 13:53:58 2022 +0200
WW-4692 Improves code coverage
---
.../apache/struts2/url/StrutsUrlDecoderTest.java | 48 ++++++++++++++--------
.../apache/struts2/url/StrutsUrlEncoderTest.java | 13 ++++++
2 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/core/src/test/java/org/apache/struts2/url/StrutsUrlDecoderTest.java b/core/src/test/java/org/apache/struts2/url/StrutsUrlDecoderTest.java
index cc26e3e2a..5dd44f897 100644
--- a/core/src/test/java/org/apache/struts2/url/StrutsUrlDecoderTest.java
+++ b/core/src/test/java/org/apache/struts2/url/StrutsUrlDecoderTest.java
@@ -22,6 +22,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
public class StrutsUrlDecoderTest {
@@ -29,11 +30,11 @@ public class StrutsUrlDecoderTest {
private StrutsUrlDecoder decoder;
@Test
- public void testURLDecodeStringInvalid() {
+ public void testDecodeStringInvalid() {
// %n rather than %nn should throw an IAE according to the Javadoc
Exception exception = null;
try {
- this.decoder.decode("%5xxxxx", "ISO-8859-1", false);
+ decoder.decode("%5xxxxx", "ISO-8859-1", false);
} catch (Exception e) {
exception = e;
}
@@ -42,7 +43,7 @@ public class StrutsUrlDecoderTest {
// Edge case trying to trigger ArrayIndexOutOfBoundsException
exception = null;
try {
- this.decoder.decode("%5", "ISO-8859-1", false);
+ decoder.decode("%5", "ISO-8859-1", false);
} catch (Exception e) {
exception = e;
}
@@ -50,47 +51,60 @@ public class StrutsUrlDecoderTest {
}
@Test
- public void testURLDecodeStringValidIso88591Start() {
- String result = this.decoder.decode("%41xxxx", "ISO-8859-1", false);
+ public void testDecodeStringValidIso88591Start() {
+ String result = decoder.decode("%41xxxx", "ISO-8859-1", false);
assertEquals("Axxxx", result);
}
@Test
- public void testURLDecodeStringValidIso88591Middle() {
- String result = this.decoder.decode("xx%41xx", "ISO-8859-1", false);
+ public void testDecodeStringValidIso88591Middle() {
+ String result = decoder.decode("xx%41xx", "ISO-8859-1", false);
assertEquals("xxAxx", result);
}
@Test
- public void testURLDecodeStringValidIso88591End() {
- String result = this.decoder.decode("xxxx%41", "ISO-8859-1", false);
+ public void testDecodeStringValidIso88591End() {
+ String result = decoder.decode("xxxx%41", "ISO-8859-1", false);
assertEquals("xxxxA", result);
}
@Test
- public void testURLDecodeStringValidUtf8Start() {
- String result = this.decoder.decode("%c3%aaxxxx", "UTF-8", false);
+ public void testDecodeStringValidUtf8Start() {
+ String result = decoder.decode("%c3%aaxxxx", "UTF-8", false);
assertEquals("\u00eaxxxx", result);
}
@Test
- public void testURLDecodeStringValidUtf8Middle() {
- String result = this.decoder.decode("xx%c3%aaxx", "UTF-8", false);
+ public void testDecodeStringValidUtf8Middle() {
+ String result = decoder.decode("xx%c3%aaxx", "UTF-8", false);
assertEquals("xx\u00eaxx", result);
}
@Test
- public void testURLDecodeStringValidUtf8End() {
- String result = this.decoder.decode("xxxx%c3%aa", "UTF-8", false);
+ public void testDecodeStringValidUtf8End() {
+ String result = decoder.decode("xxxx%c3%aa", "UTF-8", false);
assertEquals("xxxx\u00ea", result);
}
@Test
- public void testURLDecodePlusCharAsSpace() {
- String result = this.decoder.decode("a+b", "UTF-8", true);
+ public void testDecodePlusCharAsSpace() {
+ String result = decoder.decode("a+b", "UTF-8", true);
assertEquals("a b", result);
}
+ @Test
+ public void testDecodeNull() {
+ String result = decoder.decode(null);
+ assertNull(result);
+ }
+
+ @Test
+ public void testSettingEncoding() {
+ decoder.setEncoding("ISO-8859-1");
+ String result = decoder.decode("xxxx%41");
+ assertEquals("xxxxA", result);
+ }
+
@Before
public void setUp() throws Exception {
this.decoder = new StrutsUrlDecoder();
diff --git a/core/src/test/java/org/apache/struts2/url/StrutsUrlEncoderTest.java b/core/src/test/java/org/apache/struts2/url/StrutsUrlEncoderTest.java
index d095f0291..95aaacda6 100644
--- a/core/src/test/java/org/apache/struts2/url/StrutsUrlEncoderTest.java
+++ b/core/src/test/java/org/apache/struts2/url/StrutsUrlEncoderTest.java
@@ -69,6 +69,19 @@ public class StrutsUrlEncoderTest {
assertEquals("a+b", result);
}
+ @Test
+ public void testEncodeException() {
+ String result = encoder.encode("a b", "UNKNOWN-8");
+ assertEquals("a b", result);
+ }
+
+ @Test
+ public void testSettingEncoding() {
+ encoder.setEncoding("ISO-8859-1");
+ String result = encoder.encode("%xxxx");
+ assertEquals("%25xxxx", result);
+ }
+
@Before
public void setUp() throws Exception {
this.encoder = new StrutsUrlEncoder();