rpms / xmvn

Clone
Source Code
GIT

#2 port to xmlunit2
Closed 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+3 
@@ -1,3 +1,6 @@
 

+ /results_*
 

+ /*.src.rpm
 

+ 

  /xmvn-0.tar.xz
 

  /xmvn-0.0.1.tar.xz
 

  /xmvn-0.0.2.tar.xz

file added
+86 
@@ -0,0 +1,86 @@
 

+ From 7049d71ed85851fb5ca25b88c5e33b51cf3a5dac Mon Sep 17 00:00:00 2001
 

+ From: Marian Koncek <mkoncek@redhat.com>
 

+ Date: Fri, 19 Apr 2019 09:32:40 +0200
 

+ Subject: [PATCH] Port to Xmlunit 2.6.2
 

+ 

+ ---
 

+  xmvn-parent/pom.xml                                    | 10 +++++-----
 

+  .../xmvn/tools/install/impl/InstallerTest.java         |  6 ++----
 

+  2 files changed, 7 insertions(+), 9 deletions(-)
 

+ 

+ diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
 

+ index d4f9dda..5c21cfa 100644
 

+ --- a/xmvn-parent/pom.xml
 

+ +++ b/xmvn-parent/pom.xml
 

+ @@ -122,7 +122,7 @@
 

+      <sitePluginVersion>3.6</sitePluginVersion>
 

+      <sourcePluginVersion>3.0.1</sourcePluginVersion>
 

+      <surefireVersion>2.19.1</surefireVersion>
 

+ -    <xmlunitVersion>1.6</xmlunitVersion>
 

+ +    <xmlunitVersion>2.6.2</xmlunitVersion>
 

+  

+    </properties>
 

+    <dependencyManagement>
 

+ @@ -228,8 +228,8 @@
 

+          <version>${junitVersion}</version>
 

+        </dependency>
 

+        <dependency>
 

+ -        <groupId>xmlunit</groupId>
 

+ -        <artifactId>xmlunit</artifactId>
 

+ +        <groupId>org.xmlunit</groupId>
 

+ +        <artifactId>xmlunit-assertj</artifactId>
 

+          <version>${xmlunitVersion}</version>
 

+        </dependency>
 

+        <dependency>
 

+ @@ -336,8 +336,8 @@
 

+        <scope>test</scope>
 

+      </dependency>
 

+      <dependency>
 

+ -      <groupId>xmlunit</groupId>
 

+ -      <artifactId>xmlunit</artifactId>
 

+ +      <groupId>org.xmlunit</groupId>
 

+ +      <artifactId>xmlunit-assertj</artifactId>
 

+        <scope>test</scope>
 

+      </dependency>
 

+      <dependency>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java
 

+ index 9fb7d90..bece0b2 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java
 

+ +++ b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/impl/InstallerTest.java
 

+ @@ -15,8 +15,6 @@
 

+   */
 

+  package org.fedoraproject.xmvn.tools.install.impl;
 

+  

+ -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 

+ -import static org.custommonkey.xmlunit.XMLUnit.setIgnoreWhitespace;
 

+  import static org.easymock.EasyMock.expect;
 

+  import static org.easymock.EasyMock.replay;
 

+  import static org.easymock.EasyMock.verify;
 

+ @@ -40,6 +38,7 @@ import org.junit.runner.RunWith;
 

+  import org.w3c.dom.Document;
 

+  import org.w3c.dom.Node;
 

+  import org.w3c.dom.NodeList;
 

+ +import org.xmlunit.assertj.XmlAssert;
 

+  

+  import org.fedoraproject.xmvn.artifact.DefaultArtifact;
 

+  import org.fedoraproject.xmvn.config.Artifact;
 

+ @@ -188,7 +187,6 @@ public class InstallerTest
 

+      protected void assertMetadataEqual( Path expected, Path actual )
 

+          throws Exception
 

+      {
 

+ -        setIgnoreWhitespace( true );
 

+          assertTrue( Files.isRegularFile( actual ) );
 

+          DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 

+          DocumentBuilder builder = factory.newDocumentBuilder();
 

+ @@ -208,7 +206,7 @@ public class InstallerTest
 

+          unifyUuids( expectedXml.getElementsByTagName( "uuid" ) );
 

+          unifyUuids( actualXml.getElementsByTagName( "uuid" ) );
 

+  

+ -        assertXMLEqual( expectedXml, actualXml );
 

+ +        XmlAssert.assertThat( expectedXml ).and( actualXml ).ignoreWhitespace().areSimilar();
 

+      }
 

+  

+      @Test
 

+ -- 

+ 2.20.1
 

+

file added
+311 
@@ -0,0 +1,311 @@
 

+ From c35be2b2b90741aa4f7c260fa4954cd5d3c2e6a8 Mon Sep 17 00:00:00 2001
 

+ From: Mikolaj Izdebski <mizdebsk@redhat.com>
 

+ Date: Wed, 17 Apr 2019 16:12:22 +0200
 

+ Subject: [PATCH] [test] Fix XML namespace in installer test resources
 

+ 

+ ---
 

+  xmvn-tools/xmvn-install/src/test/resources/alias.xml            | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/compat.xml           | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml    | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml    | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/namespace.xml        | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml       | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml      | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-aid.xml           | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-file.xml          | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml       | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml      | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-gid.xml           | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml   | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/no-version.xml       | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml  | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/skipped.xml          | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml    | 2 +-
 

+  .../xmvn-install/src/test/resources/test-pkg-resolved.xml       | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml     | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml         | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/uuid.xml             | 2 +-
 

+  xmvn-tools/xmvn-install/src/test/resources/valid.xml            | 2 +-
 

+  27 files changed, 27 insertions(+), 27 deletions(-)
 

+ 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/alias.xml b/xmvn-tools/xmvn-install/src/test/resources/alias.xml
 

+ index 6e33a2a0..a86d73e9 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/alias.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/alias.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/compat.xml b/xmvn-tools/xmvn-install/src/test/resources/compat.xml
 

+ index 1cd57df9..428177cb 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/compat.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/compat.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml b/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml
 

+ index cb3fae4e..8f0898c6 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/metadata-uuid.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <uuid>test-uuid</uuid>
 

+    <artifacts>
 

+      <artifact>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml
 

+ index d80cf352..59e6767b 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/namespace-dep.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/namespace.xml b/xmvn-tools/xmvn-install/src/test/resources/namespace.xml
 

+ index 7b0b7ada..d4a62f68 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/namespace.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/namespace.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml
 

+ index 36548f94..44ec6a89 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid-dep.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml
 

+ index 5b1c77f1..9aec70fb 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid-excl.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml b/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml
 

+ index b8b33a99..9dd5b97f 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-aid.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-file.xml b/xmvn-tools/xmvn-install/src/test/resources/no-file.xml
 

+ index 710567ee..a77dd6cc 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-file.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-file.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml
 

+ index 0fdfec96..53b829ad 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid-dep.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml
 

+ index 3c135126..c8e3e6c8 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid-excl.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml b/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml
 

+ index 40386690..ba36e50e 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-gid.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml b/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml
 

+ index 08587264..49fe2922 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-version-dep.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/no-version.xml b/xmvn-tools/xmvn-install/src/test/resources/no-version.xml
 

+ index 480bc8e4..2a8322ab 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/no-version.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/no-version.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml
 

+ index 385822b6..400bf234 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/nonexistent-file.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml
 

+ index eb23aba7..cff22643 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/nonreadable-file.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml b/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml
 

+ index 3cd66465..76c34bc9 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/nonregular-file.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml b/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml
 

+ index 9099ec28..9279d896 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/resolved-version.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/skipped.xml b/xmvn-tools/xmvn-install/src/test/resources/skipped.xml
 

+ index 66bef3d8..b08836a1 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/skipped.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/skipped.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml
 

+ index 0bcdce1d..0bd964fc 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-main.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+      <uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
 

+      <artifacts>
 

+          <artifact>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml
 

+ index c9053bbd..9d3bbb67 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-resolved.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+      <uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
 

+      <artifacts>
 

+          <artifact>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml
 

+ index 32e72e63..068f17f6 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg-sub.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+      <uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
 

+      <artifacts>
 

+          <artifact>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml b/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml
 

+ index 3364d985..8b0d6223 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/test-pkg.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+      <uuid>1e5b4990-c4e3-42b4-9145-5b7783ab91a2</uuid>
 

+      <artifacts>
 

+          <artifact>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/uuid.xml b/xmvn-tools/xmvn-install/src/test/resources/uuid.xml
 

+ index 9bf862fa..b57b9584 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/uuid.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/uuid.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ diff --git a/xmvn-tools/xmvn-install/src/test/resources/valid.xml b/xmvn-tools/xmvn-install/src/test/resources/valid.xml
 

+ index c9a2be8d..f2fa0c24 100644
 

+ --- a/xmvn-tools/xmvn-install/src/test/resources/valid.xml
 

+ +++ b/xmvn-tools/xmvn-install/src/test/resources/valid.xml
 

+ @@ -1,5 +1,5 @@
 

+  <?xml version="1.0" encoding="UTF-8"?>
 

+ -<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
 

+ +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
 

+    <artifacts>
 

+      <artifact>
 

+        <groupId>com.example</groupId>
 

+ -- 

+ 2.20.1
 

+

file modified
+8 -1 
@@ -26,6 +26,8 @@
 

  Patch5:         0001-Don-t-use-JAXB-for-converting-bytes-to-hex-string.patch
 

  Patch6:         0001-Use-apache-commons-compress-for-manifest-injection-a.patch
 

  Patch7:         0001-port-to-gradle-4.4.1.patch
 

+ Patch8:         0001-test-Fix-XML-namespace-in-installer-test-resources.patch
 

+ Patch9:         0001-Port-to-Xmlunit-2.6.2.patch
 

  

  BuildRequires:  maven >= 3.5.0
 

  BuildRequires:  maven-local
 
@@ -39,7 +41,7 @@
 

  BuildRequires:  maven-plugin-plugin
 

  BuildRequires:  objectweb-asm
 

  BuildRequires:  modello
 

- BuildRequires:  xmlunit
 

+ BuildRequires:  xmlunit-assertj
 

  BuildRequires:  apache-ivy
 

  BuildRequires:  junit
 

  BuildRequires:  easymock
 
@@ -216,6 +218,8 @@
 

  %patch5 -p1
 

  %patch6 -p1
 

  %patch7 -p1
 

+ %patch8 -p1
 

+ %patch9 -p1
 

  

  # Bisect IT has no chances of working in local, offline mode, without
 

  # network access - it needs to access remote repositories.
 
@@ -365,6 +369,9 @@
 

  %doc LICENSE NOTICE
 

  

  %changelog
 

+ * Thu Aug 22 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0-26
 

+ - Port to xmlunit2.
 

+ 

  * Sun Aug 11 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0-25
 

  - Disable gradle support by default.

This PR includes upstream patches to port xmvn to xmlunit 2.

This is already live in modular branches, where xmvn 3.1.0 is available.

Test rebuild of this change happened in COPR, along with other test rebuilds for xmlunit 2.6.3:

https://copr.fedorainfracloud.org/coprs/decathorpe/xmlunit-pr/monitor/

This PR can be merged after xmlunit#PR2 has been merged and built.

I'll rebase this PR in the near future.

rebased onto e9d12f3
4 years ago

Rebased for after the fedora 31 mass rebuild.

Closing and recreating to work around pagure bug with missing "Merge" button.

Pull-Request has been closed by decathorpe
4 years ago
Metadata
None
No Tags
Flags
simple-koji-ci
failure
Build failed for f028abfd
4 years ago
Changes Summary 4
+3 -0
file changed
.gitignore
+86
file added
0001-Port-to-Xmlunit-2.6.2.patch
+311
file added
0001-test-Fix-XML-namespace-in-installer-test-resources.patch
+8 -1
file changed
xmvn.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.