Projects
Mega:23.09
xmlunit
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 3
View file
_service:tar_scm:xmlunit.spec
Changed
@@ -1,12 +1,13 @@ Name: xmlunit Version: 2.7.0 -Release: 1 +Release: 2 Summary: Unit Testing XML for Java and .NET License: Apache 2.0 and BSD URL: https://www.xmlunit.org/ Source0: https://github.com/xmlunit/xmlunit/releases/download/v%{version}/%{name}-%{version}-src.tar.gz Patch0: 0001-Disable-tests-requiring-network-access.patch Patch1: xmlunit-2.7.0-ValueAssertTest-fix.patch +Patch2: 0002-Port-to-hamcrest-2.1.patch BuildArch: noarch BuildRequires: maven-local @@ -87,6 +88,9 @@ %files placeholders -f .mfiles-xmlunit-placeholders %changelog +* Wed Sep 27 2023 wangkai <13474090681@163.com> - 2.7.0-2 +- Fix build error for hamcrest-2.x + * Mon Feb 21 2022 Ge Wang <wangge20@huawei.com> - 2.7.0-1 - Upgrade to version 2.7.0
View file
_service:tar_scm:0002-Port-to-hamcrest-2.1.patch
Added
@@ -0,0 +1,157 @@ +From 8d7373f5feef927514339fe42919873836c0f710 Mon Sep 17 00:00:00 2001 +From: Marian Koncek <mkoncek@redhat.com> +Date: Thu, 29 Aug 2019 13:58:24 +0200 +Subject: PATCH 2/3 Port to hamcrest 2.1 + +--- + .../src/main/java/org/xmlunit/matchers/CompareMatcher.java | 3 --- + .../main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java | 2 -- + .../src/main/java/org/xmlunit/matchers/HasXPathMatcher.java | 2 -- + .../src/main/java/org/xmlunit/matchers/TypeMatcher.java | 5 ----- + .../main/java/org/xmlunit/matchers/ValidationMatcher.java | 3 --- + 5 files changed, 15 deletions(-) + +diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java +index 6452081..226399c 100644 +--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java ++++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java +@@ -33,7 +33,6 @@ + + import org.hamcrest.BaseMatcher; + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + + import java.lang.reflect.Constructor; +@@ -112,7 +111,6 @@ private CompareMatcher(Object control) { + * <p> + * As input all types are supported which are supported by {@link Input#from(Object)}. + */ +- @Factory + public static CompareMatcher isIdenticalTo(final Object control) { + return new CompareMatcher(control).checkForIdentical(); + } +@@ -128,7 +126,6 @@ public static CompareMatcher isIdenticalTo(final Object control) { + * <p> + * As input all types are supported which are supported by {@link Input#from(Object)}. + */ +- @Factory + public static CompareMatcher isSimilarTo(final Object control) { + return new CompareMatcher(control).checkForSimilar(); + } +diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java +index 6eb23e5..1e9b8b5 100644 +--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java ++++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java +@@ -16,7 +16,6 @@ + + import org.hamcrest.BaseMatcher; + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.w3c.dom.Node; + import org.xmlunit.builder.Input; +@@ -93,7 +92,6 @@ public EvaluateXPathMatcher(String xPath, Matcher<String> valueMatcher) { + * @param valueMatcher matcher for the value at the specified xpath + * @return the xpath matcher + */ +- @Factory + public static EvaluateXPathMatcher hasXPath(String xPath, Matcher<String> valueMatcher) { + return new EvaluateXPathMatcher(xPath, valueMatcher); + } +diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java +index 08325cd..6fbf0ac 100644 +--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java ++++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java +@@ -16,7 +16,6 @@ + + import org.hamcrest.BaseMatcher; + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.w3c.dom.Node; + import org.xmlunit.builder.Input; +@@ -135,7 +134,6 @@ public void describeMismatch(Object item, Description mismatchDescription) { + * @param xPath the target xpath + * @return the xpath matcher + */ +- @Factory + public static HasXPathMatcher hasXPath(String xPath) { + return new HasXPathMatcher(xPath); + } +diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java +index b9002a1..7cd6843 100644 +--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java ++++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java +@@ -15,7 +15,6 @@ + package org.xmlunit.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -128,7 +127,6 @@ private T nullSafeConvert(String item) { + * @param valueMatcher valueMatcher for the converted value + * @return the BigDecimal matcher + */ +- @Factory + public static TypeMatcher<BigDecimal> asBigDecimal(Matcher<? extends BigDecimal> valueMatcher) { + return new BigDecimalTypeMatcher(valueMatcher); + } +@@ -146,7 +144,6 @@ public static TypeMatcher<BigDecimal> asBigDecimal(Matcher<? extends BigDecimal> + * @param valueMatcher valueMatcher for the converted value + * @return the Double matcher + */ +- @Factory + public static TypeMatcher<Double> asDouble(Matcher<? extends Double> valueMatcher) { + return new DoubleTypeMatcher(valueMatcher); + } +@@ -164,7 +161,6 @@ public static TypeMatcher<Double> asDouble(Matcher<? extends Double> valueMatche + * @param valueMatcher valueMatcher for the converted value + * @return the Integer matcher + */ +- @Factory + public static TypeMatcher<Integer> asInt(Matcher<? extends Integer> valueMatcher) { + return new IntegerTypeMatcher(valueMatcher); + } +@@ -182,7 +178,6 @@ public static TypeMatcher<Integer> asInt(Matcher<? extends Integer> valueMatcher + * @param valueMatcher valueMatcher for the converted value + * @return the Boolean matcher + */ +- @Factory + public static TypeMatcher<Boolean> asBoolean(Matcher<? extends Boolean> valueMatcher) { + return new BooleanTypeMatcher(valueMatcher); + } +diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java +index 3126349..51f58ec 100644 +--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java ++++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java +@@ -27,7 +27,6 @@ + import org.xmlunit.validation.ValidationResult; + import org.hamcrest.BaseMatcher; + import org.hamcrest.Description; +-import org.hamcrest.Factory; + + import javax.xml.transform.Source; + import javax.xml.validation.Schema; +@@ -121,7 +120,6 @@ public void describeMismatch(final Object item, final Description mismatchDescri + } + } + +- @Factory + public static ValidationMatcher valid(final Object schemaSource) { + return new ValidationMatcher(schemaSource); + } +@@ -129,7 +127,6 @@ public static ValidationMatcher valid(final Object schemaSource) { + /** + * @since XMLUnit 2.3.0 + */ +- @Factory + public static ValidationMatcher valid(final Schema schema) { + return new ValidationMatcher(schema); + } +-- +2.35.1 + +
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="url">git@gitee.com:src-openeuler/xmlunit.git</param> <param name="scm">git</param> - <param name="revision">openEuler-23.09</param> + <param name="revision">master</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
View file
_service:tar_scm:xmlunit.yaml
Added
@@ -0,0 +1,4 @@ +version_control: github +src_repo: xmlunit/xmlunit +tag_prefix: "^v" +separator: "."
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2