You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/06/17 19:50:24 UTC
svn commit: r668770 -
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java
Author: skitching
Date: Tue Jun 17 10:50:23 2008
New Revision: 668770
URL: http://svn.apache.org/viewvc?rev=668770&view=rev
Log:
Fix misleading test failure message
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java?rev=668770&r1=668769&r2=668770&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java Tue Jun 17 10:50:23 2008
@@ -223,33 +223,33 @@
/**
* Compare the contents of two Reader objects line-by-line.
*/
- private void compareData(Reader src1, Reader src2) throws IOException
+ private void compareData(Reader testData, Reader goodData) throws IOException
{
- BufferedReader in1 = new BufferedReader(src1);
- BufferedReader in2 = new BufferedReader(src2);
+ BufferedReader testDataReader = new BufferedReader(testData);
+ BufferedReader goodDataReader = new BufferedReader(goodData);
int line = 0;
for (;;)
{
++line;
- String line1 = in1.readLine();
- String line2 = in2.readLine();
+ String testLine = testDataReader.readLine();
+ String goodLine = goodDataReader.readLine();
- if ((line1 == null) && (line2 == null))
+ if ((testLine == null) && (goodLine == null))
{
// success
return;
}
- else if (line1 == null)
+ else if (testLine == null)
{
fail("input 2 has more lines than input 1");
}
- else if (line2 == null)
+ else if (goodLine == null)
{
fail("input 1 has more lines than input 2");
}
- assertEquals("Inputs differ on line " + line, line1, line2);
+ assertEquals("Inputs differ on line " + line, goodLine, testLine);
}
}
}