Author: tmortagne
Date: 2007-12-17 16:01:48 +0100 (Mon, 17 Dec 2007)
New Revision: 6387
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/OrphanedPageTest.java
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/XhtmlValidityTest.java
Log:
XE-167: Add property to filter documents in OrphanedPageTest and
XhtmlValidityTest
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/OrphanedPageTest.java
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/OrphanedPageTest.java
2007-12-17 10:28:36 UTC (rev 6386)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/OrphanedPageTest.java
2007-12-17 15:01:48 UTC (rev 6387)
@@ -54,7 +54,9 @@
String path =
System.getProperty("localRepository") + "/" +
System.getProperty("pathToXWikiXar");
- List pageNames = XhtmlValidityTest.readXarContents(path);
+ String patternFilter = System.getProperty("documentsToTest");
+
+ List pageNames = XhtmlValidityTest.readXarContents(path,
patternFilter);
Iterator it = pageNames.iterator();
while (it.hasNext()) {
suite.addTest(new OrphanedPageTest((String) it.next()));
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/XhtmlValidityTest.java
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/XhtmlValidityTest.java
2007-12-17 10:28:36 UTC (rev 6386)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/XhtmlValidityTest.java
2007-12-17 15:01:48 UTC (rev 6387)
@@ -113,7 +113,9 @@
String path =
System.getProperty("localRepository") + "/" +
System.getProperty("pathToXWikiXar");
- List pageNames = readXarContents(path);
+ String patternFilter = System.getProperty("documentsToTest");
+
+ List pageNames = readXarContents(path, patternFilter);
Iterator it = pageNames.iterator();
while (it.hasNext()) {
suite.addTest(new XhtmlValidityTest((String) it.next()));
@@ -221,7 +223,7 @@
return output.indexOf("WARNING") >= 0 || output.indexOf("WARN") >= 0;
}
- public static List readXarContents(String fileName) throws Exception
+ public static List readXarContents(String fileName, String patternFilter)
throws Exception
{
FileInputStream fileIS = new FileInputStream(fileName);
ZipInputStream zipIS = new ZipInputStream(fileIS);
@@ -247,7 +249,11 @@
Iterator it = fileElementList.iterator();
while (it.hasNext()) {
Element el = (Element) it.next();
- result.add(el.getStringValue());
+ String docFullName = el.getStringValue();
+
+ if (patternFilter == null || docFullName.matches(patternFilter)) {
+ result.add(docFullName);
+ }
}
return result;
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
