You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/06/11 20:48:07 UTC
svn commit: r953827 - in
/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago:
component/ internal/context/ internal/mock/faces/
internal/taglib/component/ webapp/
Author: bommel
Date: Fri Jun 11 18:48:07 2010
New Revision: 953827
URL: http://svn.apache.org/viewvc?rev=953827&view=rev
Log:
checkstyle
Modified:
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericComponentTagUnitTest.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java?rev=953827&r1=953826&r2=953827&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java Fri Jun 11 18:48:07 2010
@@ -23,6 +23,7 @@ import org.junit.Before;
import org.junit.Test;
import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
import java.util.List;
public class UIMessagesUnitTest extends AbstractTobagoTestBase {
@@ -30,6 +31,7 @@ public class UIMessagesUnitTest extends
@Before
public void setUp() throws Exception {
super.setUp();
+ FacesContext facesContext = getFacesContext();
facesContext.addMessage("id0", new FacesMessage(FacesMessage.SEVERITY_INFO, "test", "a test"));
facesContext.addMessage("id0", new FacesMessage(FacesMessage.SEVERITY_WARN, "test", "a test"));
facesContext.addMessage("id1", new FacesMessage(FacesMessage.SEVERITY_ERROR, "test", "a test"));
@@ -41,7 +43,7 @@ public class UIMessagesUnitTest extends
public void testCreateMessageListAll() {
UIMessages component = new UIMessages();
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(5, messages.size());
}
@@ -51,7 +53,7 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setGlobalOnly(true);
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(1, messages.size());
}
@@ -61,7 +63,7 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setFor("id0");
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(2, messages.size());
}
@@ -71,7 +73,7 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setMaxSeverity(FacesMessage.SEVERITY_WARN);
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(2, messages.size());
}
@@ -82,7 +84,7 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setMinSeverity(FacesMessage.SEVERITY_WARN);
component.setMaxSeverity(FacesMessage.SEVERITY_ERROR);
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(2, messages.size());
}
@@ -92,7 +94,7 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setMinSeverity(FacesMessage.SEVERITY_ERROR);
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(3, messages.size());
}
@@ -103,11 +105,11 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setMaxNumber(3);
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
Assert.assertEquals(3, messages.size());
component.setMaxNumber(30000);
- messages = component.createMessageList(facesContext);
+ messages = component.createMessageList(getFacesContext());
Assert.assertEquals(5, messages.size());
}
@@ -116,7 +118,7 @@ public class UIMessagesUnitTest extends
UIMessages component = new UIMessages();
component.setOrderBy(UIMessages.OrderBy.SEVERITY);
- List<UIMessages.Item> messages = component.createMessageList(facesContext);
+ List<UIMessages.Item> messages = component.createMessageList(getFacesContext());
int mustShrink = FacesMessage.SEVERITY_FATAL.getOrdinal();
for (UIMessages.Item message : messages) {
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java?rev=953827&r1=953826&r2=953827&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java Fri Jun 11 18:48:07 2010
@@ -34,7 +34,7 @@ public class ResponseWriterDividerUnitTe
public void test() throws IOException {
StringWriter stringWriter = new StringWriter();
- facesContext.setResponseWriter(new TobagoResponseXmlWriterImpl(stringWriter, "text/xml", "ISO-8859-1"));
+ getFacesContext().setResponseWriter(new TobagoResponseXmlWriterImpl(stringWriter, "text/xml", "ISO-8859-1"));
DefaultMutableTreeNode root = new DefaultMutableTreeNode("Root");
DefaultMutableTreeNode colors = new DefaultMutableTreeNode("Colors");
@@ -50,10 +50,10 @@ public class ResponseWriterDividerUnitTe
doubles.add(new DefaultMutableTreeNode("2.7182"));
doubles.add(new DefaultMutableTreeNode("3.1415"));
- render(facesContext, root);
+ render(getFacesContext(), root);
- ResponseWriterDivider divider = ResponseWriterDivider.getInstance(facesContext, "unit test");
- divider.writeOutAndCleanUp(facesContext);
+ ResponseWriterDivider divider = ResponseWriterDivider.getInstance(getFacesContext(), "unit test");
+ divider.writeOutAndCleanUp(getFacesContext());
String expected
= "(Root)\n"
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java?rev=953827&r1=953826&r2=953827&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java Fri Jun 11 18:48:07 2010
@@ -4,7 +4,7 @@ package org.apache.myfaces.tobago.intern
* 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 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
*
@@ -63,18 +63,18 @@ import java.util.Map;
public abstract class AbstractTobagoTestBase {
// Mock object instances for our tests
- protected MockApplication application = null;
- protected MockServletConfig config = null;
- protected MockExternalContext externalContext = null;
- protected MockFacesContext facesContext = null;
- protected MockFacesContextFactory facesContextFactory = null;
- protected MockLifecycle lifecycle = null;
- protected MockLifecycleFactory lifecycleFactory = null;
- protected MockRenderKit renderKit = null;
- protected MockHttpServletRequest request = null;
- protected MockHttpServletResponse response = null;
- protected MockServletContext servletContext = null;
- protected MockHttpSession session = null;
+ private MockApplication application = null;
+ private MockServletConfig config = null;
+ private MockExternalContext externalContext = null;
+ private MockFacesContext facesContext = null;
+ private MockFacesContextFactory facesContextFactory = null;
+ private MockLifecycle lifecycle = null;
+ private MockLifecycleFactory lifecycleFactory = null;
+ private MockRenderKit renderKit = null;
+ private MockHttpServletRequest request = null;
+ private MockHttpServletResponse response = null;
+ private MockServletContext servletContext = null;
+ private MockHttpSession session = null;
// Thread context class loader saved and restored after each test
private ClassLoader threadContextClassLoader = null;
@@ -166,6 +166,14 @@ public abstract class AbstractTobagoTest
}
+ public MockFacesContext getFacesContext() {
+ return facesContext;
+ }
+
+ public MockHttpServletRequest getRequest() {
+ return request;
+ }
+
/**
* <p>Tear down instance variables required by this test case.</p>
*/
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java?rev=953827&r1=953826&r2=953827&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java Fri Jun 11 18:48:07 2010
@@ -4,7 +4,7 @@ package org.apache.myfaces.tobago.intern
* 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 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
*
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericComponentTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericComponentTagUnitTest.java?rev=953827&r1=953826&r2=953827&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericComponentTagUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericComponentTagUnitTest.java Fri Jun 11 18:48:07 2010
@@ -43,8 +43,8 @@ public class GenericComponentTagUnitTest
tldPaths[0] = "META-INF/org/apache/myfaces/tobago/internal/taglib/component/tobago.tld";
setTldPaths(tldPaths);
super.setUp();
- request.setAttribute("peter", new DummyBean(true, 20, "Peter"));
- request.setAttribute("marry", new DummyBean(false, 17, "Marry"));
+ getRequest().setAttribute("peter", new DummyBean(true, 20, "Peter"));
+ getRequest().setAttribute("marry", new DummyBean(false, 17, "Marry"));
}
@Test
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java?rev=953827&r1=953826&r2=953827&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java Fri Jun 11 18:48:07 2010
@@ -107,7 +107,8 @@ public class TobagoResponseWriterUnitTes
result = result.replace("\"", """);
result = result.replace("<", "<");
result = result.replace(">", ">");
- Assert.assertEquals("all chars", "<select value=\"" + result + "\"\n>" + result + "</select>", stringWriter.toString());
+ Assert.assertEquals("all chars", "<select value=\"" + result + "\"\n>" + result + "</select>",
+ stringWriter.toString());
}
@Test
@@ -118,7 +119,8 @@ public class TobagoResponseWriterUnitTes
writer1.writeAttribute("readonly", true);
writer1.endElement("input");
writer1.close();
- Assert.assertEquals("<input value=\"Gutschein über 100 €.\" readonly=\"readonly\"\n>", stringWriter.toString());
+ Assert.assertEquals("<input value=\"Gutschein über 100 €.\" readonly=\"readonly\"\n>",
+ stringWriter.toString());
}
@Test