From 8347bde326ba35bb65a2ffd2f83923b59ba700ad Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 7 Feb 2024 18:29:16 +0100 Subject: [PATCH] cleanup step 1 Signed-off-by: Stefan --- org.osgi.test.assertj.feature/pom.xml | 6 +- .../AbstractFeatureArtifactAssert.java | 2 +- .../feature/AbstractFeatureAssert.java | 25 ++-- .../feature/AbstractFeatureBundleAssert.java | 2 +- .../AbstractFeatureConfigurationAssert.java | 2 +- .../AbstractFeatureExtensionAssert.java | 26 +--- .../assertj/feature/AbstractIDAssert.java | 2 +- .../osgi/test/assertj/feature/Assertions.java | 12 +- .../feature/FeatureArtifactAssert.java | 2 +- .../test/assertj/feature/FeatureAssert.java | 2 +- .../assertj/feature/FeatureBundleAssert.java | 2 +- .../feature/FeatureConfigurationAssert.java | 2 +- .../feature/FeatureExtensionAssert.java | 2 +- .../assertj/feature/FeaturesConditions.java | 112 +++++++++++------- .../osgi/test/assertj/feature/IDAssert.java | 2 +- .../test/assertj/feature/SoftAssertions.java | 24 ++-- .../feature/FeaturesConditionsAssertTest.java | 14 ++- org.osgi.test.assertj.feature/test.bndrun | 23 ++-- 18 files changed, 132 insertions(+), 130 deletions(-) diff --git a/org.osgi.test.assertj.feature/pom.xml b/org.osgi.test.assertj.feature/pom.xml index 59015c75..38c15dd1 100644 --- a/org.osgi.test.assertj.feature/pom.xml +++ b/org.osgi.test.assertj.feature/pom.xml @@ -51,11 +51,7 @@ org.osgi - osgi.core - - - org.osgi - org.osgi.util.feature + org.osgi.service.feature org.mockito diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureArtifactAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureArtifactAssert.java index 2c30a9e9..23c083d3 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureArtifactAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureArtifactAssert.java @@ -19,7 +19,7 @@ package org.osgi.test.assertj.feature; import org.assertj.core.api.AbstractObjectAssert; -import org.osgi.util.feature.FeatureArtifact; +import org.osgi.service.feature.FeatureArtifact; /** * Abstract base class for {@link FeatureArtifact} specific assertions - diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureAssert.java index 15f4de49..d81b444c 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureAssert.java @@ -25,10 +25,10 @@ import org.assertj.core.api.InstanceOfAssertFactory; import org.assertj.core.api.ListAssert; import org.assertj.core.api.MapAssert; -import org.osgi.util.feature.Feature; -import org.osgi.util.feature.FeatureBundle; -import org.osgi.util.feature.FeatureConfiguration; -import org.osgi.util.feature.FeatureExtension; +import org.osgi.service.feature.Feature; +import org.osgi.service.feature.FeatureBundle; +import org.osgi.service.feature.FeatureConfiguration; +import org.osgi.service.feature.FeatureExtension; /** * Abstract base class for {@link Feature} specific assertions - Generated by @@ -120,8 +120,8 @@ public S hasDescriptionMatching(String pattern) { return isNotNull().has(FeaturesConditions.FeatureConditions.descriptionMatches(pattern)); } - public S isDescriptionNull() { - return isNotNull().is(FeaturesConditions.FeatureConditions.descriptionNull()); + public S isDescriptionEmpty() { + return isNotNull().is(FeaturesConditions.FeatureConditions.descriptionEmpty()); } /** @@ -141,8 +141,8 @@ public S hasLicenseMatching(String pattern) { return isNotNull().has(FeaturesConditions.FeatureConditions.licenseMatches(pattern)); } - public S isLicenseNull() { - return isNotNull().is(FeaturesConditions.FeatureConditions.licenseNull()); + public S isLicenseEmpty() { + return isNotNull().is(FeaturesConditions.FeatureConditions.licenseEmpty()); } /** @@ -161,8 +161,8 @@ public S hasNameMatching(String pattern) { return isNotNull().has(FeaturesConditions.FeatureConditions.nameMatches(pattern)); } - public S hasNameNull() { - return isNotNull().has(FeaturesConditions.FeatureConditions.nameNull()); + public S hasNameEmpty() { + return isNotNull().has(FeaturesConditions.FeatureConditions.nameEmpty()); } /** @@ -181,10 +181,9 @@ public S hasVendorMatching(String pattern) { return isNotNull().has(FeaturesConditions.FeatureConditions.vendorMatches(pattern)); } - public S isVendorNull() { - return isNotNull().is(FeaturesConditions.FeatureConditions.vendorNull()); + public S isVendorEmpty() { + return isNotNull().is(FeaturesConditions.FeatureConditions.vendorEmpty()); } - // TODO: categories, copyright, docURL and SCM. } diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureBundleAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureBundleAssert.java index 6179e289..54586e9e 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureBundleAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureBundleAssert.java @@ -23,7 +23,7 @@ import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.InstanceOfAssertFactory; import org.assertj.core.api.MapAssert; -import org.osgi.util.feature.FeatureBundle; +import org.osgi.service.feature.FeatureBundle; /** * Abstract base class for {@link FeatureBundle} specific assertions - Generated diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureConfigurationAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureConfigurationAssert.java index 2a5f51df..d4d70cb3 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureConfigurationAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureConfigurationAssert.java @@ -24,7 +24,7 @@ import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.InstanceOfAssertFactory; import org.assertj.core.api.MapAssert; -import org.osgi.util.feature.FeatureConfiguration; +import org.osgi.service.feature.FeatureConfiguration; /** * Abstract base class for {@link FeatureConfiguration} specific assertions - diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureExtensionAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureExtensionAssert.java index 97172da7..d42ea013 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureExtensionAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureExtensionAssert.java @@ -24,8 +24,8 @@ import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.InstanceOfAssertFactory; import org.assertj.core.api.ListAssert; -import org.osgi.util.feature.FeatureExtension; -import org.osgi.util.feature.ID; +import org.osgi.service.feature.FeatureExtension; +import org.osgi.service.feature.ID; /** * Abstract base class for {@link FeatureExtension} specific assertions - @@ -110,28 +110,6 @@ public S hasName(String name) { return has(FeaturesConditions.FeatureExtensionConditions.name(name)); } - /** - * Verifies that the actual FeatureExtension's text is equal to the given - * one. - * - * @param text the given text to compare the actual FeatureExtension's text - * to. - * @return this assertion object. - * @throws AssertionError - if the actual FeatureExtension's text is not - * equal to the given one. - */ - public S hasText(String text) { - return has(FeaturesConditions.FeatureExtensionConditions.text(text)); - } - - public S isTextNull() { - return is(FeaturesConditions.FeatureExtensionConditions.textNull()); - } - - public S hasTextMatching(String pattern) { - return has(FeaturesConditions.FeatureExtensionConditions.textMatches(pattern)); - } - /** * Verifies that the actual FeatureExtension's type is equal to the given * one. diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractIDAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractIDAssert.java index d340e6c7..802b1ad4 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractIDAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractIDAssert.java @@ -19,7 +19,7 @@ package org.osgi.test.assertj.feature; import org.assertj.core.api.AbstractObjectAssert; -import org.osgi.util.feature.ID; +import org.osgi.service.feature.ID; /** * Abstract base class for {@link ID} specific assertions - Generated by diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/Assertions.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/Assertions.java index db59788e..50e287cd 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/Assertions.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/Assertions.java @@ -32,7 +32,7 @@ public class Assertions { * @return the created assertion object. */ @org.assertj.core.util.CheckReturnValue - public static org.osgi.test.assertj.feature.FeatureAssert assertThat(org.osgi.util.feature.Feature actual) { + public static org.osgi.test.assertj.feature.FeatureAssert assertThat(org.osgi.service.feature.Feature actual) { return new org.osgi.test.assertj.feature.FeatureAssert(actual); } @@ -45,7 +45,7 @@ public static org.osgi.test.assertj.feature.FeatureAssert assertThat(org.osgi.ut */ @org.assertj.core.util.CheckReturnValue public static org.osgi.test.assertj.feature.FeatureArtifactAssert assertThat( - org.osgi.util.feature.FeatureArtifact actual) { + org.osgi.service.feature.FeatureArtifact actual) { return new org.osgi.test.assertj.feature.FeatureArtifactAssert(actual); } @@ -58,7 +58,7 @@ public static org.osgi.test.assertj.feature.FeatureArtifactAssert assertThat( */ @org.assertj.core.util.CheckReturnValue public static org.osgi.test.assertj.feature.FeatureBundleAssert assertThat( - org.osgi.util.feature.FeatureBundle actual) { + org.osgi.service.feature.FeatureBundle actual) { return new org.osgi.test.assertj.feature.FeatureBundleAssert(actual); } @@ -71,7 +71,7 @@ public static org.osgi.test.assertj.feature.FeatureBundleAssert assertThat( */ @org.assertj.core.util.CheckReturnValue public static org.osgi.test.assertj.feature.FeatureConfigurationAssert assertThat( - org.osgi.util.feature.FeatureConfiguration actual) { + org.osgi.service.feature.FeatureConfiguration actual) { return new org.osgi.test.assertj.feature.FeatureConfigurationAssert(actual); } @@ -84,7 +84,7 @@ public static org.osgi.test.assertj.feature.FeatureConfigurationAssert assertTha */ @org.assertj.core.util.CheckReturnValue public static org.osgi.test.assertj.feature.FeatureExtensionAssert assertThat( - org.osgi.util.feature.FeatureExtension actual) { + org.osgi.service.feature.FeatureExtension actual) { return new org.osgi.test.assertj.feature.FeatureExtensionAssert(actual); } @@ -96,7 +96,7 @@ public static org.osgi.test.assertj.feature.FeatureExtensionAssert assertThat( * @return the created assertion object. */ @org.assertj.core.util.CheckReturnValue - public static org.osgi.test.assertj.feature.IDAssert assertThat(org.osgi.util.feature.ID actual) { + public static org.osgi.test.assertj.feature.IDAssert assertThat(org.osgi.service.feature.ID actual) { return new org.osgi.test.assertj.feature.IDAssert(actual); } diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureArtifactAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureArtifactAssert.java index 997c3fa3..6eb2dd9e 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureArtifactAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureArtifactAssert.java @@ -18,7 +18,7 @@ package org.osgi.test.assertj.feature; -import org.osgi.util.feature.FeatureArtifact; +import org.osgi.service.feature.FeatureArtifact; /** * {@link FeatureArtifact} specific assertions - Generated by diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureAssert.java index b6a0791f..ce24bdc8 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureAssert.java @@ -18,7 +18,7 @@ package org.osgi.test.assertj.feature; -import org.osgi.util.feature.Feature; +import org.osgi.service.feature.Feature; /** * {@link Feature} specific assertions - Generated by CustomAssertionGenerator. diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureBundleAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureBundleAssert.java index 6cb10738..7cada107 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureBundleAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureBundleAssert.java @@ -18,7 +18,7 @@ package org.osgi.test.assertj.feature; -import org.osgi.util.feature.FeatureBundle; +import org.osgi.service.feature.FeatureBundle; /** * {@link FeatureBundle} specific assertions - Generated by diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureConfigurationAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureConfigurationAssert.java index b976ac3f..47b753e3 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureConfigurationAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureConfigurationAssert.java @@ -18,7 +18,7 @@ package org.osgi.test.assertj.feature; -import org.osgi.util.feature.FeatureConfiguration; +import org.osgi.service.feature.FeatureConfiguration; /** * {@link FeatureConfiguration} specific assertions - Generated by diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureExtensionAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureExtensionAssert.java index 5a8d752f..ce9e9250 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureExtensionAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureExtensionAssert.java @@ -18,7 +18,7 @@ package org.osgi.test.assertj.feature; -import org.osgi.util.feature.FeatureExtension; +import org.osgi.service.feature.FeatureExtension; /** * {@link FeatureExtension} specific assertions - Generated by diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeaturesConditions.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeaturesConditions.java index 8de97fd6..febfbc53 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeaturesConditions.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeaturesConditions.java @@ -23,14 +23,14 @@ import java.util.Objects; import org.assertj.core.api.Condition; -import org.osgi.util.feature.Feature; -import org.osgi.util.feature.FeatureArtifact; -import org.osgi.util.feature.FeatureBundle; -import org.osgi.util.feature.FeatureConfiguration; -import org.osgi.util.feature.FeatureExtension; -import org.osgi.util.feature.ID; +import org.osgi.service.feature.Feature; +import org.osgi.service.feature.FeatureArtifact; +import org.osgi.service.feature.FeatureBundle; +import org.osgi.service.feature.FeatureConfiguration; +import org.osgi.service.feature.FeatureExtension; +import org.osgi.service.feature.ID; -public interface FeaturesConditions { +interface FeaturesConditions { interface FeatureArtifactConditions { @@ -59,44 +59,73 @@ static Condition complete() { return new Condition(Feature::isComplete, "complete"); } - static Condition description(String description) { - return new Condition(f -> Objects.equals(f.getDescription(), description), "description <%s>", - description); + static Condition descriptionEmpty() { + return new Condition<>(f -> !f.getDescription() + .isPresent(), "description "); } - static Condition descriptionMatches(String pattern) { - return new Condition(f -> Objects.nonNull(f.getDescription()) && f.getDescription() - .matches(pattern), "description match <%s>", pattern); + static Condition description(String description) { + return new Condition(f -> f.getDescription() + .isPresent() + && f.getDescription() + .get() + .equals(description), + "description <%s>", description); } - static Condition descriptionNull() { - return new Condition<>(f -> f.getDescription() == null, "description "); + static Condition descriptionMatches(String pattern) { + return new Condition(f -> f.getDescription() + .isPresent() + && f.getDescription() + .get() + .matches(pattern), + "description match <%s>", pattern); } static Condition license(String license) { - return new Condition(f -> Objects.equals(f.getLicense(), license), "license <%s>", license); + return new Condition(f -> f.getLicense() + .isPresent() + && f.getLicense() + .get() + .equals(license), + "license <%s>", license); } static Condition licenseMatches(String pattern) { - return new Condition(f -> Objects.nonNull(f.getLicense()) && f.getLicense() - .matches(pattern), "license match <%s>", pattern); + return new Condition(f -> f.getLicense() + .isPresent() + && f.getLicense() + .get() + .matches(pattern), + "license match <%s>", pattern); } - static Condition licenseNull() { - return new Condition<>(f -> f.getLicense() == null, "license "); + static Condition licenseEmpty() { + return new Condition<>(f -> !f.getLicense() + .isPresent(), "license "); } static Condition name(String name) { - return new Condition(f -> Objects.equals(f.getName(), name), "name <%s>", name); + return new Condition(f -> f.getName() + .isPresent() + && f.getName() + .get() + .equals(name), + "name <%s>", name); } static Condition nameMatches(String pattern) { - return new Condition(f -> Objects.nonNull(f.getName()) && f.getName() - .matches(pattern), "name match <%s>", pattern); + return new Condition(f -> f.getName() + .isPresent() + && f.getName() + .get() + .matches(pattern), + "name match <%s>", pattern); } - static Condition nameNull() { - return new Condition<>(f -> f.getName() == null, "name "); + static Condition nameEmpty() { + return new Condition<>(f -> !f.getName() + .isPresent(), "name "); } static Condition notComplete() { @@ -104,16 +133,26 @@ static Condition notComplete() { } static Condition vendor(String vendor) { - return new Condition(f -> Objects.equals(f.getVendor(), vendor), "vendor <%s>", vendor); + return new Condition(f -> f.getVendor() + .isPresent() + && f.getVendor() + .get() + .equals(vendor), + "vendor <%s>", vendor); } static Condition vendorMatches(String pattern) { - return new Condition(f -> Objects.nonNull(f.getVendor()) && f.getVendor() - .matches(pattern), "vendor match <%s>", pattern); + return new Condition(f -> f.getVendor() + .isPresent() + && f.getVendor() + .get() + .matches(pattern), + "vendor match <%s>", pattern); } - static Condition vendorNull() { - return new Condition<>(f -> f.getVendor() == null, "vendor "); + static Condition vendorEmpty() { + return new Condition<>(f -> !f.getVendor() + .isPresent(), "vendor "); } // @@ -251,19 +290,6 @@ static Condition nameNull() { return new Condition<>(f -> f.getName() == null, "name "); } - static Condition text(String text) { - return new Condition(f -> Objects.equals(f.getText(), text), "text <%s>", text); - } - - static Condition textMatches(String pattern) { - return new Condition(f -> Objects.nonNull(f.getText()) && f.getText() - .matches(pattern), "text match <%s>", pattern); - } - - static Condition textNull() { - return new Condition<>(f -> f.getText() == null, "json "); - } - static Condition type(final FeatureExtension.Type type) { return kind(null); } diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/IDAssert.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/IDAssert.java index 2575896c..66633f6d 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/IDAssert.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/IDAssert.java @@ -18,7 +18,7 @@ package org.osgi.test.assertj.feature; -import org.osgi.util.feature.ID; +import org.osgi.service.feature.ID; /** * {@link ID} specific assertions - Generated by CustomAssertionGenerator. diff --git a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/SoftAssertions.java b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/SoftAssertions.java index 65eeea97..40d062e7 100644 --- a/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/SoftAssertions.java +++ b/org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/SoftAssertions.java @@ -31,8 +31,8 @@ public class SoftAssertions extends org.assertj.core.api.SoftAssertions { * @return the created "soft" assertion object. */ @org.assertj.core.util.CheckReturnValue - public org.osgi.test.assertj.feature.FeatureAssert assertThat(org.osgi.util.feature.Feature actual) { - return proxy(org.osgi.test.assertj.feature.FeatureAssert.class, org.osgi.util.feature.Feature.class, actual); + public org.osgi.test.assertj.feature.FeatureAssert assertThat(org.osgi.service.feature.Feature actual) { + return proxy(org.osgi.test.assertj.feature.FeatureAssert.class, org.osgi.service.feature.Feature.class, actual); } /** @@ -44,9 +44,9 @@ public org.osgi.test.assertj.feature.FeatureAssert assertThat(org.osgi.util.feat */ @org.assertj.core.util.CheckReturnValue public org.osgi.test.assertj.feature.FeatureArtifactAssert assertThat( - org.osgi.util.feature.FeatureArtifact actual) { + org.osgi.service.feature.FeatureArtifact actual) { return proxy(org.osgi.test.assertj.feature.FeatureArtifactAssert.class, - org.osgi.util.feature.FeatureArtifact.class, actual); + org.osgi.service.feature.FeatureArtifact.class, actual); } /** @@ -57,8 +57,8 @@ public org.osgi.test.assertj.feature.FeatureArtifactAssert assertThat( * @return the created "soft" assertion object. */ @org.assertj.core.util.CheckReturnValue - public org.osgi.test.assertj.feature.FeatureBundleAssert assertThat(org.osgi.util.feature.FeatureBundle actual) { - return proxy(org.osgi.test.assertj.feature.FeatureBundleAssert.class, org.osgi.util.feature.FeatureBundle.class, + public org.osgi.test.assertj.feature.FeatureBundleAssert assertThat(org.osgi.service.feature.FeatureBundle actual) { + return proxy(org.osgi.test.assertj.feature.FeatureBundleAssert.class, org.osgi.service.feature.FeatureBundle.class, actual); } @@ -71,9 +71,9 @@ public org.osgi.test.assertj.feature.FeatureBundleAssert assertThat(org.osgi.uti */ @org.assertj.core.util.CheckReturnValue public org.osgi.test.assertj.feature.FeatureConfigurationAssert assertThat( - org.osgi.util.feature.FeatureConfiguration actual) { + org.osgi.service.feature.FeatureConfiguration actual) { return proxy(org.osgi.test.assertj.feature.FeatureConfigurationAssert.class, - org.osgi.util.feature.FeatureConfiguration.class, actual); + org.osgi.service.feature.FeatureConfiguration.class, actual); } /** @@ -85,9 +85,9 @@ public org.osgi.test.assertj.feature.FeatureConfigurationAssert assertThat( */ @org.assertj.core.util.CheckReturnValue public org.osgi.test.assertj.feature.FeatureExtensionAssert assertThat( - org.osgi.util.feature.FeatureExtension actual) { + org.osgi.service.feature.FeatureExtension actual) { return proxy(org.osgi.test.assertj.feature.FeatureExtensionAssert.class, - org.osgi.util.feature.FeatureExtension.class, actual); + org.osgi.service.feature.FeatureExtension.class, actual); } /** @@ -98,8 +98,8 @@ public org.osgi.test.assertj.feature.FeatureExtensionAssert assertThat( * @return the created "soft" assertion object. */ @org.assertj.core.util.CheckReturnValue - public org.osgi.test.assertj.feature.IDAssert assertThat(org.osgi.util.feature.ID actual) { - return proxy(org.osgi.test.assertj.feature.IDAssert.class, org.osgi.util.feature.ID.class, actual); + public org.osgi.test.assertj.feature.IDAssert assertThat(org.osgi.service.feature.ID actual) { + return proxy(org.osgi.test.assertj.feature.IDAssert.class, org.osgi.service.feature.ID.class, actual); } } diff --git a/org.osgi.test.assertj.feature/src/test/java/org/osgi/test/assertj/feature/FeaturesConditionsAssertTest.java b/org.osgi.test.assertj.feature/src/test/java/org/osgi/test/assertj/feature/FeaturesConditionsAssertTest.java index 2bf556b9..76b59289 100644 --- a/org.osgi.test.assertj.feature/src/test/java/org/osgi/test/assertj/feature/FeaturesConditionsAssertTest.java +++ b/org.osgi.test.assertj.feature/src/test/java/org/osgi/test/assertj/feature/FeaturesConditionsAssertTest.java @@ -23,12 +23,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.util.Optional; + import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.osgi.util.feature.Feature; +import org.osgi.service.feature.Feature; @ExtendWith(SoftAssertionsExtension.class) public class FeaturesConditionsAssertTest implements ConditionAssert { @@ -97,20 +99,20 @@ void testNameNull() throws Exception { when(feature.getName()).thenReturn(null); // condition pass - passingHas(FeaturesConditions.FeatureConditions.nameNull(), feature); + passingHas(FeaturesConditions.FeatureConditions.nameEmpty(), feature); // assertion pass Assertions.assertThat(feature) - .hasNameNull(); + .hasNameEmpty(); - when(feature.getName()).thenReturn("featureName"); + when(feature.getName()).thenReturn(Optional.of("featureName")); // condition fail - failingHas(FeaturesConditions.FeatureConditions.nameNull(), feature, "name "); + failingHas(FeaturesConditions.FeatureConditions.nameEmpty(), feature, "name "); // assertion fail assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> Assertions.assertThat(feature) - .hasNameNull()) + .hasNameEmpty()) .withMessage(format("%nExpecting:%n " + featureName + "%nto have:%n name ")); } } diff --git a/org.osgi.test.assertj.feature/test.bndrun b/org.osgi.test.assertj.feature/test.bndrun index b17ff53e..74e6260e 100644 --- a/org.osgi.test.assertj.feature/test.bndrun +++ b/org.osgi.test.assertj.feature/test.bndrun @@ -43,15 +43,16 @@ order=sortbynameversion,\ begin=-1 -runbundles: \ - assertj-core;version='[3.19.0,3.19.1)',\ - junit-jupiter-api;version='[5.7.1,5.7.2)',\ - junit-jupiter-engine;version='[5.7.1,5.7.2)',\ - junit-platform-commons;version='[1.7.1,1.7.2)',\ - junit-platform-engine;version='[1.7.1,1.7.2)',\ - junit-platform-launcher;version='[1.7.1,1.7.2)',\ + assertj-core;version='[3.24.2,3.24.3)',\ + junit-jupiter-api;version='[5.9.2,5.9.3)',\ + junit-jupiter-engine;version='[5.9.2,5.9.3)',\ + junit-platform-commons;version='[1.9.2,1.9.3)',\ + junit-platform-engine;version='[1.9.2,1.9.3)',\ + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + net.bytebuddy.byte-buddy;version='[1.12.21,1.12.22)',\ + net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ + org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - org.osgi.test.assertj.promise;version='[0.11.0,0.11.1)',\ - org.osgi.test.assertj.promise-tests;version='[0.11.0,0.11.1)',\ - org.osgi.test.common;version='[0.11.0,0.11.1)',\ - org.osgi.util.function;version='[1.0.0,1.0.1)',\ - org.osgi.util.feature;version='[1.0.0,1.0.1)' + org.osgi.service.feature;version='[1.0.0,1.0.1)',\ + org.osgi.test.assertj.feature-tests;version='[1.3.0,1.3.1)'