You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2023/01/06 10:06:04 UTC

[streampipes] branch experimental/test-categories created (now 8e297df24)

This is an automated email from the ASF dual-hosted git repository.

bossenti pushed a change to branch experimental/test-categories
in repository https://gitbox.apache.org/repos/asf/streampipes.git


      at 8e297df24 draft categories

This branch includes the following new commits:

     new 8e297df24 draft categories

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[streampipes] 01/01: draft categories

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bossenti pushed a commit to branch experimental/test-categories
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 8e297df246baa379a3151ef027465a0124f6bbf7
Author: bossenti <bo...@posteo.de>
AuthorDate: Fri Jan 6 11:00:36 2023 +0100

    draft categories
---
 pom.xml                                            | 13 +++++++++++
 .../writer/TestConfiguredCsvOutputWriter.java      |  3 +++
 .../v4/query/writer/groups/UnitTest.java           | 24 ++-------------------
 .../integration/adapters/AdaptersTest.java         |  3 +++
 .../IntegrationTest.java}                          | 25 ++--------------------
 5 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bd5a8da3..f2e560397 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1551,6 +1551,18 @@
                 <javadoc.opts>-Xdoclint:none</javadoc.opts>
             </properties>
         </profile>
+		<profile>
+			<id>UnitTests</id>
+			<properties>
+				<testcase.groups>org.apache.streampipesdataexplorer.v4.query.writer.groups.UnitTest</testcase.groups>
+			</properties>
+		</profile>
+		<profile>
+			<id>IntegrationTests</id>
+			<properties>
+				<testcase.groups>package org.apache.streampipes.integration.groups.IntegrationTest</testcase.groups>
+			</properties>
+		</profile>
     </profiles>
 
     <!-- Build Settings -->
@@ -1930,6 +1942,7 @@
                         --add-opens java.base/java.base=ALL-UNNAMED
                         --add-opens java.base/java.util.stream=ALL-UNNAMED
                     </argLine>
+					<groups>${testcase.groups}</groups>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/TestConfiguredCsvOutputWriter.java b/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/TestConfiguredCsvOutputWriter.java
index c4679ffdf..505d9627a 100644
--- a/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/TestConfiguredCsvOutputWriter.java
+++ b/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/TestConfiguredCsvOutputWriter.java
@@ -22,7 +22,9 @@ import org.apache.streampipes.dataexplorer.v4.ProvidedQueryParams;
 import org.apache.streampipes.dataexplorer.v4.query.writer.ConfiguredCsvOutputWriter;
 
 import com.google.common.base.Charsets;
+import org.apache.streampipesdataexplorer.v4.query.writer.groups.UnitTest;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -34,6 +36,7 @@ public class TestConfiguredCsvOutputWriter extends TestConfiguredOutputWriter {
 
   private static final String Expected = "time,string,number\n1668578077051,test,1\n1668578127050,test2,2\n";
 
+  @Category(UnitTest.class)
   @Test
   public void testCsvOutputWriter() throws IOException {
     var writer = new ConfiguredCsvOutputWriter();
diff --git a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java b/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/groups/UnitTest.java
similarity index 51%
copy from streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
copy to streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/groups/UnitTest.java
index 9d1801294..7c94f6e8e 100644
--- a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
+++ b/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer/groups/UnitTest.java
@@ -15,28 +15,8 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.integration.adapters;
 
-import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+package org.apache.streampipesdataexplorer.v4.query.writer.groups;
 
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Map;
-
-public class AdaptersTest {
-  public void testAdapter(AdapterTesterBase adapterTester) throws Exception {
-    adapterTester.startAdapterService();
-    AdapterDescription adapterDescription = adapterTester.prepareAdapter();
-    adapterTester.startAdapter(adapterDescription);
-    List<Map<String, Object>> data = adapterTester.generateData();
-    adapterTester.validateData(data);
-  }
-
-  @Test
-  public void testPulsarAdapter() throws Exception {
-    try (PulsarAdapterTester pulsarAdapterTester = new PulsarAdapterTester()) {
-      testAdapter(pulsarAdapterTester);
-    }
-  }
+public interface UnitTest {
 }
diff --git a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
index 9d1801294..f7c624a43 100644
--- a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
+++ b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
@@ -17,9 +17,11 @@
  */
 package org.apache.streampipes.integration.adapters;
 
+import org.apache.streampipes.integration.groups.IntegrationTest;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import java.util.List;
 import java.util.Map;
@@ -33,6 +35,7 @@ public class AdaptersTest {
     adapterTester.validateData(data);
   }
 
+  @Category(IntegrationTest.class)
   @Test
   public void testPulsarAdapter() throws Exception {
     try (PulsarAdapterTester pulsarAdapterTester = new PulsarAdapterTester()) {
diff --git a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/groups/IntegrationTest.java
similarity index 51%
copy from streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
copy to streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/groups/IntegrationTest.java
index 9d1801294..ed0a3e2d1 100644
--- a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/adapters/AdaptersTest.java
+++ b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/groups/IntegrationTest.java
@@ -15,28 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.integration.adapters;
+package org.apache.streampipes.integration.groups;
 
-import org.apache.streampipes.model.connect.adapter.AdapterDescription;
-
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Map;
-
-public class AdaptersTest {
-  public void testAdapter(AdapterTesterBase adapterTester) throws Exception {
-    adapterTester.startAdapterService();
-    AdapterDescription adapterDescription = adapterTester.prepareAdapter();
-    adapterTester.startAdapter(adapterDescription);
-    List<Map<String, Object>> data = adapterTester.generateData();
-    adapterTester.validateData(data);
-  }
-
-  @Test
-  public void testPulsarAdapter() throws Exception {
-    try (PulsarAdapterTester pulsarAdapterTester = new PulsarAdapterTester()) {
-      testAdapter(pulsarAdapterTester);
-    }
-  }
+public interface IntegrationTest {
 }