Skip to content

Commit

Permalink
cleanup step 1
Browse files Browse the repository at this point in the history 
Signed-off-by: Stefan <stbischof@bipolis.org>
  • Loading branch information
@stbischof
stbischof committed Feb 7, 2024
1 parent 9e97764 commit 8347bde
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 130 deletions.
6 changes: 1 addition & 5 deletions org.osgi.test.assertj.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.feature</artifactId>
<artifactId>org.osgi.service.feature</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...tj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureArtifactAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
25 changes: 12 additions & 13 deletions ...st.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
}

/**
Expand All @@ -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());
}

/**
Expand All @@ -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());
}

/**
Expand All @@ -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.

}
2 changes: 1 addition & 1 deletion ...ertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureBundleAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureConfigurationAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
26 changes: 2 additions & 24 deletions ...j.feature/src/main/java/org/osgi/test/assertj/feature/AbstractFeatureExtensionAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...gi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/AbstractIDAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/Assertions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion ...st.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureArtifactAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...test.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureBundleAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...sertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureConfigurationAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...t.assertj.feature/src/main/java/org/osgi/test/assertj/feature/FeatureExtensionAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8347bde

Please sign in to comment.