Author: simoneg
Date: Mon Jan 25 16:06:10 2010
New Revision: 902852
URL: http://svn.apache.org/viewvc?rev=902852&view=rev
Log:
Fix tests
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/DefaultExpectations.java
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/templating/TemplatingTest.java
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java?rev=902852&r1=902851&r2=902852&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java
Mon Jan 25 16:06:10 2010
@@ -42,6 +42,7 @@
protected Template template;
+ private String sessionMagma_lastmain;
/**
* Finds this handler complete path inside the URI space.
@@ -284,6 +285,15 @@
throw new HttpRedirectException(url);
}
+ public void redirectBack() {
+ String lastm = this.sessionMagma_lastmain;
+ if (lastm != null) {
+ redirect("magma:" + lastm);
+ }
+ }
+
+
+
protected RootWebHandler root() {
return RootWebHandler.getInstance();
}
Modified:
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/DefaultExpectations.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/DefaultExpectations.java?rev=902852&r1=902851&r2=902852&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/DefaultExpectations.java
(original)
+++
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/DefaultExpectations.java
Mon Jan 25 16:06:10 2010
@@ -64,13 +64,13 @@
allowing(req).getSession(false); will(returnValue(session));
allowing(req).getCookies(); will(returnValue(cookies));
allowing(req).getAttribute("cookieInvalidloggedIn");
will(returnValue(null));
- one(req).setAttribute("__magma_url",path);
- allowing(req).getAttribute("__magma_url");
will(returnValue(path));
+ one(req).setAttribute("magma_url",path);
+ allowing(req).getAttribute("magma_url");
will(returnValue(path));
allowing(session).getAttribute("magma_locale");
will(returnValue(null));
- atMost(1).of(session).getAttribute("__magma_lastmain");
will(returnValue(null));
- atMost(1).of(session).getAttribute("__magma_lasttemplate");
will(returnValue(null));
-
allowing(session).setAttribute(with(equal("__magma_lasttemplate")),
with(any(Class.class)));
- atMost(1).of(session).setAttribute("__magma_lastmain",path);
+ atMost(1).of(session).getAttribute("magma_lastmain");
will(returnValue(null));
+ atMost(1).of(session).getAttribute("magma_lasttemplate");
will(returnValue(null));
+
allowing(session).setAttribute(with(equal("magma_lasttemplate")),
with(any(Class.class)));
+ atMost(1).of(session).setAttribute("magma_lastmain",path);
allowing(session).getAttribute("name");
will(returnValue("java.lang.String:test name"));
allowing(req).getHeader("User-Agent");
will(returnValue("Mozilla"));
allowing(req).getParameter("page"); will(returnValue("1"));
@@ -95,13 +95,13 @@
allowing(req).getSession(); will(returnValue(session));
allowing(req).getSession(true); will(returnValue(session));
allowing(req).getSession(false); will(returnValue(session));
- allowing(req).getAttribute("__magma_url");
will(returnValue(path));
- one(req).setAttribute("__magma_url",path);
+ allowing(req).getAttribute("magma_url");
will(returnValue(path));
+ one(req).setAttribute("magma_url",path);
allowing(session).getAttribute("magma_locale");
will(returnValue(null));
- atMost(1).of(session).getAttribute("__magma_lastmain");
will(returnValue(null));
- atMost(1).of(session).getAttribute("__magma_lasttemplate");
will(returnValue(null));
-
allowing(session).setAttribute(with(equal("__magma_lasttemplate")),
with(any(Class.class)));
- allowing(session).setAttribute("__magma_lastmain", path);
+ atMost(1).of(session).getAttribute("magma_lastmain");
will(returnValue(null));
+ atMost(1).of(session).getAttribute("magma_lasttemplate");
will(returnValue(null));
+
allowing(session).setAttribute(with(equal("magma_lasttemplate")),
with(any(Class.class)));
+ allowing(session).setAttribute("magma_lastmain", path);
one(resp).setHeader("Content-Type","text/html; charset=utf-8");
allowing(resp).getOutputStream(); will(returnValue(out));
}
Modified:
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java?rev=902852&r1=902851&r2=902852&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
(original)
+++
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
Mon Jan 25 16:06:10 2010
@@ -112,7 +112,7 @@
@Test
public void findAndbindOnlyOnce() throws Exception {
final DefaultExpectations def = new DefaultExpectations() {{
-
one(session).setAttribute("__magma_lastmain","/test/report");
+
one(session).setAttribute("magma_lastmain","/test/report");
one(session).setAttribute("name",
"java.lang.String:resend");
}};
@@ -155,7 +155,7 @@
@Test
public void findAndbindOnlyOnceEvenOnNonDoMethods() throws Exception {
final DefaultExpectations def = new DefaultExpectations() {{
-
one(session).setAttribute("__magma_lastmain","/test/report");
+
one(session).setAttribute("magma_lastmain","/test/report");
one(session).setAttribute("name",
"java.lang.String:resend2");
}};
def.setupDefaults("/test/resend2");
@@ -216,7 +216,7 @@
@Test
public void parametrizedSimple() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
-
one(session).setAttribute("__magma_lastmain","/test/named" +
WebHandler.paramSeparator + "ciao");
+
one(session).setAttribute("magma_lastmain","/test/named" +
WebHandler.paramSeparator + "ciao");
one(session).setAttribute("name",
"java.lang.String:ciao");
}};
def.setupDefaults("/test/named/ciao");
@@ -238,7 +238,7 @@
@Test
public void parametrizedObject() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
-
one(session).setAttribute("__magma_lastmain","/test/userEntered" +
WebHandler.paramSeparator + "Arianna");
+
one(session).setAttribute("magma_lastmain","/test/userEntered" +
WebHandler.paramSeparator + "Arianna");
one(req).setAttribute("user",
Person.getPerson("Arianna"));
}};
def.setupDefaults("/test/userEntered/Arianna");
@@ -248,7 +248,7 @@
@Test
public void parametrizedPrimitive() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
-
one(session).setAttribute("__magma_lastmain","/test/goToPage" +
WebHandler.paramSeparator + "5");
+
one(session).setAttribute("magma_lastmain","/test/goToPage" +
WebHandler.paramSeparator + "5");
}};
def.setupDefaults("/test/goToPage" + WebHandler.paramSeparator
+ "5");
@@ -266,7 +266,7 @@
@Test
public void parametrizedObjectMissing() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
-
one(session).setAttribute("__magma_lastmain","/test/userEntered" +
WebHandler.paramSeparator);
+
one(session).setAttribute("magma_lastmain","/test/userEntered" +
WebHandler.paramSeparator);
one(req).removeAttribute("user");
}};
def.setupDefaults("/test/userEntered");
@@ -291,7 +291,7 @@
@Test
public void unrepeatable() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- never(session).setAttribute("__magma_lastmain",
any(String.class));
+ never(session).setAttribute("magma_lastmain",
any(String.class));
}};
def.setupDefaults("/test/neverRepeat");
def.start();
@@ -300,7 +300,7 @@
@Test
public void unrepeatableCall() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- never(session).setAttribute("__magma_lastmain",
any(String.class));
+ never(session).setAttribute("magma_lastmain",
any(String.class));
}};
def.setupDefaults("/test/neverRepeatCall");
def.start();
Modified:
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/templating/TemplatingTest.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/templating/TemplatingTest.java?rev=902852&r1=902851&r2=902852&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/templating/TemplatingTest.java
(original)
+++
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/templating/TemplatingTest.java
Mon Jan 25 16:06:10 2010
@@ -90,7 +90,7 @@
@Test
public void notReusingTemplate() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).getAttribute("__magma_lasttemplate");
will(returnValue(SimpleSecondTemplate.class));
+ one(session).getAttribute("magma_lasttemplate");
will(returnValue(SimpleSecondTemplate.class));
one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
@@ -110,8 +110,8 @@
@Test
public void reusingTemplate() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).getAttribute("__magma_lasttemplate");
will(returnValue(SimpleSecondTemplate.class));
- one(session).getAttribute("__magma_lastmain");
will(returnValue("/testSession/setUser"));
+ one(session).getAttribute("magma_lasttemplate");
will(returnValue(SimpleSecondTemplate.class));
+ one(session).getAttribute("magma_lastmain");
will(returnValue("/testSession/setUser"));
one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
@@ -132,7 +132,7 @@
@Test
public void simpleTemplateWithReplacedAuxiliary() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).getAttribute("__magma_lastmain");
will(returnValue("/testSession/setUser"));
+ one(session).getAttribute("magma_lastmain");
will(returnValue("/testSession/setUser"));
one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
