test: try disabling @DisabledOnGithub

sovity · Jun 26, 2024 · 6c74d8a · 6c74d8a
1 parent 7018ff3
commit 6c74d8a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 33 deletions.
diff --git a/...ssenger/src/test/java/de/sovity/edc/extension/messenger/demo/SovityMessengerDemoTest.java b/...ssenger/src/test/java/de/sovity/edc/extension/messenger/demo/SovityMessengerDemoTest.java
@@ -24,7 +24,6 @@
 import de.sovity.edc.extension.messenger.demo.message.Signal;
 import de.sovity.edc.extension.messenger.demo.message.Sqrt;
 import de.sovity.edc.extension.messenger.demo.message.UnregisteredMessage;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import lombok.val;
 import org.eclipse.edc.junit.extensions.EdcExtension;
 import org.eclipse.edc.spi.iam.TokenDecorator;
@@ -78,8 +77,7 @@ void setup() {
     /**
      * Actual usage of the Sovity Messenger.
      */
-    @DisabledOnGithub
-    @Test
+       @Test
     void demo() throws ExecutionException, InterruptedException, TimeoutException {
         /*
          * Get a reference to the SovityMessenger. This is equivalent to

diff --git a/.../wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/catalog/CatalogApiTest.java b/.../wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/catalog/CatalogApiTest.java
@@ -13,7 +13,6 @@
 import de.sovity.edc.client.gen.model.UiDataSourceHttpData;
 import de.sovity.edc.client.gen.model.UiPolicyCreateRequest;
 import de.sovity.edc.ext.wrapper.TestUtils;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -44,8 +43,7 @@ void setUp(EdcExtension extension) {
      * There used to be issues with the Prop.DISTRIBUTION field being occupied by core EDC.
      * This test verifies that the field can be used by us.
      */
-    @DisabledOnGithub
-    @Test
+       @Test
     void testDistributionKey() {
         // arrange
         createAsset();

diff --git a/...er/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseApiWrapperTest.java b/...er/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseApiWrapperTest.java
@@ -18,7 +18,6 @@
 import de.sovity.edc.client.gen.model.UiDataSourceHttpData;
 import de.sovity.edc.client.gen.model.UiPolicyCreateRequest;
 import de.sovity.edc.ext.wrapper.TestUtils;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -48,8 +47,7 @@ void setup(EdcExtension extension) {
     }
 
     @Test
-    @DisabledOnGithub
-    void shouldFetchFilteredDataOffersWithEq() {
+       void shouldFetchFilteredDataOffersWithEq() {
         // arrange
         setupAssets();
         buildContractDefinition(policyId, assetId1, "cd-1");
@@ -67,8 +65,7 @@ void shouldFetchFilteredDataOffersWithEq() {
     }
 
     @Test
-    @DisabledOnGithub
-    void shouldFetchFilteredDataOffersWithIn() {
+       void shouldFetchFilteredDataOffersWithIn() {
         // arrange
         setupAssets();
         buildContractDefinition(policyId, assetId1, "cd-1");
@@ -86,8 +83,7 @@ void shouldFetchFilteredDataOffersWithIn() {
     }
 
     @Test
-    @DisabledOnGithub
-    void shouldFetchWithoutFilterButWithLimit() {
+       void shouldFetchWithoutFilterButWithLimit() {
         // arrange
         setupAssets();
         buildContractDefinition(policyId, assetId1, "cd-1");

diff --git a/tests/src/test/java/de/sovity/edc/e2e/DataSourceQueryParamsTest.java b/tests/src/test/java/de/sovity/edc/e2e/DataSourceQueryParamsTest.java
@@ -35,7 +35,6 @@
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
 import de.sovity.edc.extension.e2e.db.TestDatabaseFactory;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import org.awaitility.Awaitility;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -117,8 +116,7 @@ void testDirectQuerying() {
     /**
      * This test will fail as soon as the handling of query parameters is fixed in the EDC project
      */
-    @DisabledOnGithub
-    @Test
+       @Test
     void testQueryParamsDoubleEncoded() {
         // arrange
         createPolicy();

diff --git a/tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java b/tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java
@@ -21,7 +21,6 @@
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
 import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import org.assertj.core.api.SoftAssertions;
 import org.assertj.core.data.TemporalUnitLessThanOffset;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -93,8 +92,7 @@ void setup() {
         dataAddress = new MockDataAddressRemote(providerConnector.getConfig().getDefaultEndpoint());
     }
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void testMs8DataOffer_Properties() {
         // arrange
         var providerEndpoint = endpoint(providerConnector);
@@ -129,8 +127,7 @@ void testMs8DataOffer_Properties() {
         });
     }
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void testMs8ProvidingTransferProcess() {
         // arrange
 
@@ -157,8 +154,7 @@ private void assertIsEqualOffsetDateTime(OffsetDateTime actual, OffsetDateTime e
         assertThat(actual).isCloseTo(expected, new TemporalUnitLessThanOffset(1, ChronoUnit.MINUTES));
     }
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void testMs8ConsumingTransferProcess() {
         // arrange
 

diff --git a/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java b/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java
@@ -42,7 +42,6 @@
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
 import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import de.sovity.edc.utils.JsonUtils;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import jakarta.json.Json;
@@ -118,8 +117,7 @@ void setup() {
         dataAddress = new MockDataAddressRemote(providerConnector.getConfig().getDefaultEndpoint());
     }
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void provide_consume_assetMapping_policyMapping_agreements() {
         // arrange
         var data = "expected data 123";
@@ -381,8 +379,7 @@ void canOverrideTheWellKnowPropertiesUsingTheCustomProperties() {
 
     // TODO throw an error if the id is overridden
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void customTransferRequest() {
         // arrange
         var data = "expected data 123";
@@ -443,8 +440,7 @@ void customTransferRequest() {
         validateDataTransferred(dataAddress.getDataSinkSpyUrl(), data);
     }
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void editAssetMetadataOnLiveContract() {
         // arrange
         var data = "expected data 123";

diff --git a/tests/src/test/java/de/sovity/edc/e2e/UseCaseApiWrapperTest.java b/tests/src/test/java/de/sovity/edc/e2e/UseCaseApiWrapperTest.java
@@ -38,7 +38,6 @@
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
 import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
-import de.sovity.edc.extension.utils.junit.DisabledOnGithub;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import org.eclipse.edc.junit.extensions.EdcExtension;
 import org.junit.jupiter.api.BeforeEach;
@@ -103,8 +102,7 @@ void setup() {
         dataAddress = new MockDataAddressRemote(providerConnector.getConfig().getDefaultEndpoint());
     }
 
-    @DisabledOnGithub
-    @Test
+       @Test
     void catalog_filtering_by_like() {
         // arrange
         createPolicy();