Revision: 969
http://sourceforge.net/p/jwebunit/code/969
Author: henryju
Date: 2014-03-17 09:56:31 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Update to JUnit 4.11
Modified Paths:
--------------
trunk/jwebunit-commons-tests/pom.xml
trunk/jwebunit-core/pom.xml
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Cell.java
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Row.java
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Table.java
trunk/jwebunit-htmlunit-plugin/pom.xml
trunk/jwebunit-webdriver-plugin/pom.xml
trunk/pom.xml
trunk/src/changes/changes.xml
Modified: trunk/jwebunit-commons-tests/pom.xml
===================================================================
--- trunk/jwebunit-commons-tests/pom.xml 2014-03-17 09:47:12 UTC (rev
968)
+++ trunk/jwebunit-commons-tests/pom.xml 2014-03-17 09:56:31 UTC (rev
969)
@@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -38,9 +38,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>com.google.code.tempus-fugit</groupId>
- <artifactId>tempus-fugit</artifactId>
- <version>1.1</version>
+ <groupId>com.google.code.tempus-fugit</groupId>
+ <artifactId>tempus-fugit</artifactId>
+ <version>1.1</version>
</dependency>
</dependencies>
<properties>
Modified: trunk/jwebunit-core/pom.xml
===================================================================
--- trunk/jwebunit-core/pom.xml 2014-03-17 09:47:12 UTC (rev 968)
+++ trunk/jwebunit-core/pom.xml 2014-03-17 09:56:31 UTC (rev 969)
@@ -1,101 +1,101 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <artifactId>jwebunit</artifactId>
- <groupId>net.sourceforge.jwebunit</groupId>
- <version>3.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jwebunit-core</artifactId>
- <name>Core - API</name>
- <description>
- The core API of JWebUnit. Define how tests should be written
and interface for testing engines.
- </description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- </dependencies>
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-webtestcase</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>
-
net.sourceforge.jwebunit.javacc.WebTestCaseGenerator
- </mainClass>
- </configuration>
- </execution>
- <execution>
- <id>generate-jwebunit</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>
-
net.sourceforge.jwebunit.javacc.JWebUnitGenerator
- </mainClass>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <sourceRoot>
-
${project.build.directory}/generated-sources/main/java
- </sourceRoot>
- <arguments>
-
<argument>${basedir}/src/main/java</argument>
- <argument>
-
${project.build.directory}/generated-sources/main/java
- </argument>
- </arguments>
- <includePluginDependencies>
- true
- </includePluginDependencies>
- <includeProjectDependencies>
- false
- </includeProjectDependencies>
- </configuration>
- <dependencies>
- <dependency>
-
<groupId>net.sourceforge.jwebunit</groupId>
-
<artifactId>jwebunit-code-generator</artifactId>
-
<version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <artifactId>jwebunit</artifactId>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <version>3.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jwebunit-core</artifactId>
+ <name>Core - API</name>
+ <description>
+ The core API of JWebUnit. Define how tests should be written and interface
for testing engines.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-webtestcase</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>
+ net.sourceforge.jwebunit.javacc.WebTestCaseGenerator
+ </mainClass>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-jwebunit</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>
+ net.sourceforge.jwebunit.javacc.JWebUnitGenerator
+ </mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceRoot>
+ ${project.build.directory}/generated-sources/main/java
+ </sourceRoot>
+ <arguments>
+ <argument>${basedir}/src/main/java</argument>
+ <argument>
+ ${project.build.directory}/generated-sources/main/java
+ </argument>
+ </arguments>
+ <includePluginDependencies>
+ true
+ </includePluginDependencies>
+ <includeProjectDependencies>
+ false
+ </includeProjectDependencies>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-code-generator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Cell.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Cell.java
2014-03-17 09:47:12 UTC (rev 968)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Cell.java
2014-03-17 09:56:31 UTC (rev 969)
@@ -18,135 +18,134 @@
*/
package net.sourceforge.jwebunit.html;
-import junit.framework.Assert;
-
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
+import org.junit.Assert;
/**
* Represents a cell of an html table - a string value spanning an indicated
amount of columns.
- *
+ *
* @author Jim Weaver
* @author Julien Henry
*/
public class Cell {
- private int colspan;
+ private int colspan;
- private int rowspan;
+ private int rowspan;
- private String value;
+ private String value;
- /**
- * Construct a cell with a default colspan/rowspan of 1.
- *
- * @param value text expected within the cell.
- */
- public Cell(String value) {
- this(value, 1, 1);
- }
+ /**
+ * Construct a cell with a default colspan/rowspan of 1.
+ *
+ * @param value text expected within the cell.
+ */
+ public Cell(String value) {
+ this(value, 1, 1);
+ }
- /**
- * Construct a cell with a specified colspan.
- *
- * @param value text expected within the cell.
- * @param colspan number of columns the cell is expected to span.
- * @param rowspan number of rows the cell is expected to span.
- */
- public Cell(String value, int colspan, int rowspan) {
- this.value = value;
- this.colspan = colspan;
- this.rowspan = rowspan;
- }
+ /**
+ * Construct a cell with a specified colspan.
+ *
+ * @param value text expected within the cell.
+ * @param colspan number of columns the cell is expected to span.
+ * @param rowspan number of rows the cell is expected to span.
+ */
+ public Cell(String value, int colspan, int rowspan) {
+ this.value = value;
+ this.colspan = colspan;
+ this.rowspan = rowspan;
+ }
- /**
- * @return the colspan for this cell.
- */
- public int getColspan() {
- return colspan;
- }
+ /**
+ * @return the colspan for this cell.
+ */
+ public int getColspan() {
+ return colspan;
+ }
- /**
- * @return the rowspan for this cell.
- */
- public int getRowspan() {
- return rowspan;
- }
+ /**
+ * @return the rowspan for this cell.
+ */
+ public int getRowspan() {
+ return rowspan;
+ }
- /**
- * @return the text for the cell.
- */
- public final String getValue() {
- return value;
- }
+ /**
+ * @return the text for the cell.
+ */
+ public final String getValue() {
+ return value;
+ }
- /**
- * Assert that the current cell equals given one. Check text, colspan and
rowspan.
- *
- * @param c given cell
- */
- public void assertEquals(Cell c) {
- Assert.assertTrue(c.getValue() + " do not equal " + this.getValue(),
- this.getValue().equals(c.getValue()));
- Assert.assertTrue("Expected colspan was " + c.getColspan()
- + " but was " + this.getColspan(), this.getColspan() == c
- .getColspan());
- Assert.assertTrue("Expected rowspan was " + c.getRowspan()
- + " but was " + this.getRowspan(), this.getRowspan() == c
- .getRowspan());
- }
+ /**
+ * Assert that the current cell equals given one. Check text, colspan and
rowspan.
+ *
+ * @param c given cell
+ */
+ public void assertEquals(Cell c) {
+ Assert.assertTrue(c.getValue() + " do not equal " + this.getValue(),
+ this.getValue().equals(c.getValue()));
+ Assert.assertTrue("Expected colspan was " + c.getColspan()
+ + " but was " + this.getColspan(), this.getColspan() == c
+ .getColspan());
+ Assert.assertTrue("Expected rowspan was " + c.getRowspan()
+ + " but was " + this.getRowspan(), this.getRowspan() == c
+ .getRowspan());
+ }
- /**
- * Assert that the current cell matches given one. Check colspan and
rowspan. Regexp is in text of given cell.
- *
- * @param c given cell
- */
- public void assertMatch(Cell c) {
- RE re = getRE(c.getValue());
- Assert.assertTrue(c.getValue() + " do not match " + this.getValue(), re
- .match(this.getValue()));
- Assert.assertTrue("Expected colspan was " + c.getColspan()
- + " but was " + this.getColspan(), this.getColspan() == c
- .getColspan());
- Assert.assertTrue("Expected rowspan was " + c.getRowspan()
- + " but was " + this.getRowspan(), this.getRowspan() == c
- .getRowspan());
- }
+ /**
+ * Assert that the current cell matches given one. Check colspan and
rowspan. Regexp is in text of given cell.
+ *
+ * @param c given cell
+ */
+ public void assertMatch(Cell c) {
+ RE re = getRE(c.getValue());
+ Assert.assertTrue(c.getValue() + " do not match " + this.getValue(), re
+ .match(this.getValue()));
+ Assert.assertTrue("Expected colspan was " + c.getColspan()
+ + " but was " + this.getColspan(), this.getColspan() == c
+ .getColspan());
+ Assert.assertTrue("Expected rowspan was " + c.getRowspan()
+ + " but was " + this.getRowspan(), this.getRowspan() == c
+ .getRowspan());
+ }
- /**
- * Check if the current cell contains given text.
- *
- * @param text given text.
- * @return true if the current cell contains given text.
- */
- public boolean equals(String text) {
- return this.getValue().equals(text);
- }
+ /**
+ * Check if the current cell contains given text.
+ *
+ * @param text given text.
+ * @return true if the current cell contains given text.
+ */
+ public boolean equals(String text) {
+ return this.getValue().equals(text);
+ }
- /**
- * Check if the current cell matches given text.
- *
- * @param regexp given regexp.
- * @return true if the current cell matches given text.
- */
- public boolean match(String regexp) {
- RE re = getRE(regexp);
- return re.match(this.getValue());
- }
+ /**
+ * Check if the current cell matches given text.
+ *
+ * @param regexp given regexp.
+ * @return true if the current cell matches given text.
+ */
+ public boolean match(String regexp) {
+ RE re = getRE(regexp);
+ return re.match(this.getValue());
+ }
- /**
- * Create a regexp.
- *
- * @param regexp regexp pattern
- * @return regexp object
- */
- private RE getRE(String regexp) {
- RE re = null;
- try {
- re = new RE(regexp, RE.MATCH_SINGLELINE);
- } catch (RESyntaxException e) {
- Assert.fail(e.toString());
- }
- return re;
+ /**
+ * Create a regexp.
+ *
+ * @param regexp regexp pattern
+ * @return regexp object
+ */
+ private RE getRE(String regexp) {
+ RE re = null;
+ try {
+ re = new RE(regexp, RE.MATCH_SINGLELINE);
+ } catch (RESyntaxException e) {
+ Assert.fail(e.toString());
}
+ return re;
+ }
}
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Row.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Row.java
2014-03-17 09:47:12 UTC (rev 968)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Row.java
2014-03-17 09:56:31 UTC (rev 969)
@@ -18,95 +18,96 @@
*/
package net.sourceforge.jwebunit.html;
+import org.junit.Assert;
+
import java.util.ArrayList;
+import java.util.List;
-import junit.framework.Assert;
-
/**
* Represents a row of an html table.
- *
+ *
* @author Jim Weaver
* @author Julien Henry
*/
public class Row {
- private ArrayList cells = new ArrayList();;
+ private List<Cell> cells = new ArrayList<Cell>();
- public Row() {
- }
+ public Row() {
+ }
- /**
- * Construct a row from an array of objects which specify the cells of the
row. If an object in the array is an
- * {@link net.sourceforge.jwebunit.html.Cell}, it is directly added to the
cells of the row, otherwise an
- * {@link net.sourceforge.jwebunit.html.Cell} is created from the
toString() value of the object and an assumed
- * colspan of 1.
- *
- * @param rowCells objects representing the row's cells.
- */
- public Row(Object[] rowCells) {
- appendCells(rowCells);
- }
+ /**
+ * Construct a row from an array of objects which specify the cells of the
row. If an object in the array is an
+ * {@link net.sourceforge.jwebunit.html.Cell}, it is directly added to the
cells of the row, otherwise an
+ * {@link net.sourceforge.jwebunit.html.Cell} is created from the toString()
value of the object and an assumed
+ * colspan of 1.
+ *
+ * @param rowCells objects representing the row's cells.
+ */
+ public Row(Object[] rowCells) {
+ appendCells(rowCells);
+ }
- public void appendCells(Object[] rowCells) {
- for (int i = 0; i < rowCells.length; i++) {
- Object column = rowCells[i];
- if (column instanceof Cell) {
- this.cells.add((Cell) column);
- } else {
- this.cells.add(new Cell(column.toString()));
- }
- }
+ public void appendCells(Object[] rowCells) {
+ for (int i = 0; i < rowCells.length; i++) {
+ Object column = rowCells[i];
+ if (column instanceof Cell) {
+ this.cells.add((Cell) column);
+ } else {
+ this.cells.add(new Cell(column.toString()));
+ }
}
+ }
- public void appendCell(Cell cell) {
- cells.add(cell);
- }
+ public void appendCell(Cell cell) {
+ cells.add(cell);
+ }
- public void appendCell(String cellText) {
- cells.add(new Cell(cellText));
- }
+ public void appendCell(String cellText) {
+ cells.add(new Cell(cellText));
+ }
- public ArrayList getCells() {
- return cells;
- }
+ public List<Cell> getCells() {
+ return cells;
+ }
- public int getCellCount() {
- return cells.size();
- }
+ public int getCellCount() {
+ return cells.size();
+ }
- public boolean hasText(String text) {
- for (int i = 0; i < getCellCount(); i++) {
- Cell c = (Cell) getCells().get(i);
- if (c.equals(text))
- return true;
- }
- return false;
+ public boolean hasText(String text) {
+ for (int i = 0; i < getCellCount(); i++) {
+ Cell c = (Cell) getCells().get(i);
+ if (c.equals(text))
+ return true;
}
+ return false;
+ }
- public boolean hasMatch(String regexp) {
- for (int i = 0; i < getCellCount(); i++) {
- Cell c = (Cell) getCells().get(i);
- if (c.match(regexp))
- return true;
- }
- return false;
+ public boolean hasMatch(String regexp) {
+ for (int i = 0; i < getCellCount(); i++) {
+ Cell c = (Cell) getCells().get(i);
+ if (c.match(regexp))
+ return true;
}
+ return false;
+ }
- public void assertEquals(Row r) {
- Assert.assertTrue("Cell count are not equal",
- this.getCells().size() == r.getCells().size());
- for (int i = 0; i < this.getCells().size(); i++) {
- ((Cell) this.getCells().get(i)).assertEquals((Cell) r.getCells()
- .get(i));
- }
+ public void assertEquals(Row r) {
+ Assert.assertTrue("Cell count are not equal",
+ this.getCells().size() == r.getCells().size());
+ for (int i = 0; i < this.getCells().size(); i++) {
+ ((Cell) this.getCells().get(i)).assertEquals((Cell) r.getCells()
+ .get(i));
}
+ }
- public void assertMatch(Row r) {
- Assert.assertTrue("Cell count are not equal",
- this.getCells().size() == r.getCells().size());
- for (int i = 0; i < this.getCells().size(); i++) {
- ((Cell) this.getCells().get(i)).assertMatch((Cell) r.getCells()
- .get(i));
- }
+ public void assertMatch(Row r) {
+ Assert.assertTrue("Cell count are not equal",
+ this.getCells().size() == r.getCells().size());
+ for (int i = 0; i < this.getCells().size(); i++) {
+ ((Cell) this.getCells().get(i)).assertMatch((Cell) r.getCells()
+ .get(i));
}
+ }
}
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Table.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Table.java
2014-03-17 09:47:12 UTC (rev 968)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/html/Table.java
2014-03-17 09:56:31 UTC (rev 969)
@@ -18,133 +18,134 @@
*/
package net.sourceforge.jwebunit.html;
+import org.junit.Assert;
+
import java.util.ArrayList;
+import java.util.List;
-import junit.framework.Assert;
-
/**
* Represents an expected table for comparison with an actual html table.
- *
+ *
* @author Jim Weaver
* @author Julien Henry
*/
public class Table {
- private ArrayList rows = new ArrayList();
+ private List<Row> rows = new ArrayList<Row>();
- /**
- * Construct a table without providing any contents; they can be appended
subsequently.
- */
- public Table() {
- }
+ /**
+ * Construct a table without providing any contents; they can be appended
subsequently.
+ */
+ public Table() {
+ }
- /**
- * Construct a table from a two dimensional array of objects. Each
object's string value will be used with a colspan
- * of 1, unless an object is an {@link
net.sourceforge.jwebunit.html.Cell}, in which case its defined value and
- * colspan are used.
- *
- * @param values two-dimensional array representing table cells.
- */
- public Table(Object[][] values) {
- appendRows(values);
- }
+ /**
+ * Construct a table from a two dimensional array of objects. Each object's
string value will be used with a colspan
+ * of 1, unless an object is an {@link net.sourceforge.jwebunit.html.Cell},
in which case its defined value and
+ * colspan are used.
+ *
+ * @param values two-dimensional array representing table cells.
+ */
+ public Table(Object[][] values) {
+ appendRows(values);
+ }
- /**
- * Append any number of rows, represented by a two dimensional array of
objects. Each object's string value will be
- * used with a colspan of 1, unless an object is an {@link
net.sourceforge.jwebunit.html.Cell}, in which case its
- * defined value and colspan are used.
- *
- * @param newExpectedValues two-dimensional array representing expected
table cells.
- */
- public void appendRows(Object[][] newExpectedValues) {
- for (int i = 0; i < newExpectedValues.length; i++) {
- rows.add(new Row(newExpectedValues[i]));
- }
+ /**
+ * Append any number of rows, represented by a two dimensional array of
objects. Each object's string value will be
+ * used with a colspan of 1, unless an object is an {@link
net.sourceforge.jwebunit.html.Cell}, in which case its
+ * defined value and colspan are used.
+ *
+ * @param newExpectedValues two-dimensional array representing expected
table cells.
+ */
+ public void appendRows(Object[][] newExpectedValues) {
+ for (int i = 0; i < newExpectedValues.length; i++) {
+ rows.add(new Row(newExpectedValues[i]));
}
+ }
- /**
- * Append another table's rows.
- *
- * @param table table whose rows are to be appended.
- */
- public void appendRows(Table table) {
- rows.addAll(table.getRows());
- }
+ /**
+ * Append another table's rows.
+ *
+ * @param table table whose rows are to be appended.
+ */
+ public void appendRows(Table table) {
+ rows.addAll(table.getRows());
+ }
- /**
- * Append a single expected row.
- *
- * @param row row to be appended.
- */
- public void appendRow(Row row) {
- rows.add(row);
- }
+ /**
+ * Append a single expected row.
+ *
+ * @param row row to be appended.
+ */
+ public void appendRow(Row row) {
+ rows.add(row);
+ }
- public int getRowCount() {
- return getRows().size();
- }
+ public int getRowCount() {
+ return getRows().size();
+ }
- public ArrayList getRows() {
- return rows;
- }
+ public List<Row> getRows() {
+ return rows;
+ }
- public boolean hasText(String text) {
- for (int i = 0; i < getRowCount(); i++) {
- Row row = (Row) getRows().get(i);
- if (row.hasText(text))
- return true;
- }
- return false;
+ public boolean hasText(String text) {
+ for (int i = 0; i < getRowCount(); i++) {
+ Row row = (Row) getRows().get(i);
+ if (row.hasText(text))
+ return true;
}
+ return false;
+ }
- public boolean hasMatch(String regexp) {
- for (int i = 0; i < getRowCount(); i++) {
- Row row = (Row) getRows().get(i);
- if (row.hasMatch(regexp))
- return true;
- }
- return false;
+ public boolean hasMatch(String regexp) {
+ for (int i = 0; i < getRowCount(); i++) {
+ Row row = (Row) getRows().get(i);
+ if (row.hasMatch(regexp))
+ return true;
}
+ return false;
+ }
- public void assertEquals(Table t) {
- Assert.assertTrue("Row count are not equal", this.getRows().size() == t
- .getRows().size());
- for (int i = 0; i < this.getRows().size(); i++) {
- ((Row) this.getRows().get(i))
- .assertEquals((Row) t.getRows().get(i));
- }
+ public void assertEquals(Table t) {
+ Assert.assertTrue("Row count are not equal", this.getRows().size() == t
+ .getRows().size());
+ for (int i = 0; i < this.getRows().size(); i++) {
+ ((Row) this.getRows().get(i))
+ .assertEquals((Row) t.getRows().get(i));
}
+ }
- public void assertSubTableEquals(int startRow, Table t) {
- Table sub = new Table();
- if (startRow + t.getRowCount() > this.getRowCount())
- Assert.fail("Expected rows [" + t.getRowCount()
- + "] larger than actual rows in range being compared"
- + " [" + (this.getRowCount() - startRow) + "].");
- for (int i = startRow; i < startRow + t.getRowCount(); i++) {
- sub.appendRow((Row) this.getRows().get(i));
- }
- sub.assertEquals(t);
+ public void assertSubTableEquals(int startRow, Table t) {
+ Table sub = new Table();
+ if (startRow + t.getRowCount() > this.getRowCount())
+ Assert.fail("Expected rows [" + t.getRowCount()
+ + "] larger than actual rows in range being compared"
+ + " [" + (this.getRowCount() - startRow) + "].");
+ for (int i = startRow; i < startRow + t.getRowCount(); i++) {
+ sub.appendRow((Row) this.getRows().get(i));
}
+ sub.assertEquals(t);
+ }
- public void assertMatch(Table t) {
- Assert.assertTrue("Row count are not equal", this.getRows().size() == t
- .getRows().size());
- for (int i = 0; i < this.getRows().size(); i++) {
- ((Row) this.getRows().get(i)).assertMatch((Row)
t.getRows().get(i));
- }
+ public void assertMatch(Table t) {
+ Assert.assertTrue("Row count are not equal", this.getRows().size() == t
+ .getRows().size());
+ for (int i = 0; i < this.getRows().size(); i++) {
+ ((Row) this.getRows().get(i)).assertMatch((Row) t.getRows().get(i));
}
+ }
- public void assertSubTableMatch(int startRow, Table t) {
- Table sub = new Table();
- if (startRow + t.getRowCount() > this.getRowCount())
- Assert.fail("Expected rows [" + t.getRowCount()
- + "] larger than actual rows in range being compared"
- + " [" + (this.getRowCount() - startRow) + "].");
- for (int i = startRow; i < startRow + t.getRowCount(); i++) {
- sub.appendRow((Row) this.getRows().get(i));
- }
- sub.assertMatch(t);
+ public void assertSubTableMatch(int startRow, Table t) {
+ Table sub = new Table();
+ if (startRow + t.getRowCount() > this.getRowCount())
+ Assert.fail("Expected rows [" + t.getRowCount()
+ + "] larger than actual rows in range being compared"
+ + " [" + (this.getRowCount() - startRow) + "].");
+ for (int i = startRow; i < startRow + t.getRowCount(); i++) {
+ sub.appendRow((Row) this.getRows().get(i));
}
+ sub.assertMatch(t);
+ }
}
Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml 2014-03-17 09:47:12 UTC (rev
968)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml 2014-03-17 09:56:31 UTC (rev
969)
@@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/jwebunit-webdriver-plugin/pom.xml
===================================================================
--- trunk/jwebunit-webdriver-plugin/pom.xml 2014-03-17 09:47:12 UTC (rev
968)
+++ trunk/jwebunit-webdriver-plugin/pom.xml 2014-03-17 09:56:31 UTC (rev
969)
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-17 09:47:12 UTC (rev 968)
+++ trunk/pom.xml 2014-03-17 09:56:31 UTC (rev 969)
@@ -363,8 +363,8 @@
<dependencies>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <version>4.10</version>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2014-03-17 09:47:12 UTC (rev 968)
+++ trunk/src/changes/changes.xml 2014-03-17 09:56:31 UTC (rev 969)
@@ -32,6 +32,9 @@
<body>
<release version="3.2" date="UNKNOW" description="">
<action type="update" dev="henryju">
+ Updated to JUnit 4.11.
+ </action>
+ <action type="update" dev="henryju">
Updated to HtmlUnit 2.14.
</action>
<action type="fix" dev="henryju" issue="3590252" due-to="Kenny
MacLeod">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
