(Removed .java file from src/test/resources, merged it into the similar test in src/test/java)
diff --git a/src/test/java/freemarker/template/SimpleObjetWrapperTest.java b/src/test/java/freemarker/template/SimpleObjectWrapperTest.java
similarity index 67%
rename from src/test/java/freemarker/template/SimpleObjetWrapperTest.java
rename to src/test/java/freemarker/template/SimpleObjectWrapperTest.java
index 4af7f2f..39c9fcf 100644
--- a/src/test/java/freemarker/template/SimpleObjetWrapperTest.java
+++ b/src/test/java/freemarker/template/SimpleObjectWrapperTest.java
@@ -22,10 +22,13 @@
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
+import freemarker.template.DefaultObjectWrapperTest.TestBean;
+
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -39,7 +42,7 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-public class SimpleObjetWrapperTest {
+public class SimpleObjectWrapperTest {
@Test
public void testDoesNotAllowAPIBuiltin() throws TemplateModelException {
@@ -99,5 +102,43 @@
assertThat(e.getMessage(), containsString("won't wrap"));
}
}
+
+ @Test
+ public void testIncompatibleImprovements() throws TemplateModelException {
+ {
+ SimpleObjectWrapper ow = new SimpleObjectWrapper(Configuration.VERSION_2_3_22);
+ testIncompatibleImprovementsIndependentPart(ow);
+ assertTrue(ow.wrap(Collections.emptyMap()) instanceof DefaultMapAdapter);
+ assertTrue(ow.wrap(Collections.emptyList()) instanceof DefaultListAdapter);
+ assertTrue(ow.wrap(new boolean[] { }) instanceof DefaultArrayAdapter);
+ assertTrue(ow.wrap(new HashSet()) instanceof SimpleSequence); // at least until IcI 2.4
+ }
+
+ {
+ SimpleObjectWrapper ow = new SimpleObjectWrapper(Configuration.VERSION_2_3_21);
+ testIncompatibleImprovementsIndependentPart(ow);
+ assertTrue(ow.wrap(Collections.emptyMap()) instanceof SimpleHash);
+ assertTrue(ow.wrap(Collections.emptyList()) instanceof SimpleSequence);
+ assertTrue(ow.wrap(new boolean[] { }) instanceof SimpleSequence);
+ assertTrue(ow.wrap(new HashSet()) instanceof SimpleSequence);
+ }
+ }
+
+ @SuppressWarnings("boxing")
+ private void testIncompatibleImprovementsIndependentPart(SimpleObjectWrapper ow) throws TemplateModelException {
+ assertFalse(ow.isWriteProtected());
+
+ assertTrue(ow.wrap("x") instanceof SimpleScalar);
+ assertTrue(ow.wrap(1.5) instanceof SimpleNumber);
+ assertTrue(ow.wrap(new Date()) instanceof SimpleDate);
+ assertEquals(TemplateBooleanModel.TRUE, ow.wrap(true));
+
+ try {
+ ow.wrap(new TestBean());
+ fail();
+ } catch (TemplateModelException e) {
+ assertTrue(e.getMessage().contains("type"));
+ }
+ }
}
diff --git a/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java b/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
deleted file mode 100644
index 798bcca..0000000
--- a/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package freemarker.template;
-
-import static org.junit.Assert.*;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-
-import org.junit.Test;
-
-import freemarker.template.DefaultObjectWrapperTest.TestBean;
-
-public class SimpleObjectWrapperTest {
-
- @Test
- public void testBasics() throws TemplateModelException {
- {
- SimpleObjectWrapper ow = new SimpleObjectWrapper(Configuration.VERSION_2_3_22);
- testCustomizationCommonPart(ow);
- assertTrue(ow.wrap(Collections.emptyMap()) instanceof DefaultMapAdapter);
- assertTrue(ow.wrap(Collections.emptyList()) instanceof DefaultListAdapter);
- assertTrue(ow.wrap(new boolean[] { }) instanceof DefaultArrayAdapter);
- assertTrue(ow.wrap(new HashSet()) instanceof SimpleSequence); // at least until IcI 2.4
- }
-
- {
- SimpleObjectWrapper ow = new SimpleObjectWrapper(Configuration.VERSION_2_3_21);
- testCustomizationCommonPart(ow);
- assertTrue(ow.wrap(Collections.emptyMap()) instanceof SimpleHash);
- assertTrue(ow.wrap(Collections.emptyList()) instanceof SimpleSequence);
- assertTrue(ow.wrap(new boolean[] { }) instanceof SimpleSequence);
- assertTrue(ow.wrap(new HashSet()) instanceof SimpleSequence);
- }
- }
-
- @SuppressWarnings("boxing")
- private void testCustomizationCommonPart(SimpleObjectWrapper ow) throws TemplateModelException {
- assertFalse(ow.isWriteProtected());
-
- assertTrue(ow.wrap("x") instanceof SimpleScalar);
- assertTrue(ow.wrap(1.5) instanceof SimpleNumber);
- assertTrue(ow.wrap(new Date()) instanceof SimpleDate);
- assertEquals(TemplateBooleanModel.TRUE, ow.wrap(true));
-
- try {
- ow.wrap(new TestBean());
- fail();
- } catch (TemplateModelException e) {
- assertTrue(e.getMessage().contains("type"));
- }
- }
-
-}
