Return-Path: X-Original-To: apmail-cocoon-cvs-archive@www.apache.org Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A4B2CD78 for ; Sun, 14 Jul 2013 14:30:59 +0000 (UTC) Received: (qmail 92150 invoked by uid 500); 14 Jul 2013 14:30:57 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 92083 invoked by uid 500); 14 Jul 2013 14:30:53 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 92070 invoked by uid 99); 14 Jul 2013 14:30:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jul 2013 14:30:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jul 2013 14:30:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 10545238888A for ; Sun, 14 Jul 2013 14:30:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1502981 - /cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/tika/TikaGeneratorTestCase.java Date: Sun, 14 Jul 2013 14:30:29 -0000 To: cvs@cocoon.apache.org From: javier@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130714143030.10545238888A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: javier Date: Sun Jul 14 14:30:29 2013 New Revision: 1502981 URL: http://svn.apache.org/r1502981 Log: COCOON3-128: compare similar not identical XML files as elements order does not matter. Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/tika/TikaGeneratorTestCase.java Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/tika/TikaGeneratorTestCase.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/tika/TikaGeneratorTestCase.java?rev=1502981&r1=1502980&r2=1502981&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/tika/TikaGeneratorTestCase.java (original) +++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/tika/TikaGeneratorTestCase.java Sun Jul 14 14:30:29 2013 @@ -20,6 +20,7 @@ import org.apache.cocoon.sax.SAXPipeline import org.apache.cocoon.sax.component.XMLSerializer; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.Diff; +import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -74,7 +75,7 @@ public class TikaGeneratorTestCase { InputSource testSource = new InputSource(new FileInputStream(testFile)); DetailedDiff diff = new DetailedDiff( new Diff(controlSource, testSource)); - List allDifferences = diff.getAllDifferences(); - assertEquals(diff.toString(), 0, allDifferences.size()); + diff.overrideElementQualifier(new ElementNameAndAttributeQualifier()); + assertTrue(diff.toString(), diff.similar()); } }