You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2008/03/25 11:32:24 UTC
svn commit: r640763 - in
/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api:
AbstractImportXmlTest.java DocumentViewImportTest.java
Author: mreutegg
Date: Tue Mar 25 03:32:13 2008
New Revision: 640763
URL: http://svn.apache.org/viewvc?rev=640763&view=rev
Log:
JCR-1497: Incorrect decodedAttributeValue in AbstractImportXmlTest
Modified:
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractImportXmlTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/DocumentViewImportTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractImportXmlTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractImportXmlTest.java?rev=640763&r1=640762&r2=640763&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractImportXmlTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractImportXmlTest.java Tue Mar 25 03:32:13 2008
@@ -115,10 +115,10 @@
protected static final String encodedAttributeName = "Prop_x0020_Name";
protected static final String decodedAttributeName = "Prop Name";
protected static final String encodedAttributeValue = "Hello_x0009_&_x0009_GoodBye";
- protected static final String decodedAttributeValue = "Hello\\t&\\tGoodBye";
+ protected static final String decodedAttributeValue = "Hello\t&\tGoodBye";
//String value for the test with leading and trailing spaces and entity reference charachters
- protected String xmltext = "\\t Text for docView Export test_x0009_with escaped _x003C_ characters. ";
+ protected String xmltext = "\t Text for docView Export test_x0009_with escaped _x003C_ characters. ";
// is semantic of mix:referenceable respected?
protected boolean respectMixRef = false;
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/DocumentViewImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/DocumentViewImportTest.java?rev=640763&r1=640762&r2=640763&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/DocumentViewImportTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/DocumentViewImportTest.java Tue Mar 25 03:32:13 2008
@@ -193,7 +193,7 @@
String propVal = decodedProp.getString();
// both possibilities
if (!propVal.equals(encodedAttributeValue)
- || !propVal.equals(encodedAttributeValue)) {
+ && !propVal.equals(decodedAttributeValue)) {
fail("Value " + encodedAttributeValue + " of attribute " +
decodedAttributeName + " is not correctly imported.");
}
@@ -206,7 +206,7 @@
String propVal = decodedProp.getString();
// both possibilities
if (!propVal.equals(encodedAttributeValue)
- || !propVal.equals(encodedAttributeValue)) {
+ && !propVal.equals(decodedAttributeValue)) {
fail("Value " + encodedAttributeValue + " of attribute " +
encodedAttributeName + " is not correctly imported.");
}