This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 8df3dbe38 Unit test modernization.
8df3dbe38 is described below
commit 8df3dbe389751f3c2cbe30a29d2250bddf99d2d6
Author: James Bognar <[email protected]>
AuthorDate: Thu Jul 31 17:24:37 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/BeanMapTest.java | 4 ++--
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 22 +++++++++++-----------
.../a/rttests/RoundTripLargeObjectsTest.java | 2 +-
.../a/rttests/RoundTripSimpleObjectsTest.java | 2 +-
.../a/rttests/RoundTripTransformBeansTest.java | 14 +++++++-------
.../juneau/assertions/BooleanAssertion_Test.java | 2 --
.../juneau/config/ConfigMapListenerTest.java | 16 ++++------------
.../org/apache/juneau/config/ConfigMapTest.java | 2 +-
.../java/org/apache/juneau/config/ConfigTest.java | 1 -
.../java/org/apache/juneau/cp/FileFinder_Test.java | 2 +-
.../httppart/HttpPartSchema_Response_Test.java | 2 +-
.../apache/juneau/httppart/UonPartParser_Test.java | 1 -
.../org/apache/juneau/json/JsonParserTest.java | 1 -
.../apache/juneau/objecttools/ObjectRest_Test.java | 4 ++--
.../org/apache/juneau/reflect/ClassInfoTest.java | 3 +--
.../juneau/rest/annotation/Swagger_Query_Test.java | 2 +-
.../rest/client/RestClient_BasicCalls_Test.java | 2 --
.../juneau/urlencoding/UrlEncodingParserTest.java | 2 --
.../apache/juneau/utils/StringVarResolverTest.java | 1 -
.../java/org/apache/juneau/xml/CommonXmlTest.java | 6 ++----
.../test/java/org/apache/juneau/xml/XmlTest.java | 6 +++---
21 files changed, 38 insertions(+), 59 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index 96e19ff79..44057d87a 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -1640,7 +1640,7 @@ public class BeanMapTest {
assertEquals("1", l2[0].toString());
l3 = m.cast(bc.getClassMeta(int[].class));
- assertEquals("1", l2[0].toString());
+ assertEquals(1, l3[0]);
// Without _type
m = new JsonMap();
@@ -1653,7 +1653,7 @@ public class BeanMapTest {
assertEquals("1", l[0]);
l2 = m.cast(bc.getClassMeta(StringBuffer[].class));
- assertEquals("1", l[0]);
+ assertEquals("1", l2[0].toString());
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index 986fc483c..d3f68a563 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -647,7 +647,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testMemberClass() throws Exception {
G t = G.create();
- t = roundTrip(t, G.class);
+ roundTrip(t, G.class);
}
public static class G {
@@ -686,7 +686,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testMemberClassWithMapClass() throws Exception {
H t = H.create();
- t = roundTrip(t, H.class);
+ roundTrip(t, H.class);
}
public static class H extends LinkedHashMap<String,H.H1> {
@@ -725,7 +725,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testMemberClassWithListClass() throws Exception {
I t = I.create();
- t = roundTrip(t, I.class);
+ roundTrip(t, I.class);
}
public static class I extends LinkedList<I.I1> {
@@ -764,7 +764,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testMemberClassWithStringConstructor() throws Exception {
J t = J.create();
- t = roundTrip(t, J.class);
+ roundTrip(t, J.class);
}
public static class J {
@@ -800,7 +800,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testBeanPropertyPrecedence() throws Exception {
K t = K.create();
- t = roundTrip(t, K.class);
+ roundTrip(t, K.class);
}
public enum KEnum { FOO, BAR, BAZ }
@@ -874,7 +874,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testWrapperAttrAnnotationOnBean() throws Exception {
L t = L.create();
- t = roundTrip(t, L.class);
+ roundTrip(t, L.class);
Map<String,L> m = new LinkedHashMap<>();
m.put("bar", L.create());
@@ -895,7 +895,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testWrapperAttrAnnotationOnBean_usingConfig() throws
Exception {
L2 t = L2.create();
- t = roundTrip(t, L2.class);
+ roundTrip(t, L2.class);
Map<String,L2> m = new LinkedHashMap<>();
m.put("bar", L2.create());
@@ -921,7 +921,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testWrapperAttrAnnotationOnNonBean() throws Exception {
M t = M.create();
- t = roundTrip(t, M.class);
+ roundTrip(t, M.class);
Map<String,M> m = new LinkedHashMap<>();
m.put("bar", M.create());
@@ -953,7 +953,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
@Test
public void testWrapperAttrAnnotationOnNonBean_usingConfig() throws
Exception {
M2 t = M2.create();
- t = roundTrip(t, M2.class);
+ roundTrip(t, M2.class);
Map<String,M2> m = new LinkedHashMap<>();
m.put("bar", M2.create());
@@ -997,10 +997,10 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
t = roundTrip(t, N.class);
t.f1.attr("foo", "bar").attrUri("href", "http://foo";);
- t = roundTrip(t, N.class);
+ roundTrip(t, N.class);
Head h = new Head().child(new Style());
- h = roundTrip(h, Head.class);
+ roundTrip(h, Head.class);
}
public static class N {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
index c00967e00..a59e5cc19 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
@@ -161,7 +161,7 @@ public class RoundTripLargeObjectsTest extends
RoundTripTest {
System.err.println(format("Average serialize time:
{0,number}ms", (System.currentTimeMillis()-startTime)/numRuns)); // NOT DEBUG
startTime = System.currentTimeMillis();
for (int i = 0; i < numRuns; i++)
- a = p.parse(r, A.class);
+ p.parse(r, A.class);
System.err.println(format("Average parsed time: {0,number}ms",
(System.currentTimeMillis()-startTime)/numRuns)); // NOT DEBUG
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
index 6d512e420..e0f41b2c1 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
@@ -760,7 +760,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
t.add(1);
t.add(2);
t.add(3);
- t = roundTrip(t, Vector.class, Integer.class);
+ roundTrip(t, Vector.class, Integer.class);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
index 436f853f4..f2b73261f 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
@@ -353,7 +353,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
r = getSerializer().serialize(x);
assertTrue(toString(r).contains("f2"));
- x = roundTrip(x, D1.class);
+ roundTrip(x, D1.class);
}
public static class D1 {
@@ -395,7 +395,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
r = getSerializer().serialize(x);
assertTrue(toString(r).contains("f2"));
- x = roundTrip(x, E1.class);
+ roundTrip(x, E1.class);
}
@Swap(E2.class)
@@ -438,7 +438,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
r = getSerializer().serialize(x);
assertTrue(toString(r).contains("f2"));
- x = roundTrip(x, E1c.class);
+ roundTrip(x, E1c.class);
}
@Swap(on="Dummy1",value=E2c.class)
@@ -507,7 +507,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
x = p.parse(r, F1.class);
assertObject(x).asJson().is("{c:'2018-12-12T05:12:00'}");
- x = roundTrip(x, F1.class);
+ roundTrip(x, F1.class);
}
@Swap(on="Dummy1.c", value=TemporalCalendarSwap.IsoLocalDateTime.class)
@@ -548,7 +548,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
x = p.parse(r, F1c.class);
assertObject(x).asString(s).is("{c:'2018-12-12T05:12:00'}");
- x = roundTrip(x, F1c.class);
+ roundTrip(x, F1c.class);
}
public static class F2a {
@@ -589,7 +589,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
x = p.parse(r, F2.class);
assertObject(x).asJson().is("{c:'2018-12-12T05:12:00'}");
- x = roundTrip(x, F2.class);
+ roundTrip(x, F2.class);
}
@Swap(on="Dummy1.c", value=TemporalCalendarSwap.IsoLocalDateTime.class)
@@ -632,7 +632,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
x = p.parse(r, F2.class);
assertObject(x).asString(s).is("{c:'2018-12-12T05:12:00'}");
- x = roundTrip(x, F2.class);
+ roundTrip(x, F2.class);
}
//==================================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
index 834d25ca9..4b25923ec 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
@@ -16,8 +16,6 @@ import static
org.apache.juneau.assertions.AssertionPredicates.*;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
-import java.util.*;
-
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
index edb76d8cd..4c2ba642f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
@@ -478,13 +478,12 @@ public class ConfigMapListenerTest {
contents.add("[S1]\nk1 = v1c");
contents.add("[S1]\nk1 = v1c");
- MemoryStore s = new MemoryStore(MemoryStore.create()) {
+ try (var s = new MemoryStore(MemoryStore.create()) {
@Override
public synchronized String read(String name) {
return contents.poll();
}
- };
- try {
+ }) {
final CountDownLatch latch = new CountDownLatch(2);
final Queue<String> eventList = new
ConcurrentLinkedQueue<>();
eventList.add("[SET(S1/k1 = v1b)]");
@@ -506,23 +505,19 @@ public class ConfigMapListenerTest {
cm.unregister(l);
assertString(cm).asReplaceAll("\\r?\\n",
"|").is("[S1]|k1 = v1c|");
-
- } finally {
- s.close();
}
}
@Test
public void testMergeWithConstantlyUpdatingFile() throws Exception {
- MemoryStore s = new MemoryStore(MemoryStore.create()) {
+ try (var s = new MemoryStore(MemoryStore.create()) {
char c = 'a';
@Override
public synchronized String read(String name) {
return "[S1]\nk1 = v1" + (c++);
}
- };
- try {
+ }) {
final CountDownLatch latch = new CountDownLatch(10);
final Queue<String> eventList = new
ConcurrentLinkedQueue<>();
eventList.add("[SET(S1/k1 = v1b)]");
@@ -552,9 +547,6 @@ public class ConfigMapListenerTest {
cm.unregister(l);
assertString(cm).asReplaceAll("\\r?\\n",
"|").is("[S1]|k1 = v1c|");
-
- } finally {
- s.close();
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapTest.java
index ed504bd8a..15ceb551e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapTest.java
@@ -50,7 +50,7 @@ public class ConfigMapTest {
assertEquals("", cm.toString());
s.update("A.cfg", " \n \n ");
- cm = s.getMap("A.cfg");
+ s.getMap("A.cfg");
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index d27c60f70..5308f2029 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -15,7 +15,6 @@ package org.apache.juneau.config;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.utest.utils.Utils.*;
import static org.junit.Assert.*;
-import static org.apache.juneau.utest.utils.Utils.*;
import java.io.*;
import java.net.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
index 00cb62710..596381128 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -541,7 +541,7 @@ public class FileFinder_Test {
assertBytes(stream(x,"/dir/dir/a.txt/",
JAPANESE)).asString().isContains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]");
assertBytes(stream(x,"/dir/dir/a.txt/",
JAPAN)).asString().isContains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]");
- x = FileFinder
+ FileFinder
.create()
.cp(FileFinder_Test2.class, "files/test2", true)
.exclude("(?i).*\\.(class|properties)")
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
index 7cc96f7ff..ee36a42d1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
@@ -118,7 +118,7 @@ public class HttpPartSchema_Response_Test {
public static class A05 {}
@Test
- public void a05_basic_nestedItems_onClass() throws Exception {
+ public void a05_basic_nestedItems_onClass() {
HttpPartSchema s =
HttpPartSchema.create().apply(Response.class, A05.class).noValidate().build();
assertEquals(HttpPartDataType.NUMBER, s.getType());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/UonPartParser_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/UonPartParser_Test.java
index 1b4014363..0f34bd88a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/UonPartParser_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/UonPartParser_Test.java
@@ -135,7 +135,6 @@ public class UonPartParser_Test {
// Boolean
// Top level
- t = "_value=false";
Boolean b = false;
t = "false";
b = (Boolean)parse(t, bs.object());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/json/JsonParserTest.java
b/juneau-utest/src/test/java/org/apache/juneau/json/JsonParserTest.java
index 14687494a..3a1d8fef2 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonParserTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonParserTest.java
@@ -76,7 +76,6 @@ public class JsonParserTest {
a = p.parse(json, A.class);
assertEquals("123", a.fa);
- json = "'123'";
assertThrown(()->sp.parse("'123'",
String.class)).asMessage().isContains("Invalid quote character");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
index 88f32b569..c1770b4cd 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
@@ -208,7 +208,7 @@ public class ObjectRest_Test {
model.post("/", billClinton);
// Make sure we get the original person back.
- billClinton = (Person)model.get("/0");
+ assertSame(billClinton, model.get("/0"));
}
@@ -282,7 +282,7 @@ public class ObjectRest_Test {
model.post("/", billClinton);
// Make sure we get the original person back.
- billClinton = (Person)model.get("/0");
+ assertSame(billClinton, model.get("/0"));
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index eda808d7c..85366b035 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -131,8 +131,7 @@ public class ClassInfoTest {
aType =
((ParameterizedType)A2.class.getGenericSuperclass()).getActualTypeArguments()[0];
pType =
((ParameterizedType)A3.class.getGenericSuperclass()).getActualTypeArguments()[0];
pTypeDimensional =
((ParameterizedType)A4.class.getGenericSuperclass()).getActualTypeArguments()[0];
- Map<String,String> m = new HashMap<>();
- pTypeGeneric = m.getClass().getGenericSuperclass();
+ pTypeGeneric = HashMap.class.getGenericSuperclass();
pTypeGenericArg =
((ParameterizedType)pTypeGeneric).getActualTypeArguments()[1];
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
index 61c0f4242..9b37719c0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
@@ -169,7 +169,7 @@ public class Swagger_Query_Test {
) { /* no-op */ }
@RestDelete
- public void d(@Query("Q") String q) {}
+ public void d(@Query("Q") String q) {/* no-op */}
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index 01f8e0952..7246392aa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -21,10 +21,8 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.CollectionUtils.list;
import static org.apache.juneau.utest.utils.Utils.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.utest.utils.Utils.*;
import java.io.*;
-import java.net.*;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
index 969a0de04..244847e93 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
@@ -229,14 +229,12 @@ public class UrlEncodingParserTest {
// Encoded chars
// Top level
- t = "_value=x{}|\\^[]`<>#%\"&+";
assertThrown(()->p.parse("_value=x{}|\\^[]`<>#%\"&+",
Object.class)).isType(ParseException.class);
t = "_value=x%7B%7D%7C%5C%5E%5B%5D%60%3C%3E%23%25%22%26%2B";
assertEquals("x{}|\\^[]`<>#%\"&+", p.parse(t, Object.class));
assertEquals("x{}|\\^[]`<>#%\"&+", p.parse(t, String.class));
// 2nd level
- t = "?x{}|\\^[]`<>#%\"&+=x{}|\\^[]`<>#%\"&+";
assertThrown(()->p.parse("?x{}|\\^[]`<>#%\"&+=x{}|\\^[]`<>#%\"&+",
Object.class)).isType(ParseException.class);
t =
"?x%7B%7D%7C%5C%5E%5B%5D%60%3C%3E%23%25%22%26%2B=x%7B%7D%7C%5C%5E%5B%5D%60%3C%3E%23%25%22%26%2B";
m = (Map)p.parse(t, Object.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
index a1e34c6d2..70dd6dfd5 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
@@ -261,7 +261,6 @@ public class StringVarResolverTest {
assertEquals("baz$S{foobar", vr.resolve(in));
System.clearProperty("foobar");
- in = "$S{foobar}";
// Test nulls returned by StringVar.
// Should be converted to blanks.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
index ee9dbea93..8b313b3ed 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
@@ -16,8 +16,6 @@ import static org.apache.juneau.utest.utils.Utils.*;
import static org.apache.juneau.xml.annotation.XmlFormat.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.utest.utils.Utils.*;
-
import java.net.*;
import org.apache.juneau.annotation.*;
@@ -53,7 +51,7 @@ public class CommonXmlTest {
@Xml(format=ATTR) public int id;
public String name;
public A() {}
- public A(String url, int id, String name) throws Exception {
+ public A(String url, int id, String name) {
this.url = url(url);
this.id = id;
this.name = name;
@@ -76,7 +74,7 @@ public class CommonXmlTest {
@Xml(format=XmlFormat.ATTR) public URL url;
public URL url2;
public B() {}
- public B(String url) throws Exception {
+ public B(String url) {
this.url = url(url);
this.url2 = url(url+"/2");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
index 96c72ded0..9fedf43e9 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
@@ -448,7 +448,7 @@ public class XmlTest {
public int id;
public String name;
public N() {}
- public N(String url, int id, String name) throws Exception {
+ public N(String url, int id, String name) {
this.url = url(url);
this.id = id;
this.name = name;
@@ -481,7 +481,7 @@ public class XmlTest {
@Beanp(name="id2") public int id;
public String name;
public O() {}
- public O(String url, int id, String name) throws Exception {
+ public O(String url, int id, String name) {
this.url = url(url);
this.id = id;
this.name = name;
@@ -514,7 +514,7 @@ public class XmlTest {
@Beanp(name="id2") @Xml(format=ATTR) public int id;
public String name;
public P() {}
- public P(String url, int id, String name) throws Exception {
+ public P(String url, int id, String name) {
this.url = url(url);
this.id = id;
this.name = name;
