You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/03/26 23:24:39 UTC
svn commit: r758892 - in
/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker:
context/FreeMarkerTilesRequestContextFactoryTest.java
context/FreeMarkerTilesRequestContextTest.java io/ io/NullWriterTest.java
Author: apetrelli
Date: Thu Mar 26 22:24:39 2009
New Revision: 758892
URL: http://svn.apache.org/viewvc?rev=758892&view=rev
Log:
TILES-382
Fixed tiles-freemarker existing tests.
Added test for NullWriter.
Added:
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java (with props)
Modified:
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java?rev=758892&r1=758891&r2=758892&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java Thu Mar 26 22:24:39 2009
@@ -1,5 +1,8 @@
package org.apache.tiles.freemarker.context;
+import static org.junit.Assert.*;
+import static org.easymock.classextension.EasyMock.*;
+
import java.io.StringWriter;
import java.util.HashMap;
@@ -9,7 +12,7 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
-import org.easymock.classextension.EasyMock;
+import org.junit.Test;
import freemarker.core.Environment;
import freemarker.ext.servlet.HttpRequestHashModel;
@@ -17,27 +20,39 @@
import freemarker.template.Template;
import freemarker.template.TemplateHashModel;
import freemarker.template.TemplateModelException;
-import junit.framework.TestCase;
-
-public class FreeMarkerTilesRequestContextFactoryTest extends TestCase{
+/**
+ * @author antonio
+ *
+ */
+public class FreeMarkerTilesRequestContextFactoryTest {
+
+ /**
+ * The object to test.
+ */
private FreeMarkerTilesRequestContextFactory factory;
+ /**
+ * Tests {@link FreeMarkerTilesRequestContextFactory#createRequestContext(TilesApplicationContext, Object...)}.
+ *
+ * @throws TemplateModelException If something goes wrong.
+ */
+ @Test
public void testCreateRequestContext() throws TemplateModelException {
- Template template = EasyMock.createMock(Template.class);
- TemplateHashModel model = EasyMock.createMock(TemplateHashModel.class);
+ Template template = createMock(Template.class);
+ TemplateHashModel model = createMock(TemplateHashModel.class);
StringWriter writer = new StringWriter();
- EasyMock.expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
- TilesRequestContextFactory parentFactory = EasyMock.createMock(TilesRequestContextFactory.class);
- TilesApplicationContext applicationContext = EasyMock.createMock(TilesApplicationContext.class);
- HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
- HttpServletResponse response = EasyMock.createMock(HttpServletResponse.class);
- ObjectWrapper wrapper = EasyMock.createMock(ObjectWrapper.class);
+ expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
+ TilesRequestContextFactory parentFactory = createMock(TilesRequestContextFactory.class);
+ TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ ObjectWrapper wrapper = createMock(ObjectWrapper.class);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, response, wrapper);
- EasyMock.expect(model.get("Request")).andReturn(requestModel);
- TilesRequestContext enclosedRequest = EasyMock.createMock(TilesRequestContext.class);
- EasyMock.expect(parentFactory.createRequestContext(applicationContext, request, response)).andReturn(enclosedRequest);
- EasyMock.replay(template, model, parentFactory, applicationContext, request, response, wrapper);
+ expect(model.get("Request")).andReturn(requestModel);
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ expect(parentFactory.createRequestContext(applicationContext, request, response)).andReturn(enclosedRequest);
+ replay(template, model, parentFactory, applicationContext, request, response, wrapper);
Environment env = new Environment(template, model, writer);
factory = new FreeMarkerTilesRequestContextFactory();
factory.setRequestContextFactory(parentFactory);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java?rev=758892&r1=758891&r2=758892&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java Thu Mar 26 22:24:39 2009
@@ -1,71 +1,158 @@
package org.apache.tiles.freemarker.context;
+import static org.junit.Assert.*;
+import static org.easymock.classextension.EasyMock.*;
+
import java.io.IOException;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Locale;
-import junit.framework.TestCase;
-
import org.apache.tiles.context.TilesRequestContext;
-import org.easymock.classextension.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
import freemarker.core.Environment;
import freemarker.template.Template;
import freemarker.template.TemplateHashModel;
-public class FreeMarkerTilesRequestContextTest extends TestCase {
-
+/**
+ * @author antonio
+ *
+ */
+public class FreeMarkerTilesRequestContextTest {
+
+ /**
+ * The reuqest context to test.
+ */
private FreeMarkerTilesRequestContext context;
+ /**
+ * A string writer.
+ */
private StringWriter writer;
+ /**
+ * The FreeMarker environment.
+ */
private Environment env;
+ /**
+ * The locale object.
+ */
private Locale locale;
- protected void setUp() throws Exception {
- Template template = EasyMock.createMock(Template.class);
- TemplateHashModel model = EasyMock.createMock(TemplateHashModel.class);
+ /**
+ * @throws java.lang.Exception If something goes wrong.
+ */
+ @Before
+ public void setUp() throws Exception {
+ Template template = createMock(Template.class);
+ TemplateHashModel model = createMock(TemplateHashModel.class);
writer = new StringWriter();
- EasyMock.expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
- EasyMock.replay(template, model);
+ expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
+ replay(template, model);
env = new Environment(template, model, writer);
locale = Locale.ITALY;
env.setLocale(locale);
}
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#dispatch(String)}.
+ *
+ * @throws IOException If something goes wrong.
+ */
+ @Test
public void testDispatch() throws IOException {
String path = "this way";
- TilesRequestContext enclosedRequest = EasyMock.createMock(TilesRequestContext.class);
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
enclosedRequest.include(path);
- EasyMock.replay(enclosedRequest);
+ replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
context.dispatch(path);
- EasyMock.verify(enclosedRequest);
+ verify(enclosedRequest);
}
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#getRequestLocale()}.
+ */
+ @Test
public void testGetRequestLocale() {
- TilesRequestContext enclosedRequest = EasyMock.createMock(TilesRequestContext.class);
- EasyMock.replay(enclosedRequest);
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
assertEquals(locale, context.getRequestLocale());
- EasyMock.verify(enclosedRequest);
+ verify(enclosedRequest);
}
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#getRequest()}.
+ */
+ @Test
public void testGetRequest() {
- TilesRequestContext enclosedRequest = EasyMock.createMock(TilesRequestContext.class);
- EasyMock.replay(enclosedRequest);
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
assertEquals(env, context.getRequest());
- EasyMock.verify(enclosedRequest);
+ verify(enclosedRequest);
}
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#getResponse()}.
+ */
+ @Test
public void testGetResponse() {
- TilesRequestContext enclosedRequest = EasyMock.createMock(TilesRequestContext.class);
- EasyMock.replay(enclosedRequest);
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
assertEquals(env, context.getResponse());
- EasyMock.verify(enclosedRequest);
+ verify(enclosedRequest);
+ }
+
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#getPrintWriter()}.
+ *
+ * @throws IOException If something goes wrong.
+ */
+ @Test
+ public void testGetPrintWriter() throws IOException {
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+
+ replay(enclosedRequest);
+ context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
+ assertEquals(env, context.getResponse());
+ assertNotNull(context.getPrintWriter());
+ verify(enclosedRequest);
+ }
+
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#getWriter()}.
+ *
+ * @throws IOException If something goes wrong.
+ */
+ @Test
+ public void testGetWriter() throws IOException {
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+
+ replay(enclosedRequest);
+ context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
+ assertEquals(env, context.getResponse());
+ assertNotNull(context.getWriter());
+ verify(enclosedRequest);
+ }
+
+ /**
+ * Tests {@link FreeMarkerTilesRequestContext#getRequestObjects()}.
+ */
+ @Test
+ public void testGetRequestObjects() {
+ TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+
+ replay(enclosedRequest);
+ context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
+ Object[] requestObjects = context.getRequestObjects();
+ assertEquals(1, requestObjects.length);
+ assertEquals(env, requestObjects[0]);
+ verify(enclosedRequest);
}
}
Added: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java?rev=758892&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java (added)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java Thu Mar 26 22:24:39 2009
@@ -0,0 +1,57 @@
+/**
+ *
+ */
+package org.apache.tiles.freemarker.io;
+
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author antonio
+ *
+ */
+public class NullWriterTest {
+
+ /**
+ * The object to test.
+ */
+ private NullWriter writer;
+
+ /**
+ * @throws java.lang.Exception If something goes wrong.
+ */
+ @Before
+ public void setUp() throws Exception {
+ writer = new NullWriter();
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.freemarker.io.NullWriter#write(char[], int, int)}.
+ * @throws IOException If something goes wrong.
+ */
+ @Test
+ public void testWriteCharArrayIntInt() throws IOException {
+ writer.write("Hello there".toCharArray(), 0, 15);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.freemarker.io.NullWriter#flush()}.
+ * @throws IOException If something goes wrong.
+ */
+ @Test
+ public void testFlush() throws IOException {
+ writer.flush();
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.freemarker.io.NullWriter#close()}.
+ * @throws IOException If something goes wrong.
+ */
+ @Test
+ public void testClose() throws IOException {
+ writer.close();
+ }
+
+}
Propchange: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL