Author: simoneg
Date: Fri Dec 11 15:26:37 2009
New Revision: 889653
URL: http://svn.apache.org/viewvc?rev=889653&view=rev
Log:
LABS-235 : Better checks for data types now that there is a bean converter
Modified:
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/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=889653&r1=889652&r2=889653&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
Fri Dec 11 15:26:37 2009
@@ -70,7 +70,7 @@
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("test
name"));
+ 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"));
allowing(req).getAttribute("user"); will(returnValue(person));
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=889653&r1=889652&r2=889653&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
Fri Dec 11 15:26:37 2009
@@ -113,7 +113,7 @@
public void findAndbindOnlyOnce() throws Exception {
final DefaultExpectations def = new DefaultExpectations() {{
one(session).setAttribute("__magma_lastmain","/test/report");
- one(session).setAttribute("name", "resend");
+ one(session).setAttribute("name",
"java.lang.String:resend");
}};
def.setupDefaults("/test/resend");
@@ -156,7 +156,7 @@
public void findAndbindOnlyOnceEvenOnNonDoMethods() throws Exception {
final DefaultExpectations def = new DefaultExpectations() {{
one(session).setAttribute("__magma_lastmain","/test/report");
- one(session).setAttribute("name", "resend2");
+ one(session).setAttribute("name",
"java.lang.String:resend2");
}};
def.setupDefaults("/test/resend2");
@@ -193,7 +193,7 @@
@Test
public void findAndChange() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).setAttribute("name", "another name");
+ one(session).setAttribute("name",
"java.lang.String:another name");
one(resp).setHeader("User-Agent", "M$IE");
one(req).setAttribute("user",
Person.getPerson("Massimo"));
}};
@@ -217,7 +217,7 @@
public void parametrizedSimple() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
one(session).setAttribute("__magma_lastmain","/test/named" +
WebHandler.paramSeparator + "ciao");
- one(session).setAttribute("name", "ciao");
+ one(session).setAttribute("name",
"java.lang.String:ciao");
}};
def.setupDefaults("/test/named/ciao");
@@ -308,7 +308,7 @@
@Test
public void sessionConversion() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
def.setupMinimal("/testSession/setUser");
def.start();
@@ -378,7 +378,7 @@
public void onDemandBindingOnGetters() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
one(session).getAttribute("toAspect");
will(returnValue("getting"));
- one(session).setAttribute("toAspect", "done");
+ one(session).setAttribute("toAspect",
"java.lang.String:done");
}};
def.setupDefaults("/test/fromSessionToAspect");
FakeHtmlProducer.checks = new CheckInside() {
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=889653&r1=889652&r2=889653&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
Fri Dec 11 15:26:37 2009
@@ -43,7 +43,7 @@
@Test
public void simpleTemplateClean() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
disp.setTemplate(new SimpleTemplate());
@@ -57,7 +57,7 @@
@Test
public void simpleAjax() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
one(resp).setDateHeader(with(equal("Expires")),
with(any(Long.class)));
}};
UnitTestDispatch disp = new UnitTestDispatch();
@@ -75,7 +75,7 @@
@Test
public void simpleTemplateI18n() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
disp.setTemplate(new SimpleTemplate());
@@ -91,7 +91,7 @@
public void notReusingTemplate() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
one(session).getAttribute("__magma_lasttemplate");
will(returnValue(SimpleSecondTemplate.class));
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
disp.setTemplate(new SimpleTemplate());
@@ -107,7 +107,7 @@
DefaultExpectations def = new DefaultExpectations() {{
one(session).getAttribute("__magma_lasttemplate");
will(returnValue(SimpleSecondTemplate.class));
one(session).getAttribute("__magma_lastmain");
will(returnValue("/testSession/setUser"));
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
disp.setTemplate(new SimpleTemplate());
@@ -123,7 +123,7 @@
public void simpleTemplateWithReplacedAuxiliary() throws Exception {
DefaultExpectations def = new DefaultExpectations() {{
one(session).getAttribute("__magma_lastmain");
will(returnValue("/testSession/setUser"));
- one(session).setAttribute("user", "Simone");
+ one(session).setAttribute("user",
Person.class.getName() + ":Simone");
}};
UnitTestDispatch disp = new UnitTestDispatch();
disp.setTemplate(new SimpleTemplate());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
