Return-Path: 
 <commits-return-31018-apmail-tomee-commits-archive=tomee.apache.org@tomee.apache.org>
X-Original-To: apmail-tomee-commits-archive@www.apache.org
Delivered-To: apmail-tomee-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CE73711DB6
	for <apmail-tomee-commits-archive@www.apache.org>;
 Sun,  6 Jul 2014 07:33:32 +0000 (UTC)
Received: (qmail 61026 invoked by uid 500); 6 Jul 2014 07:33:32 -0000
Delivered-To: apmail-tomee-commits-archive@tomee.apache.org
Received: (qmail 60996 invoked by uid 500); 6 Jul 2014 07:33:32 -0000
Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tomee.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tomee.apache.org>
List-Post: <mailto:commits@tomee.apache.org>
List-Id: <commits.tomee.apache.org>
Reply-To: dev@tomee.apache.org
Delivered-To: mailing list commits@tomee.apache.org
Received: (qmail 60987 invoked by uid 99); 6 Jul 2014 07:33:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jul 2014 07:33:32 +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, 06 Jul 2014 07:33:33 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B818F238896F;
	Sun,  6 Jul 2014 07:33:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1608169 - in
 /tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors: pom.xml
 src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java
Date: Sun, 06 Jul 2014 07:33:07 -0000
To: commits@tomee.apache.org
From: andygumbrecht@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140706073307.B818F238896F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: andygumbrecht
Date: Sun Jul  6 07:33:07 2014
New Revision: 1608169

URL: http://svn.apache.org/r1608169
Log:
Fix format dependant test

Modified:
    tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/pom.xml
    tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java

Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/pom.xml?rev=1608169&r1=1608168&r2=1608169&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/pom.xml Sun Jul  6 07:33:07 2014
@@ -56,6 +56,11 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java?rev=1608169&r1=1608168&r2=1608169&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java Sun Jul  6 07:33:07 2014
@@ -19,10 +19,16 @@ package org.apache.openejb.sxc;
 import junit.framework.TestCase;
 import org.apache.openejb.jee.EjbJar$JAXB;
 import org.apache.openejb.loader.IO;
+import org.custommonkey.xmlunit.DetailedDiff;
+import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.Difference;
+import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener;
+import org.custommonkey.xmlunit.XMLUnit;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @version $Revision$ $Date$
@@ -61,22 +67,28 @@ public class EjbJarXmlTest extends TestC
         marshall.stop();
 
         final String result = new String(baos.toByteArray(), "UTF-8");
-        assertEquals(expected.trim().replace("<!--\n" +
-            "  Licensed to the Apache Software Foundation (ASF) under one or more\n" +
-            "  contributor license agreements.  See the NOTICE file distributed with\n" +
-            "  this work for additional information regarding copyright ownership.\n" +
-            "  The ASF licenses this file to You under the Apache License, Version 2.0\n" +
-            "  (the \"License\"); you may not use this file except in compliance with\n" +
-            "  the License.  You may obtain a copy of the License at\n" +
-            "\n" +
-            "      http://www.apache.org/licenses/LICENSE-2.0\n" +
-            "\n" +
-            "  Unless required by applicable law or agreed to in writing, software\n" +
-            "  distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
-            "  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
-            "  See the License for the specific language governing permissions and\n" +
-            "  limitations under the License.\n" +
-            "-->\n", ""), result.trim());
+
+        XMLUnit.setIgnoreComments(Boolean.TRUE);
+        XMLUnit.setIgnoreWhitespace(Boolean.TRUE);
+        XMLUnit.setIgnoreAttributeOrder(Boolean.TRUE);
+        XMLUnit.setIgnoreDiffBetweenTextAndCDATA(Boolean.TRUE);
+
+        final Diff diff = new Diff(expected.trim(), result.trim());
+        final Diff myDiff = new DetailedDiff(diff);
+
+        final AtomicInteger differenceNumber = new AtomicInteger(0); // just to get an int wrapper for the test
+        myDiff.overrideDifferenceListener(new IgnoreTextAndAttributeValuesDifferenceListener(){
+            @Override
+            public int differenceFound(final Difference difference) {
+                if (!difference.isRecoverable()) {
+                    differenceNumber.incrementAndGet();
+                    System.err.println(">>> " + difference.toString());
+                }
+                return 0;
+            }
+        });
+
+        assertTrue("Files are not identical", myDiff.identical());
         test.stop();
     }