@@ -109,6 +109,33 @@ public void testAddDefaultStringLookupsNull() {
109109 StringLookupFactory .INSTANCE .addDefaultStringLookups (null );
110110 }
111111
112+ /**
113+ * Tests that we return the singleton.
114+ */
115+ @ Test
116+ public void testDefault () {
117+ final StringLookupFactory stringLookupFactory = StringLookupFactory .INSTANCE ;
118+ final Map <String , StringLookup > stringLookupMap = new HashMap <>();
119+ stringLookupFactory .addDefaultStringLookups (stringLookupMap );
120+ assertTrue (stringLookupMap .containsKey ("base64" ));
121+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_BASE64_ENCODER .toLowerCase (Locale .ROOT )));
122+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_CONST .toLowerCase (Locale .ROOT )));
123+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_DATE ));
124+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_ENV .toLowerCase (Locale .ROOT )));
125+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_FILE .toLowerCase (Locale .ROOT )));
126+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_JAVA .toLowerCase (Locale .ROOT )));
127+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_LOCALHOST .toLowerCase (Locale .ROOT )));
128+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_LOOPBACK_ADDRESS .toLowerCase (Locale .ROOT )));
129+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_PROPERTIES .toLowerCase (Locale .ROOT )));
130+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_RESOURCE_BUNDLE .toLowerCase (Locale .ROOT )));
131+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_SYS .toLowerCase (Locale .ROOT )));
132+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_URL_DECODER .toLowerCase (Locale .ROOT )));
133+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_URL_ENCODER .toLowerCase (Locale .ROOT )));
134+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_XML .toLowerCase (Locale .ROOT )));
135+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_XML_DECODER .toLowerCase (Locale .ROOT )));
136+ assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_XML_ENCODER .toLowerCase (Locale .ROOT )));
137+ }
138+
112139 @ Test
113140 public void testDefaultStringLookupsHolder_allLookups () {
114141 final Properties props = new Properties ();
@@ -247,33 +274,6 @@ public void testSingletons() {
247274 assertSame (XmlEncoderStringLookup .INSTANCE , stringLookupFactory .xmlEncoderStringLookup ());
248275 }
249276
250- /**
251- * Tests that we return the singleton.
252- */
253- @ Test
254- public void testDefault () {
255- final StringLookupFactory stringLookupFactory = StringLookupFactory .INSTANCE ;
256- final Map <String , StringLookup > stringLookupMap = new HashMap <>();
257- stringLookupFactory .addDefaultStringLookups (stringLookupMap );
258- assertTrue (stringLookupMap .containsKey ("base64" ));
259- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_BASE64_ENCODER .toLowerCase (Locale .ROOT )));
260- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_CONST .toLowerCase (Locale .ROOT )));
261- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_DATE ));
262- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_ENV .toLowerCase (Locale .ROOT )));
263- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_FILE .toLowerCase (Locale .ROOT )));
264- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_JAVA .toLowerCase (Locale .ROOT )));
265- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_LOCALHOST .toLowerCase (Locale .ROOT )));
266- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_LOOPBACK_ADDRESS .toLowerCase (Locale .ROOT )));
267- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_PROPERTIES .toLowerCase (Locale .ROOT )));
268- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_RESOURCE_BUNDLE .toLowerCase (Locale .ROOT )));
269- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_SYS .toLowerCase (Locale .ROOT )));
270- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_URL_DECODER .toLowerCase (Locale .ROOT )));
271- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_URL_ENCODER .toLowerCase (Locale .ROOT )));
272- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_XML .toLowerCase (Locale .ROOT )));
273- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_XML_DECODER .toLowerCase (Locale .ROOT )));
274- assertTrue (stringLookupMap .containsKey (StringLookupFactory .KEY_XML_ENCODER .toLowerCase (Locale .ROOT )));
275- }
276-
277277 @ Test
278278 public void testXmlStringLookup () {
279279 final StringLookupFactory stringLookupFactory = StringLookupFactory .INSTANCE ;
0 commit comments