From 9dfac826aa9d705a37c81f70fff64aebc91e269f Mon Sep 17 00:00:00 2001 From: Yuzo Hebishima Date: Sun, 20 Jan 2013 19:09:20 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=AE=E4=B8=80=E6=99=82=E7=84=A1=E5=8A=B9?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jp/dogrun/ileaflet/taglib/LoginTag.java | 4 ++-- .../login/SetPasswordControllerTest.java | 18 ++++++++++++++++++ .../datastore-indexes-auto.xml | 2 +- war/WEB-INF/appengine-generated/local_db.bin | Bin 3470 -> 3470 bytes 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 test/jp/dogrun/ileaflet/controller/login/SetPasswordControllerTest.java diff --git a/src/jp/dogrun/ileaflet/taglib/LoginTag.java b/src/jp/dogrun/ileaflet/taglib/LoginTag.java index 1b47ae0..f7e2c93 100644 --- a/src/jp/dogrun/ileaflet/taglib/LoginTag.java +++ b/src/jp/dogrun/ileaflet/taglib/LoginTag.java @@ -24,8 +24,8 @@ public int doStartTag() throws JspException { Actor actor = null; - HttpServletRequest request = RequestLocator.get(); - actor = (Actor)request.getSession().getAttribute(Actor.class.getName()); + //HttpServletRequest request = RequestLocator.get(); + //actor = (Actor)request.getSession().getAttribute(Actor.class.getName()); try { JspWriter out = pageContext.getOut(); diff --git a/test/jp/dogrun/ileaflet/controller/login/SetPasswordControllerTest.java b/test/jp/dogrun/ileaflet/controller/login/SetPasswordControllerTest.java new file mode 100644 index 0000000..db506f7 --- /dev/null +++ b/test/jp/dogrun/ileaflet/controller/login/SetPasswordControllerTest.java @@ -0,0 +1,18 @@ +package jp.dogrun.ileaflet.controller.login; + +import org.slim3.tester.ControllerTestCase; +import org.junit.Test; +import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.*; + +public class SetPasswordControllerTest extends ControllerTestCase { + + @Test + public void run() throws Exception { + tester.start("/login/setPassword"); + SetPasswordController controller = tester.getController(); + assertThat(controller, is(notNullValue())); + assertThat(tester.isRedirect(), is(false)); + assertThat(tester.getDestinationPath(), is(nullValue())); + } +} diff --git a/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml b/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml index d805369..b520fdc 100644 --- a/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml +++ b/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml @@ -1,4 +1,4 @@ - + diff --git a/war/WEB-INF/appengine-generated/local_db.bin b/war/WEB-INF/appengine-generated/local_db.bin index 8413f1c6e4bca4f8bf09bbc1bace3bf72ea7c54f..e72dd745c7463d48b074ce4b1df54c4e13e23860 100644 GIT binary patch delta 107 zcmeB^?vviY#iL-EoNSS3WMXV#ZfKB_XkcWRYMf?~l4g-+VU}oYYHB%&TYj=9PmO|c zieZw8d7@dOg>hPHibYzIg^`7MQkrq9p=DaCfsr{#9Sg5KBg^FZTw;^0c=cEp2Ayq- Jn4HV22mm>d9r6GG delta 107 zcmeB^?vviY#iNjxVrgPvo|c+yXk?shVP=|QW@uz!n3`f~nqq2UnP@PHTYj=9PmO|! zahkcYfu)JLrJ0#YVxn2Hxlxj_u~Di)qKO4iaS})!3$HvQ)8zSFVw0_S^;ml!JuO-= IIhR)v01u2Ez5oCK