You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2024/07/18 11:41:49 UTC
(streampipes) branch fix-test-size-measure-processor created (now 2092415822)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch fix-test-size-measure-processor
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at 2092415822 refactor(#2754): Fix test for SizeMeasureProcessor
This branch includes the following new commits:
new 2092415822 refactor(#2754): Fix test for SizeMeasureProcessor
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: refactor(#2754): Fix test for SizeMeasureProcessor
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch fix-test-size-measure-processor
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 2092415822e1270513b85e7368f83bec78b0b6ea
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Thu Jul 18 13:41:40 2024 +0200
refactor(#2754): Fix test for SizeMeasureProcessor
---
.../streampipes-processors-enricher-jvm/pom.xml | 6 +
.../sizemeasure/SizeMeasureProcessor.java | 52 ++++---
.../sizemeasure/TestSizeMeasureProcessor.java | 164 +++++++++------------
3 files changed, 108 insertions(+), 114 deletions(-)
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/pom.xml b/streampipes-extensions/streampipes-processors-enricher-jvm/pom.xml
index 696ce89520..bc17948896 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/pom.xml
@@ -63,6 +63,12 @@
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-test-utils-executors</artifactId>
+ <version>0.97.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java
index deea211707..c9d2cdc15f 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java
@@ -48,6 +48,10 @@ public class SizeMeasureProcessor extends StreamPipesDataProcessor {
static final String KILOBYTE_SIZE = "KILOBYTE";
static final String MEGABYTE_SIZE = "MEGABYTE";
+ static final String BYTES_OPTION = "Bytes";
+ static final String KILO_BYTES_OPTION = "Kilobytes (1024 Bytes)";
+ static final String MEGA_BYTES_OPTION = "Megabytes (1024 Kilobytes)";
+
static final String EVENT_SIZE = "eventSize";
private String sizeUnit;
@@ -55,29 +59,37 @@ public class SizeMeasureProcessor extends StreamPipesDataProcessor {
@Override
public DataProcessorDescription declareModel() {
return ProcessingElementBuilder.create("org.apache.streampipes.processors.enricher.jvm.sizemeasure")
- .category(DataProcessorType.STRUCTURE_ANALYTICS)
- .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withLocales(Locales.EN)
- .requiredStream(StreamRequirementsBuilder
- .create()
- .requiredProperty(EpRequirements.anyProperty())
- .build())
- .requiredSingleValueSelection(Labels.withId(SIZE_UNIT),
- Options.from(new Tuple2<>("Bytes", BYTE_SIZE),
- new Tuple2<>("Kilobytes (1024 Bytes)", KILOBYTE_SIZE),
- new Tuple2<>("Megabytes (1024 Kilobytes)", MEGABYTE_SIZE)))
- .outputStrategy(OutputStrategies.append(EpProperties.doubleEp(
- Labels.withId(EVENT_SIZE),
- EVENT_SIZE,
- "http://schema.org/contentSize")))
- .build();
+ .category(DataProcessorType.STRUCTURE_ANALYTICS)
+ .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
+ .withLocales(Locales.EN)
+ .requiredStream(StreamRequirementsBuilder
+ .create()
+ .requiredProperty(EpRequirements.anyProperty())
+ .build())
+ .requiredSingleValueSelection(
+ Labels.withId(SIZE_UNIT),
+ Options.from(
+ new Tuple2<>(BYTES_OPTION, BYTE_SIZE),
+ new Tuple2<>(KILO_BYTES_OPTION, KILOBYTE_SIZE),
+ new Tuple2<>(MEGA_BYTES_OPTION, MEGABYTE_SIZE)
+ )
+ )
+ .outputStrategy(OutputStrategies.append(EpProperties.doubleEp(
+ Labels.withId(EVENT_SIZE),
+ EVENT_SIZE,
+ "http://schema.org/contentSize"
+ )))
+ .build();
}
@Override
- public void onInvocation(ProcessorParams parameters,
- SpOutputCollector spOutputCollector,
- EventProcessorRuntimeContext runtimeContext) throws SpRuntimeException {
- this.sizeUnit = parameters.extractor().selectedSingleValueInternalName(SIZE_UNIT, String.class);
+ public void onInvocation(
+ ProcessorParams parameters,
+ SpOutputCollector spOutputCollector,
+ EventProcessorRuntimeContext runtimeContext
+ ) throws SpRuntimeException {
+ this.sizeUnit = parameters.extractor()
+ .selectedSingleValueInternalName(SIZE_UNIT, String.class);
}
@Override
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/test/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/TestSizeMeasureProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/test/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/TestSizeMeasureProcessor.java
index eb168a7e56..7f2c182d21 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/test/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/TestSizeMeasureProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/test/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/TestSizeMeasureProcessor.java
@@ -19,99 +19,75 @@
package org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure;
-//@RunWith(Parameterized.class)
+import org.apache.streampipes.test.executors.PrefixStrategy;
+import org.apache.streampipes.test.executors.ProcessingElementTestExecutor;
+import org.apache.streampipes.test.executors.TestConfiguration;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.SizeMeasureProcessor.BYTES_OPTION;
+import static org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.SizeMeasureProcessor.EVENT_SIZE;
+import static org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.SizeMeasureProcessor.KILO_BYTES_OPTION;
+import static org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.SizeMeasureProcessor.SIZE_UNIT;
+
public class TestSizeMeasureProcessor {
-//
-// private static final Logger LOG = LoggerFactory.getLogger(TestSizeMeasureProcessor.class);
-//
-// @org.junit.runners.Parameterized.Parameters
-// public static Iterable<Object[]> data() {
-//
-// /*
-// 249 bytes is the base size of an object when first tested.
-// Allowing up to 250 bytes comparison error in case of inconsistent base sizes across platforms
-// */
-// return Arrays.asList(new Object[][]{
-// { BYTE_SIZE, 10240 - 249, 10240.0, 250.0},
-// { KILOBYTE_SIZE, 10240 - 249, 10.0, 0.025},
-// { MEGABYTE_SIZE, (1024 * 1024) - 249, 1.0, 0.0025}
-// });
-// }
-//
-// @Parameterized.Parameter
-// public String sizeUnit;
-//
-// @Parameterized.Parameter(1)
-// public int numOfBytes;
-//
-// @Parameterized.Parameter(2)
-// public double expectedSize;
-//
-// @Parameterized.Parameter(3)
-// public double allowableError;
-//
-// @Test
-// public void testSizeMeasureProcessor() {
-// SizeMeasureProcessor processor = new SizeMeasureProcessor();
-// DataProcessorDescription originalGraph = processor.declareModel();
-// originalGraph.setSupportedGrounding(EventGroundingGenerator.makeDummyGrounding());
-//
-// DataProcessorInvocation graph =
-// InvocationGraphGenerator.makeEmptyInvocation(originalGraph);
-//
-//
-// ProcessorParams params = new ProcessorParams(graph);
-// params.extractor().getStaticPropertyByName(SIZE_UNIT, OneOfStaticProperty.class).getOptions()
-// .stream().filter(ot -> ot.getInternalName().equals(sizeUnit)).findFirst()
-// .get().setSelected(true);
-//
-//
-// SpOutputCollector eventCollector = new StoreEventCollector();
-//
-// processor.onInvocation(params, eventCollector, null);
-//
-// LOG.info("Sending event with numOfBytes "
-// + numOfBytes + ", sizeUnit: " + sizeUnit);
-// double size = sendEvents(processor, eventCollector);
-//
-// LOG.info("Expected size is {}", expectedSize);
-// LOG.info("Actual size is {}", size);
-// LOG.info("Allowable error is {}", allowableError);
-// assertEquals(expectedSize, size, allowableError);
-// }
-//
-// private Double sendEvents(SizeMeasureProcessor processor, SpOutputCollector spOut) {
-// double size = 0.0;
-// Event event = makeEvent(numOfBytes);
-//
-// processor.onEvent(event, spOut);
-// try {
-// Thread.sleep(100);
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
-// try {
-// size = event.getFieldBySelector(SizeMeasureProcessor.EVENT_SIZE)
-// .getAsPrimitive()
-// .getAsDouble();
-// } catch (IllegalArgumentException e) {
-// e.printStackTrace();
-// }
-// return size;
-// }
-// private Event makeEvent(int numOfBytes) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("Test", new ObjectWithSize(numOfBytes));
-// return EventFactory.fromMap(map,
-// new SourceInfo("test" + "-topic", "s0"),
-// new SchemaInfo(null, new ArrayList<>()));
-// }
-//
-// public static class ObjectWithSize implements Serializable {
-// private final byte[] data;
-//
-// public ObjectWithSize(int numOfBytes) {
-// this.data = new byte[numOfBytes];
-// }
-// }
+ private static final String KEY = "key";
+ private static final String VALUE = "value";
+
+ private static Map<String, Object> inputEvent = Map.of(KEY, VALUE);
+
+ private SizeMeasureProcessor processor;
+
+ @BeforeEach
+ public void setup() {
+ processor = new SizeMeasureProcessor();
+ }
+
+
+ static Stream<Arguments> arguments() {
+ return Stream.of(
+ Arguments.of(
+ BYTES_OPTION,
+ inputEvent,
+ 96.0
+ ),
+ Arguments.of(
+ KILO_BYTES_OPTION,
+ inputEvent,
+ 0.09375
+ )
+ );
+ }
+
+ @ParameterizedTest
+ @MethodSource("arguments")
+ public void testStringToState(
+ String sizeUnit,
+ Map<String, Object> intpuEvent,
+ double expectedventSize
+ ) {
+
+ var inputEvents = List.of(intpuEvent);
+ List<Map<String, Object>> outputEvents = List.of(Map.of(
+ KEY, VALUE,
+ EVENT_SIZE, expectedventSize
+ ));
+
+ var configuration = TestConfiguration
+ .builder()
+ .config(SIZE_UNIT, sizeUnit)
+ .prefixStrategy(PrefixStrategy.SAME_PREFIX)
+ .build();
+
+ var testExecutor = new ProcessingElementTestExecutor(processor, configuration);
+
+ testExecutor.run(inputEvents, outputEvents);
+ }
}
\ No newline at end of file