merge: #10458 #10482

10458: Reorganize stream processor and engine tests r=Zelldon a=Zelldon ## Description Moved some tests around to make it easier to detect which need to be migrated for #10455 and to make it easier to create the new module and copy the tests, which are part of the StreamProcessor see #10130  ## Related issues  related to #10455 related to #10130 10482: deps(maven): bump snakeyaml from 1.32 to 1.33 r=Zelldon a=dependabot[bot] Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.32 to 1.33. <details> <summary>Commits</summary> <ul> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/eafb23ec31a0babe591c00e1b50e557a5e3f9a1d"><code>eafb23e</code></a> [maven-release-plugin] prepare for next development iteration</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/26624702fab8e0a1c301d7fad723c048528f75c3"><code>2662470</code></a> Improve JavaDoc</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/80827798f06aeb3d4f2632b94075ca7633418829"><code>8082779</code></a> Always emit numberish strings with quotes</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/42d6c79430431fe9033d3ba50f6a7dc6798ba7ad"><code>42d6c79</code></a> Reformat test</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/1962a437263348c3b90857cda4bbfa2bd97908f8"><code>1962a43</code></a> Refactor: rename variables in Emitter</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/bc594ad6e2b87c3fc26844e407276796fd866a40"><code>bc594ad</code></a> Issue 553: honor code point limit in loadAll</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/c3e98fd755a949f65cf11f2ff39e55a1c2afd1c2"><code>c3e98fd</code></a> Update changes.xml</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/a06f76859f2f07580b1d9fa6b66ea84aaad26cf8"><code>a06f768</code></a> Remove deprecated Tag manipulation</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/5a0027a3781b92f59bf92cdeb1b7590589993efd"><code>5a0027a</code></a> Remove unused WhitespaceToken</li> <li><a href="https://bitbucket.org/snakeyaml/snakeyaml/commits/3f05838828b8df36ab961bf836f373b8c20cb8ff"><code>3f05838</code></a> Improve JavaDoc</li> <li>Additional commits viewable in <a href="https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.33..snakeyaml-1.32">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.yaml:snakeyaml&package-manager=maven&previous-version=1.32&new-version=1.33)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: Christopher Zell <zelldon91@googlemail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
camunda · Sep 26, 2022 · b0452c5 · b0452c5
3 parents 7560d9b + 78266e9 + 746dfd8
commit b0452c5
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 14 deletions.
diff --git a/...reamprocessor/ContinuouslyReplayTest.java → ...ne/processing/ContinuouslyReplayTest.java b/...reamprocessor/ContinuouslyReplayTest.java → ...ne/processing/ContinuouslyReplayTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.engine.processing;
 
 import io.camunda.zeebe.engine.state.ZbColumnFamilies;
 import io.camunda.zeebe.engine.util.EngineRule;

diff --git a/...r/FailedPropertyBasedTestDataPrinter.java → ...d/FailedPropertyBasedTestDataPrinter.java b/...r/FailedPropertyBasedTestDataPrinter.java → ...d/FailedPropertyBasedTestDataPrinter.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.engine.processing.randomized;
 
 import io.camunda.zeebe.test.util.bpmn.random.TestDataGenerator.TestDataRecord;
 import java.util.function.Supplier;

diff --git a/...ocessExecutionRandomizedPropertyTest.java → ...ocessExecutionRandomizedPropertyTest.java b/...ocessExecutionRandomizedPropertyTest.java → ...ocessExecutionRandomizedPropertyTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.engine.processing.randomized;
 
 import io.camunda.zeebe.engine.util.EngineRule;
 import io.camunda.zeebe.engine.util.ProcessExecutor;

diff --git a/...or/ReplayStateRandomizedPropertyTest.java → ...ed/ReplayStateRandomizedPropertyTest.java b/...or/ReplayStateRandomizedPropertyTest.java → ...ed/ReplayStateRandomizedPropertyTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.engine.processing.randomized;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...treamprocessor/BlacklistInstanceTest.java → ...e/engine/state/BlacklistInstanceTest.java b/...treamprocessor/BlacklistInstanceTest.java → ...e/engine/state/BlacklistInstanceTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.engine.state;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

diff --git a/...sing/streamprocessor/ReplayStateTest.java → ...a/zeebe/engine/state/ReplayStateTest.java b/...sing/streamprocessor/ReplayStateTest.java → ...a/zeebe/engine/state/ReplayStateTest.java
@@ -5,12 +5,11 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.engine.state;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.camunda.zeebe.engine.processing.message.MessageObserver;
-import io.camunda.zeebe.engine.state.ZbColumnFamilies;
 import io.camunda.zeebe.engine.util.EngineRule;
 import io.camunda.zeebe.model.bpmn.Bpmn;
 import io.camunda.zeebe.model.bpmn.BpmnModelInstance;

diff --git a/...sing/streamprocessor/EventFilterTest.java → ...eebe/streamprocessor/EventFilterTest.java b/...sing/streamprocessor/EventFilterTest.java → ...eebe/streamprocessor/EventFilterTest.java
@@ -5,13 +5,12 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.streamprocessor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 import io.camunda.zeebe.logstreams.log.LoggedEvent;
-import io.camunda.zeebe.streamprocessor.EventFilter;
 import org.junit.Test;
 
 public final class EventFilterTest {

diff --git a/...sor/NewStreamProcessorReplayModeTest.java → ...sor/NewStreamProcessorReplayModeTest.java b/...sor/NewStreamProcessorReplayModeTest.java → ...sor/NewStreamProcessorReplayModeTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.streamprocessor;
 
 import static io.camunda.zeebe.engine.util.RecordToWrite.command;
 import static io.camunda.zeebe.engine.util.RecordToWrite.event;

diff --git a/...essingScheduleServiceIntegrationTest.java → ...essingScheduleServiceIntegrationTest.java b/...essingScheduleServiceIntegrationTest.java → ...essingScheduleServiceIntegrationTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.streamprocessor;
 
 import static io.camunda.zeebe.engine.util.RecordToWrite.command;
 import static io.camunda.zeebe.engine.util.RecordToWrite.event;

diff --git a/...cessor/ProcessingScheduleServiceTest.java → ...cessor/ProcessingScheduleServiceTest.java b/...cessor/ProcessingScheduleServiceTest.java → ...cessor/ProcessingScheduleServiceTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Zeebe Community License 1.1. You may not use this file
  * except in compliance with the Zeebe Community License 1.1.
  */
-package io.camunda.zeebe.engine.processing.streamprocessor;
+package io.camunda.zeebe.streamprocessor;
 
 import static io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent.ACTIVATE_ELEMENT;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -34,7 +34,6 @@
 import io.camunda.zeebe.scheduler.clock.ControlledActorClock;
 import io.camunda.zeebe.scheduler.future.ActorFuture;
 import io.camunda.zeebe.scheduler.future.CompletableActorFuture;
-import io.camunda.zeebe.streamprocessor.ProcessingScheduleServiceImpl;
 import io.camunda.zeebe.streamprocessor.StreamProcessor.Phase;
 import io.camunda.zeebe.test.util.junit.RegressionTest;
 import java.time.Duration;

diff --git a/engine/src/test/java/io/camunda/zeebe/streamprocessor/TypedEventSerializationTest.java b/engine/src/test/java/io/camunda/zeebe/streamprocessor/TypedEventSerializationTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under
+ * one or more contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright ownership.
+ * Licensed under the Zeebe Community License 1.1. You may not use this file
+ * except in compliance with the Zeebe Community License 1.1.
+ */
+package io.camunda.zeebe.streamprocessor;
+
+import static io.camunda.zeebe.util.buffer.BufferUtil.wrapString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import io.camunda.zeebe.engine.api.TypedRecord;
+import io.camunda.zeebe.logstreams.log.LoggedEvent;
+import io.camunda.zeebe.protocol.impl.record.CopiedRecord;
+import io.camunda.zeebe.protocol.impl.record.RecordMetadata;
+import io.camunda.zeebe.protocol.impl.record.value.deployment.DeploymentRecord;
+import io.camunda.zeebe.protocol.record.RecordType;
+import io.camunda.zeebe.protocol.record.RejectionType;
+import io.camunda.zeebe.protocol.record.ValueType;
+import io.camunda.zeebe.protocol.record.intent.DeploymentIntent;
+import io.camunda.zeebe.test.util.JsonUtil;
+import io.camunda.zeebe.util.collection.Tuple;
+import org.agrona.DirectBuffer;
+import org.junit.Test;
+
+public final class TypedEventSerializationTest {
+
+  private static Tuple<TypedRecord, CopiedRecord> createRecordTuple() {
+    final RecordMetadata recordMetadata = new RecordMetadata();
+
+    final DeploymentIntent intent = DeploymentIntent.CREATE;
+    final int protocolVersion = 1;
+    final ValueType valueType = ValueType.DEPLOYMENT;
+
+    final RecordType recordType = RecordType.COMMAND;
+    final String rejectionReason = "fails";
+    final RejectionType rejectionType = RejectionType.INVALID_ARGUMENT;
+    final int requestId = 23;
+    final int requestStreamId = 1;
+
+    recordMetadata
+        .intent(intent)
+        .protocolVersion(protocolVersion)
+        .valueType(valueType)
+        .recordType(recordType)
+        .rejectionReason(rejectionReason)
+        .rejectionType(rejectionType)
+        .requestId(requestId)
+        .requestStreamId(requestStreamId);
+
+    final String resourceName = "resource";
+    final DirectBuffer resource = wrapString("contents");
+    final String bpmnProcessId = "testProcess";
+    final long processDefinitionKey = 123;
+    final int processVersion = 12;
+    final DeploymentRecord record = new DeploymentRecord();
+    record.resources().add().setResourceName(wrapString(resourceName)).setResource(resource);
+    record
+        .processesMetadata()
+        .add()
+        .setBpmnProcessId(wrapString(bpmnProcessId))
+        .setKey(processDefinitionKey)
+        .setResourceName(wrapString(resourceName))
+        .setVersion(processVersion)
+        .setChecksum(wrapString("checksum"));
+
+    final long key = 1234;
+    final long position = 4321;
+    final long sourcePosition = 231;
+    final long timestamp = 2191L;
+
+    final LoggedEvent loggedEvent = mock(LoggedEvent.class);
+    when(loggedEvent.getPosition()).thenReturn(position);
+    when(loggedEvent.getKey()).thenReturn(key);
+    when(loggedEvent.getSourceEventPosition()).thenReturn(sourcePosition);
+    when(loggedEvent.getTimestamp()).thenReturn(timestamp);
+
+    final TypedRecordImpl typedEvent = new TypedRecordImpl(0);
+    typedEvent.wrap(loggedEvent, recordMetadata, record);
+
+    final CopiedRecord copiedRecord =
+        new CopiedRecord<>(record, recordMetadata, key, 0, position, sourcePosition, timestamp);
+
+    return new Tuple<>(typedEvent, copiedRecord);
+  }
+
+  @Test
+  public void shouldCreateSameJson() {
+    // given
+    final Tuple<TypedRecord, CopiedRecord> records = createRecordTuple();
+    final String expectedJson = records.getRight().toJson();
+
+    // when
+    final String actualJson = records.getLeft().toJson();
+
+    // then
+    JsonUtil.assertEquality(actualJson, expectedJson);
+  }
+}
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -77,7 +77,7 @@
     <version.sbe>1.26.0</version.sbe>
     <version.scala>2.13.9</version.scala>
     <version.slf4j>1.7.36</version.slf4j>
-    <version.snakeyaml>1.32</version.snakeyaml>
+    <version.snakeyaml>1.33</version.snakeyaml>
     <version.javax>1.3.2</version.javax>
     <version.wiremock>2.34.0</version.wiremock>
     <version.conscrypt>2.5.2</version.conscrypt>