Author: amarkhel
Date: 2008-05-30 09:41:35 -0400 (Fri, 30 May 2008)
New Revision: 8845
Modified:
trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxFormRendererTest.java
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPageRendererTest.java
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPushRendererTest.java
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java
trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java
trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java
trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java
trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
trunk/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java
Log:
Refactor integration tests
Modified:
trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
===================================================================
---
trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
import java.net.URL;
@@ -35,6 +36,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Random;
+import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -56,6 +58,8 @@
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.ajax4jsf.resource.InternetResource;
import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.ResourceBuilderImpl;
+import org.ajax4jsf.resource.image.ImageInfo;
import org.ajax4jsf.tests.org.apache.shale.test.config.ConfigParser;
import org.ajax4jsf.webapp.WebXml;
import org.apache.commons.lang.StringUtils;
@@ -90,6 +94,12 @@
*/
public class AbstractAjax4JsfTestCase extends AbstractJsfTestCase {
+ private static final String IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE = "Image not
found or unavailable";
+
+ private static final String RESOURCE_NOT_FOUND_MESSAGE = "Resource not
found";
+
+ private static final String HTTP_PREFIX = "http:";
+
protected final static String SLASHED_RESOURCE_URI_PREFIX = "/" +
WebXml.RESOURCE_URI_PREFIX;
private File tmpRoot = null;
@@ -228,16 +238,122 @@
protected WebClient createWebClient() {
WebClient client = new WebClient();
- //disable javascript for now as HtmlUnit doesn't treat prototype.js well
+ // disable javascript for now as HtmlUnit doesn't treat prototype.js
+ // well
client.setJavaScriptEnabled(true);
- //Set dummy script engine to prevent NPEs from default HtmlUnit engine
+ // Set dummy script engine to prevent NPEs from default HtmlUnit engine
client.setJavaScriptEngine(new DummyScriptEngine(client));
return client;
}
+
+ /**
+ * This function checks is resource present. If so, resource returned in the form of
InputStream, otherwise IOException throwed.
+ *
+ * @param path - path to specified resource
+ *
+ * @return InputStream of the resource, if resource present
+ *
+ * @throws IOException - if resource not available
+ */
+ protected InputStream getResourceIfPresent(String path) throws IOException {
+ InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+ builder.createResource(null, path);
+ InternetResource resource = builder.getResource(path);
+ if (resource != null) {
+ String uri = HTTP_PREFIX + resource.getUri(facesContext, null);
+ Page page = webClient.getPage(uri);
+ if (page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK) {
+ return page.getWebResponse().getContentAsStream();
+ }
+ }
+ throw new IOException(RESOURCE_NOT_FOUND_MESSAGE + path);
+ }
+
+ /**
+ * This function checks is image resource present. If so, image returned, otherwise
IOException throwed.
+ *
+ * @param path - path to specified image resource
+ *
+ * @return ImageInfo of the image, if image resource present or null if method
ImageInfo.check() return false;
+ *
+ * @throws IOException - if image not available or not exist
+ */
+ protected ImageInfo getImageResource(String path) throws IOException {
+ ImageInfo info = new ImageInfo();
+ try {
+ info.setInput(getResourceIfPresent(path));
+ } catch(IOException e){
+ throw new IOException(IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE + path);
+ }
+ return info.check() ? info : null;
+ }
/**
+ * This function return count of <script> elements on page and validate - if this
script contains in Set of predefined attribute for this component
*
+ * @param view - page to validate
+ * @param predefinedScripts - set of predefined scripts, should be presented on
component
+ *
+ * @return count of valid <script> element
+ * @throws Exception if script not available on page
*/
+ protected Integer getCountValidScripts(HtmlPage view, Set<String>
predefinedScripts, boolean isPageAvailabilityCheck)
+ throws Exception {
+ /*List<HtmlScript> scripts = view.getDocumentHtmlElement()
+ .getHtmlElementsByTagName(HTML.SCRIPT_ELEM);
+ int foundCount = 0;
+ for (Iterator<HtmlScript> it = scripts.iterator(); it.hasNext();) {
+ HtmlScript item = it.next();
+ String srcAttr = item.getSrcAttribute();
+
+ if (StringUtils.isNotBlank(srcAttr)) {
+ boolean found = false;
+ for (Iterator<String> srcIt = predefinedScripts.iterator(); srcIt
+ .hasNext();) {
+ String src = (String) srcIt.next();
+
+ found = srcAttr.contains(src);
+ if (found) {
+ foundCount++;
+
+ String uri = "http:" + srcAttr;
+ Page page = webClient.getPage(uri);
+ if (!(page != null && page.getWebResponse()
+ .getStatusCode() == HttpServletResponse.SC_OK)) {
+ throw new Exception("Page is not available " + uri);
+
+ }
+ break;
+ }
+ }
+ }
+ }
+ return foundCount;*/
+ int foundCount = 0;
+ List<String> scriptSources = HtmlTestUtils.extractScriptSources(view);
+ for (String javascript : predefinedScripts) {
+ for (String script : scriptSources) {
+ if (script.indexOf(javascript) >= 0) {
+ foundCount++;
+
+ String uri = HTTP_PREFIX + script;
+ Page page = webClient.getPage(uri);
+ if(isPageAvailabilityCheck){
+ if (!(page != null && page.getWebResponse()
+ .getStatusCode() == HttpServletResponse.SC_OK)) {
+ throw new Exception("Component script " + javascript + " is not
found in the response");
+ }
+ }
+ break;
+ }
+ }
+ }
+ return foundCount;
+ }
+
+ /**
+ *
+ */
protected void setupWebClient() {
ajaxContext = null;
// setup webClient for got response content.
@@ -478,7 +594,7 @@
*/
protected Page processResponse() throws Exception {
setupWebClient();
- URL page = new URL( "http:"+
facesContext.getExternalContext().getRequestContextPath() +
facesContext.getViewRoot().getViewId());
+ URL page = new URL( HTTP_PREFIX+
facesContext.getExternalContext().getRequestContextPath() +
facesContext.getViewRoot().getViewId());
try {
char[] content = ((MockPrintWriter) response.getWriter()).content();
webConnection.setResponse(page,String.valueOf(content),response.getStatus(),
"OK", response.getContentType(), Collections.EMPTY_LIST);
Modified:
trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java
===================================================================
---
trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -48,6 +48,7 @@
* Unit test for context menu component.
*/
public class ContextMenuComponentTest extends AbstractAjax4JsfTestCase {
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
private static Set javaScripts = new HashSet();
private static final String PARAM_SEQUENCE =
"{'name':'value'}";
@@ -133,29 +134,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
-
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- int foundCount = 0;
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- foundCount++;
- break;
- }
- }
-
- assertTrue(found);
- }
- }
- assertEquals(foundCount, javaScripts.size());
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
/**
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxFormRendererTest.java
===================================================================
---
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxFormRendererTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxFormRendererTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -35,6 +35,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlScript;
public class AjaxFormRendererTest extends AbstractAjax4JsfTestCase {
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
private static Set javaScripts = new HashSet();
static {
@@ -78,26 +79,7 @@
assertNotNull(page);
System.out.println(page.asXml());
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();)
- {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
/**
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPageRendererTest.java
===================================================================
---
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPageRendererTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPageRendererTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -21,9 +21,11 @@
package org.ajax4jsf.renderkit.html;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Set;
import javax.faces.component.UIOutput;
@@ -35,10 +37,16 @@
import com.gargoylesoftware.htmlunit.html.HtmlScript;
public class AjaxPageRendererTest extends AbstractAjax4JsfTestCase{
- private static final String SCRIPT_NAME =
"org.ajax4jsf.javascript.AjaxScript";
private org.ajax4jsf.component.html.HtmlPage ajaxPage = null;
+ private static Set<String> javaScripts = new HashSet<String>();
+ static {
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ }
+
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
+
public AjaxPageRendererTest(String name) {
super(name);
}
@@ -100,23 +108,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
-
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- int found = 0;
- int count = 0;
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- count++;
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
- if (StringUtils.isNotBlank(srcAttr)) {
- if (srcAttr.contains(SCRIPT_NAME)) {
- found++;
- break;
- }
- }
- }
- assertEquals(1, found);
- assertEquals(1, count);
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
}
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPushRendererTest.java
===================================================================
---
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPushRendererTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxPushRendererTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -39,8 +39,13 @@
import com.gargoylesoftware.htmlunit.html.HtmlScript;
public class AjaxPushRendererTest extends AbstractAjax4JsfTestCase {
- private static final String SCRIPT_NAME =
"org.ajax4jsf.javascript.AjaxScript";
+ private static Set<String> javaScripts = new HashSet<String>();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
+
+ static {
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ }
private UIForm form = null;
private UIPush push1 = null;
private UIPush push2 = null;
@@ -100,18 +105,7 @@
assertNotNull(page);
List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- int found = 0;
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
- if (StringUtils.isNotBlank(srcAttr)) {
- if (srcAttr.contains(SCRIPT_NAME)) {
- found++;
- break;
- }
- }
- }
- assertEquals(1, found);
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
HtmlElement span1 = page.getHtmlElementById(push1.getClientId(facesContext));
assertNotNull(span1);
Modified:
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java
===================================================================
---
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -69,6 +69,7 @@
private UIComponent dfSlider = null;
private UICommand command = null;
private static Set<String> javaScripts = new HashSet<String>();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
/**
* Create the test case
@@ -158,12 +159,7 @@
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource =
builder.getResource("css/dataFilterSlider.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ assertNotNull(getResourceIfPresent("css/dataFilterSlider.xcss"));
String[] resources = new String[] {
SliderFieldGradient.class.getName(),
@@ -171,15 +167,8 @@
};
for (int i = 0; i < resources.length; i++) {
- resource = builder.getResource(resources[i]);
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, null);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_PNG, info.getFormat());
}
}
@@ -203,18 +192,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(page);
- for (String javascript : javaScripts) {
- boolean found = false;
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- found = true;
- break;
- }
- }
- assertTrue("Component script " + javascript + " is not found in
the response", found);
- }
-
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
public void testUpdate() throws Exception {
Modified:
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
---
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -55,6 +55,7 @@
*/
public class DatascrollerComponentTest extends AbstractAjax4JsfTestCase {
private static Set<String> javaScripts = new HashSet<String>();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
@@ -306,17 +307,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(page);
- for (String javascript : javaScripts) {
- boolean found = false;
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- found = true;
- break;
- }
- }
- assertTrue("Component script " + javascript + " is not found in
the response", found);
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
/**
Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -235,12 +235,6 @@
HtmlElement link = (HtmlElement) links.get(0);
assertTrue(link.getAttributeValue("href").contains(CSS_FILE_PATH));
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource(CSS_FILE_PATH);
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page cssFile = webClient.getPage(uri);
- assertNotNull(cssFile);
- assertTrue(cssFile.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ assertNotNull(getResourceIfPresent(CSS_FILE_PATH));
}
}
Modified:
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
===================================================================
---
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -48,6 +48,8 @@
*/
public class DropDownMenuComponentTest extends AbstractAjax4JsfTestCase {
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
+
static {
javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
@@ -198,55 +200,21 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
- assertTrue(found);
- }
- }
+ assertNotNull(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue());
}
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource =
builder.getResource("css/dropdownmenu.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
-
+ assertNotNull(getResourceIfPresent("css/dropdownmenu.xcss"));
String[] resources = new String[] {
"org.richfaces.renderkit.html.images.background.MenuListBackground"
};
for (int i = 0; i < resources.length; i++) {
- resource = builder.getResource(resources[i]);
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, null);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() ==
HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_PNG, info.getFormat());
}
}
-
-
-}
-
-
-
-
+}
\ No newline at end of file
Modified: trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java
===================================================================
---
trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -44,6 +44,7 @@
private UIForm form = null;
private UIComponent effect = null;
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
@@ -93,25 +94,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertNotNull(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue());
}
}
Modified: trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
===================================================================
--- trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++ trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -44,6 +44,7 @@
private UIForm form = null;
private UIComponent gmap = null;
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = false;
private final static String TEST_STYLE = "width:500px; height:400px";
@@ -114,25 +115,6 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertNotNull(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue());
}
-
}
Modified:
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
===================================================================
---
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -45,6 +45,7 @@
import org.ajax4jsf.resource.image.ImageInfo;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.HtmlTestUtils;
+import org.apache.commons.lang.StringUtils;
import org.richfaces.renderkit.html.images.SliderArrowImage;
import org.richfaces.renderkit.html.images.SliderArrowSelectedImage;
import org.richfaces.renderkit.html.images.SliderFieldGradient;
@@ -57,6 +58,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlInput;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlScript;
/** Unit test for simple Component. */
public class InputNumberSliderComponentTest extends AbstractAjax4JsfTestCase {
@@ -217,49 +219,21 @@
assertTrue(imageDim.getWidth() == 7 && imageDim.getHeight() == 8);
}
- private void checkResource(String name, int format) throws Exception {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource(name);
-
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode()
- == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
- assertEquals(format, info.getFormat());
- }
-
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("css/slider.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse
- .SC_OK);
-
- String[] pngResources = new String[]{
+ assertNotNull(getResourceIfPresent("css/slider.xcss"));
+ String[] resources = new String[]{
+ SliderArrowImage.class.getName(),
+ SliderArrowSelectedImage.class.getName(),
SliderFieldGradient.class.getName(),
SliderTrackGradient.class.getName()
};
- for (int i = 0; i < pngResources.length; i++) {
- checkResource(pngResources[i], ImageInfo.FORMAT_PNG);
- }
-
- String[] gifResources = new String[]{
- SliderArrowImage.class.getName(),
- SliderArrowSelectedImage.class.getName(),
- };
-
- for (int i = 0; i < gifResources.length; i++) {
- checkResource(gifResources[i], ImageInfo.FORMAT_GIF);
- }
+ for (int i = 0; i < resources.length; i++) {
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ }
}
public void testUpdate() throws Exception {
Modified:
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
===================================================================
---
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -46,6 +46,7 @@
import org.ajax4jsf.resource.image.ImageInfo;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.HtmlTestUtils;
+import org.apache.commons.lang.StringUtils;
import org.richfaces.renderkit.html.images.SpinnerButtonDown;
import org.richfaces.renderkit.html.images.SpinnerButtonGradient;
import org.richfaces.renderkit.html.images.SpinnerButtonUp;
@@ -57,6 +58,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlInput;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlScript;
/** Unit test for simple Component. */
public class InputNumberSpinnerComponentTest extends AbstractAjax4JsfTestCase {
@@ -184,48 +186,20 @@
assertTrue(imageDim.getWidth() == 14 && imageDim.getHeight() == 7);
}
- private void checkResource(String name, int format) throws Exception {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource(name);
-
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode()
- == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
- assertEquals(format, info.getFormat());
- }
-
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("css/spinner.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse
- .SC_OK);
-
- String[] pngResources = new String[]{
+ assertNotNull(getResourceIfPresent("css/spinner.xcss"));
+ String[] resources = new String[]{
SpinnerButtonGradient.class.getName(),
SpinnerFieldGradient.class.getName(),
- };
-
- for (int i = 0; i < pngResources.length; i++) {
- checkResource(pngResources[i], ImageInfo.FORMAT_PNG);
- }
-
- String[] gifResources = new String[]{
SpinnerButtonDown.class.getName(),
SpinnerButtonUp.class.getName()
};
- for (int i = 0; i < gifResources.length; i++) {
- checkResource(pngResources[i], ImageInfo.FORMAT_PNG);
+ for (int i = 0; i < resources.length; i++) {
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
}
Modified:
trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
===================================================================
---
trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -59,6 +59,7 @@
private UIColumn column2 = null;
private static final Set<String> javaScripts = new HashSet<String>();
+ private static final Set<String> imageClasses = new HashSet<String>();
static {
javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
@@ -69,6 +70,27 @@
javaScripts.add("scripts/OrderingList.js");
javaScripts.add("scripts/ListShuttle.js");
javaScripts.add("scripts/ListBase.js");
+
+ imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconUp");
+ imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconDown");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTop");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottom");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconUpDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconDownDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTopDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient");
+ imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient");
+ imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListButtonGradient");
+
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconCopy");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconCopyDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconCopyAll");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconCopyAllDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemove");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemoveAll");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemoveDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemoveAllDisabled");
}
/**
@@ -293,23 +315,6 @@
assertEquals(IMAGE_COUNT, foundImages);
}
- private void checkResource(String path, int format) throws Exception {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- builder.createResource(null, path);
- InternetResource resource = builder.getResource(path);
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
-
- assertTrue(info.check());
- assertEquals(format, info.getFormat());
- assertTrue(info.getHeight() > 0);
- assertTrue(info.getWidth() > 0);
- }
-
/**
* Test default images rendering
*
@@ -318,41 +323,15 @@
public void testRenderImages() throws Exception {
HtmlPage view = renderView();
assertNotNull(view);
-
- String[] pngResources = new String[] {
-
"org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient",
-
"org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient",
- "org.richfaces.renderkit.html.gradientimages.OrderingListButtonGradient"
- };
-
- for (int i = 0; i < pngResources.length; i++) {
- checkResource(pngResources[i], ImageInfo.FORMAT_PNG);
- }
- String[] gifResources = new String[] {
- "org.richfaces.renderkit.html.images.TriangleIconUp",
- "org.richfaces.renderkit.html.images.TriangleIconDown",
- "org.richfaces.renderkit.html.images.OrderingListIconTop",
- "org.richfaces.renderkit.html.images.OrderingListIconBottom",
- "org.richfaces.renderkit.html.images.OrderingListIconUpDisabled",
- "org.richfaces.renderkit.html.images.OrderingListIconDownDisabled",
- "org.richfaces.renderkit.html.images.OrderingListIconTopDisabled",
- "org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled",
-
- "org.richfaces.renderkit.html.images.ListShuttleIconCopy",
- "org.richfaces.renderkit.html.images.ListShuttleIconCopyDisabled",
- "org.richfaces.renderkit.html.images.ListShuttleIconCopyAll",
- "org.richfaces.renderkit.html.images.ListShuttleIconCopyAllDisabled",
- "org.richfaces.renderkit.html.images.ListShuttleIconRemove",
- "org.richfaces.renderkit.html.images.ListShuttleIconRemoveAll",
- "org.richfaces.renderkit.html.images.ListShuttleIconRemoveDisabled",
- "org.richfaces.renderkit.html.images.ListShuttleIconRemoveAllDisabled"
- };
-
- for (int i = 0; i < gifResources.length; i++) {
- checkResource(gifResources[i], ImageInfo.FORMAT_GIF);
- }
-
+ for (Iterator<String> it = imageClasses.iterator(); it.hasNext(); ) {
+ String clazz = it.next();
+ ImageInfo info = getImageResource(clazz);
+ assertNotNull(info);
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ assertTrue(info.getHeight() > 0);
+ assertTrue(info.getWidth() > 0);
+ }
}
/**
Modified:
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
===================================================================
---
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -64,6 +64,7 @@
}
private static Set<String> javaScripts = new HashSet<String>();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("PrototypeScript");
@@ -259,31 +260,13 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(page);
- for (String javascript : javaScripts) {
- boolean found = false;
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- found = true;
- break;
- }
- }
- assertTrue("Component script " + javascript + " is not found in
the response", found);
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.createResource(null,
MenuNodeImage.class.getName());
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(MenuNodeImage.class.getName());
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
Modified:
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
---
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -68,6 +68,7 @@
private static Set<String> javaScripts = new HashSet<String>();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("PrototypeScript");
@@ -307,17 +308,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(page);
- for (String javascript : javaScripts) {
- boolean found = false;
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- found = true;
- break;
- }
- }
- assertTrue("Component script " + javascript + " is not found in
the response", found);
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
/**
@@ -362,32 +353,15 @@
public void testMenuItemDefaultIconImage() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- String iconImage = "org/richfaces/renderkit/html/images/spacer.gif";
- InternetResource resource = builder.getResource(iconImage);
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- assertTrue(info.check());
+ ImageInfo info =
getImageResource("org/richfaces/renderkit/html/images/spacer.gif");
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.createResource(null,
- MenuListBackground.class.getName());
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- // image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(MenuListBackground.class.getName());
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_PNG, info.getFormat());
}
Modified:
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java
===================================================================
---
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -47,6 +47,7 @@
*/
public class ModalPanelComponentTest extends AbstractAjax4JsfTestCase {
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
protected String[] RESIZERS = new String[] {
"NWU", "N", "NEU", "NEL", "E",
@@ -166,26 +167,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
-
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
}
Modified:
trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java
===================================================================
---
trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -53,6 +53,7 @@
*/
public class OrderingListRenderingTest extends AbstractAjax4JsfTestCase {
private static Set<String> javaScripts = new HashSet<String>();
+ private static Set<String> imageClasses = new HashSet<String>();
static {
javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
@@ -62,6 +63,18 @@
javaScripts.add("scripts/Control.js");
javaScripts.add("scripts/OrderingList.js");
javaScripts.add("scripts/ListBase.js");
+
+ imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconUp");
+ imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconDown");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTop");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottom");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconUpDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconDownDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTopDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled");
+ imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient");
+ imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient");
+ imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListButtonGradient");
}
/**
@@ -169,23 +182,6 @@
assertEquals(foundCount, javaScripts.size());
}
- private void checkResource(String clazz, int format) throws Exception {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- builder.createResource(null, clazz);
- InternetResource resource = builder.getResource(clazz);
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
-
- assertTrue(clazz, info.check());
- assertEquals(clazz, format, info.getFormat());
- assertTrue(clazz, info.getHeight() > 0);
- assertTrue(clazz, info.getWidth() > 0);
- }
-
/**
* Test default images rendering
*
@@ -194,31 +190,15 @@
public void testRenderImages() throws Exception {
HtmlPage view = renderView();
assertNotNull(view);
-
- String[] pngResources = new String[] {
-
"org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient",
-
"org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient",
- "org.richfaces.renderkit.html.gradientimages.OrderingListButtonGradient"
- };
-
- for (int i = 0; i < pngResources.length; i++) {
- checkResource(pngResources[i], ImageInfo.FORMAT_PNG);
- }
-
- String[] gifResources = new String[] {
- "org.richfaces.renderkit.html.images.TriangleIconUp",
- "org.richfaces.renderkit.html.images.TriangleIconDown",
- "org.richfaces.renderkit.html.images.OrderingListIconTop",
- "org.richfaces.renderkit.html.images.OrderingListIconBottom",
- "org.richfaces.renderkit.html.images.OrderingListIconUpDisabled",
- "org.richfaces.renderkit.html.images.OrderingListIconDownDisabled",
- "org.richfaces.renderkit.html.images.OrderingListIconTopDisabled",
- "org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled"
- };
-
- for (int i = 0; i < gifResources.length; i++) {
- checkResource(gifResources[i], ImageInfo.FORMAT_GIF);
- }
+
+ for (Iterator<String> it = imageClasses.iterator(); it.hasNext(); ) {
+ String clazz = it.next();
+ ImageInfo info = getImageResource(clazz);
+ assertNotNull(info);
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ assertTrue(info.getHeight() > 0);
+ assertTrue(info.getWidth() > 0);
+ }
}
/**
Modified:
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
---
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -49,6 +49,7 @@
public class PanelBarComponentTest extends AbstractAjax4JsfTestCase {
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("browser_info.js");
@@ -219,26 +220,7 @@
//System.out.println(page.asXml());
assertNotNull(page);
- List scripts = page.getDocumentElement().getHtmlElementsByTagName(
- "script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
/**
Modified:
trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java
===================================================================
---
trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -50,6 +50,7 @@
*/
public class PanelMenuComponentTest extends AbstractAjax4JsfTestCase {
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
private String[] imageResources = new String[]{
"org.richfaces.renderkit.html.iconimages.PanelMenuIconChevron",
@@ -272,13 +273,7 @@
assertEquals(1, links.size());
HtmlElement link = (HtmlElement) links.get(0);
assertTrue(link.getAttributeValue("href").contains("css/panelMenu.xcss"));
-
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource =
builder.getResource("org/richfaces/renderkit/html/css/panelMenu.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+
assertNotNull(getResourceIfPresent("org/richfaces/renderkit/html/css/panelMenu.xcss"));
}
/**
@@ -289,44 +284,16 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();)
- {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
public void testRenderImages() throws Exception {
HtmlPage view = renderView();
assertNotNull(view);
-
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
-
+
for (int i = 0; i < imageResources.length; i++) {
- InternetResource resource = builder.getResource(imageResources[i]);
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() ==
HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(imageResources[i]);
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
}
Modified:
trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
===================================================================
---
trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -28,6 +28,7 @@
UIScrollableDataTable grid;
int columns = 7;
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add(AjaxScript.class.getName());
@@ -95,24 +96,7 @@
public void testRenderScripts() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts = page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();)
- {
- String src = (String) srcIt.next();
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
- assertTrue(found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
static final Set tagNames = new HashSet();
Modified:
trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java
===================================================================
---
trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -114,72 +114,36 @@
}
public void testRenderImage() throws Exception {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
-
+
ui.setLineType(SeparatorRendererBase.LINE_TYPE_BEVEL);
renderView();
- InternetResource resource =
builder.getResource("org.richfaces.renderkit.html.images.BevelSeparatorImage");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, ui);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info =
getImageResource("org.richfaces.renderkit.html.images.BevelSeparatorImage");
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
ui.setLineType(SeparatorRendererBase.LINE_TYPE_SOLID);
renderView();
- resource =
builder.getResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, ui);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ info =
getImageResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
ui.setLineType(SeparatorRendererBase.LINE_TYPE_DOTTED);
renderView();
- resource =
builder.getResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, ui);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ info =
getImageResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
ui.setLineType(SeparatorRendererBase.LINE_TYPE_DASHED);
renderView();
- resource =
builder.getResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, ui);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ info =
getImageResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
ui.setLineType(SeparatorRendererBase.LINE_TYPE_DOUBLE);
renderView();
- resource =
builder.getResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, ui);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ info =
getImageResource("org.richfaces.renderkit.html.images.SimpleSeparatorImage");
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
}
Modified:
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
===================================================================
---
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -46,6 +46,7 @@
public class SimpleTogglePanelComponentTest extends AbstractAjax4JsfTestCase {
private static Set<String> javaScripts = new HashSet<String>();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
@@ -222,18 +223,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(page);
- for (String javascript : javaScripts) {
- boolean found = false;
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- found = true;
- break;
- }
- }
- assertTrue("Component script " + javascript + " is not found in
the response", found);
- }
-
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
/**
Modified:
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java
===================================================================
---
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -42,6 +42,7 @@
*/
public class SuggestionBoxComponentTest extends AbstractAjax4JsfTestCase {
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
@@ -146,24 +147,6 @@
HtmlPage page = renderView();
assertNotNull(page);
//System.out.println(page.asXml());
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(srcAttr, found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
}
Modified:
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
===================================================================
---
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -214,42 +214,20 @@
}
}
- private void checkResource(String path, int format) throws Exception {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource(path);
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
- assertEquals(format, info.getFormat());
-
- }
-
public void testRenderImages() throws Exception {
HtmlPage view = renderView();
assertNotNull(view);
- //System.out.println(view.asXml());
-
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("css/tabPanel.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
-
- String[] pngResources = new String[]{
+ assertNotNull(getResourceIfPresent("css/tabPanel.xcss"));
+ String[] resources = new String[]{
"org.richfaces.renderkit.images.TabGradientA",
- "org.richfaces.renderkit.images.TabGradientB"
+ "org.richfaces.renderkit.images.TabGradientB",
+ "org.richfaces.renderkit.images.TabStripeImage"
};
-
- for (int i = 0; i < pngResources.length; i++) {
- checkResource(pngResources[i], ImageInfo.FORMAT_PNG);
- }
- checkResource("org.richfaces.renderkit.images.TabStripeImage",
ImageInfo.FORMAT_GIF);
+ for (int i = 0; i < resources.length; i++) {
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ }
}
}
Modified:
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
---
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -49,6 +49,7 @@
*/
public class TogglePanelComponentTest extends AbstractAjax4JsfTestCase {
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
@@ -184,27 +185,7 @@
assertNotNull(page);
// System.out.println(page.asXml());
- List scripts = page.getDocumentElement().getHtmlElementsByTagName(
- "script");
-
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(srcAttr, found);
- }
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
public void testSwitch() throws Exception {
Modified:
trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java
===================================================================
---
trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -156,13 +156,7 @@
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("css/toolBar.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
-
+ assertNotNull(getResourceIfPresent("css/toolBar.xcss"));
String[] resources = new String[]{
"org.richfaces.renderkit.html.images.DotSeparatorImage",
"org.richfaces.renderkit.html.images.GridSeparatorImage",
@@ -171,15 +165,8 @@
};
for (int i = 0; i < resources.length; i++) {
- resource = builder.getResource(resources[i]);
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, null);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() ==
HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
}
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -98,6 +98,7 @@
}
private static Set cssStyles = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = true;
static {
cssStyles.add("css/dragIndicator.xcss");
@@ -229,28 +230,12 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(page);
- for (String javascript : javaScripts) {
- boolean found = false;
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- found = true;
- break;
- }
- }
- assertTrue("Component script " + javascript + " is not found in
the response", found);
- }
+ assertEquals(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size());
}
public void testRenderImages() throws Exception {
renderView();
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource("css/tree.xcss");
- assertNotNull(resource);
- String uri = "http:" + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
-
+ assertNotNull(getResourceIfPresent("css/tree.xcss"));
String[] resources = new String[] {
"org.richfaces.renderkit.html.images.TreeLineCollapsedImage",
"org.richfaces.renderkit.html.images.TreeLineExpandedImage",
@@ -262,15 +247,8 @@
};
for (int i = 0; i < resources.length; i++) {
- resource = builder.getResource(resources[i]);
- assertNotNull(resource);
- uri = "http:" + resource.getUri(facesContext, null);
- page = webClient.getPage(uri);
- assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- ImageInfo info = new ImageInfo();
- info.setInput(page.getWebResponse().getContentAsStream());
- //image recognizable?
- assertTrue(info.check());
+ ImageInfo info = getImageResource(resources[i]);
+ assertNotNull(info);
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
}
Modified:
trunk/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java
===================================================================
---
trunk/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java 2008-05-30
13:23:49 UTC (rev 8844)
+++
trunk/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java 2008-05-30
13:41:35 UTC (rev 8845)
@@ -44,6 +44,7 @@
private UIForm form = null;
private UIComponent virtualEarth = null;
private static Set javaScripts = new HashSet();
+ private static final boolean IS_PAGE_AVAILABILITY_CHECK = false;
@@ -110,25 +111,7 @@
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- List scripts =
page.getDocumentElement().getHtmlElementsByTagName("script");
- for (Iterator it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = (HtmlScript) it.next();
- String srcAttr = item.getSrcAttribute();
-
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) {
- String src = (String) srcIt.next();
-
- found = srcAttr.contains(src);
- if (found) {
- break;
- }
- }
-
- assertTrue(found);
- }
- }
+ assertNotNull(getCountValidScripts(page, javaScripts,
IS_PAGE_AVAILABILITY_CHECK).intValue());
}
}