Merge pull request #1044 from stbischof/ocx

fix: assertj feature

Author: stbischof

org.osgi.test.assertj.feature/pom.xml

@@ -66,4 +66,24 @@
 			<artifactId>junit-jupiter-params</artifactId>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>test-jar</id>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+						<configuration>
+							<artifactFragment>true</artifactFragment>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureAssert.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.assertj.core.api.AbstractObjectAssert;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.assertj.core.api.InstanceOfAssertFactory;
 import org.assertj.core.api.ListAssert;
@@ -35,7 +36,7 @@
  * CustomAssertionGenerator.
  */
 public abstract class AbstractFeatureAssert<S extends AbstractFeatureAssert<S, A>, A extends Feature>
-	extends AbstractFeatureArtifactAssert<S, A> {
+	extends AbstractObjectAssert<S, A> {
 
 	/**
 	 * Creates a new <code>{@link AbstractFeatureAssert}</code> to make
@@ -47,6 +48,12 @@ protected AbstractFeatureAssert(A actual, Class<S> selfType) {
 		super(actual, selfType);
 	}
 
+	public IDAssert hasIDThat() {
+		isNotNull();
+		return IDAssert.assertThat(actual.getID())
+			.as(actual + ".id");
+	}
+
 	@SuppressWarnings("rawtypes")
 	static InstanceOfAssertFactory<List, ListAssert<FeatureBundle>>					BUNDLE_LIST		= InstanceOfAssertFactories
 		.list(FeatureBundle.class);

org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureBundleAssert.java

@@ -20,6 +20,7 @@
 
 import java.util.Map;
 
+import org.assertj.core.api.AbstractObjectAssert;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.assertj.core.api.InstanceOfAssertFactory;
 import org.assertj.core.api.MapAssert;
@@ -30,7 +31,7 @@
  * by CustomAssertionGenerator.
  */
 public abstract class AbstractFeatureBundleAssert<S extends AbstractFeatureBundleAssert<S, A>, A extends FeatureBundle>
-	extends AbstractFeatureArtifactAssert<S, A> {
+	extends AbstractObjectAssert<S, A> {
 
 	/**
 	 * Creates a new <code>{@link AbstractFeatureBundleAssert}</code> to make
@@ -42,6 +43,12 @@ protected AbstractFeatureBundleAssert(A actual, Class<S> selfType) {
 		super(actual, selfType);
 	}
 
+	public IDAssert hasIDThat() {
+		isNotNull();
+		return IDAssert.assertThat(actual.getID())
+			.as(actual + ".id");
+	}
+
 	@SuppressWarnings("rawtypes")
 	static InstanceOfAssertFactory<Map, MapAssert<String, Object>> METADATA_MAP = InstanceOfAssertFactories
 		.map(String.class, Object.class);

org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeaturesConditions.java

@@ -60,7 +60,7 @@ static Condition<Feature> complete() {
 		}
 
 		static Condition<Feature> descriptionEmpty() {
-			return new Condition<>(f -> !f.getDescription()
+			return new Condition<>(f -> f.getDescription() == null || !f.getDescription()
 				.isPresent(), "description <isEmpty>");
 		}
 
@@ -101,7 +101,7 @@ static Condition<Feature> licenseMatches(String pattern) {
 		}
 
 		static Condition<Feature> licenseEmpty() {
-			return new Condition<>(f -> !f.getLicense()
+			return new Condition<>(f -> f.getLicense() == null || !f.getLicense()
 				.isPresent(), "license <isEmpty>");
 		}
 
@@ -124,7 +124,7 @@ static Condition<Feature> nameMatches(String pattern) {
 		}
 
 		static Condition<Feature> nameEmpty() {
-			return new Condition<>(f -> !f.getName()
+			return new Condition<>(f -> f.getName() == null || !f.getName()
 				.isPresent(), "name <isEmpty>");
 		}
 
@@ -151,7 +151,7 @@ static Condition<Feature> vendorMatches(String pattern) {
 		}
 
 		static Condition<Feature> vendorEmpty() {
-			return new Condition<>(f -> !f.getVendor()
+			return new Condition<>(f -> f.getVendor() == null || !f.getVendor()
 				.isPresent(), "vendor <isEmpty>");
 		}
 
@@ -291,7 +291,7 @@ static Condition<FeatureExtension> nameNull() {
 		}
 
 		static Condition<FeatureExtension> type(final FeatureExtension.Type type) {
-			return kind(null);
+			return new Condition<>(f -> Objects.equals(f.getType(), type), "type <%s>", type);
 		}
 
 		static Condition<FeatureExtension> typeArtifacts() {

org.osgi.test.assertj.feature/src/test/java/org/osgi/test/assertj/feature/FeaturesConditionsAssertTest.java

@@ -66,7 +66,7 @@ void testComplete() throws Exception {
 			// assertion fail
 			assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> Assertions.assertThat(feature)
 				.isComplete())
-				.withMessage(format("%nExpecting:%n  " + featureName + "%nto be complete"));
+				.withMessage(format("%nExpecting actual:%n  " + featureName + "%nto be complete"));
 		}
 
 		@Test
@@ -89,7 +89,7 @@ void testNotComplete() throws Exception {
 			// assertion fail
 			assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> Assertions.assertThat(feature)
 				.isNotComplete())
-				.withMessage(format("%nExpecting:%n  " + featureName + "%nnot to be  complete"));
+				.withMessage(format("%nExpecting actual:%n  " + featureName + "%nnot to be complete"));
 
 		}
 
@@ -108,12 +108,12 @@ void testNameNull() throws Exception {
 			when(feature.getName()).thenReturn(Optional.of("featureName"));
 
 			// condition fail
-			failingHas(FeaturesConditions.FeatureConditions.nameEmpty(), feature, "name <null>");
+			failingHas(FeaturesConditions.FeatureConditions.nameEmpty(), feature, "name <isEmpty>");
 
 			// assertion fail
 			assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> Assertions.assertThat(feature)
 				.hasNameEmpty())
-				.withMessage(format("%nExpecting:%n  " + featureName + "%nto have:%n  name <null>"));
+				.withMessage(format("%nExpecting actual:%n  " + featureName + "%nto have name <isEmpty>"));
 		}
 	}
 	// TODO: All additional tests after specification is more stable.

org.osgi.test.junit5.cm/src/test/java/org/osgi/test/junit5/cm/test/ConfigAnnotationTest.java

@@ -64,7 +64,8 @@ public void oldWay(@InjectService
 
 		Configuration c = ca.createFactoryConfiguration(FACTORY_CONFIGURATION_PID);
 		c.update(Dictionaries.dictionaryOf("foo", "bar"));
-
+		// test
+		c.delete();
 	}
 
 	// START TESTS