forked from Activiti/Activiti
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add previous value to update event (Activiti#3468)
* Add previous value to update event closes Activiti#3467 * Add and refactor integration test, fix logic for extracting previous value before update, cleanups
- Loading branch information
1 parent
58ec3c2
commit 00c858b
Showing
21 changed files
with
438 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,4 +17,5 @@ | |
|
|
||
| public interface VariableUpdatedEvent extends VariableEvent { | ||
|
|
||
| <T> T getPreviousValue(); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...mpl/src/test/java/org/activiti/runtime/api/event/impl/ToVariableCreatedConverterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright 2010-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.activiti.runtime.api.event.impl; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import java.util.Optional; | ||
| import org.activiti.api.model.shared.event.VariableCreatedEvent; | ||
| import org.activiti.api.model.shared.event.VariableEvent.VariableEvents; | ||
| import org.activiti.api.model.shared.model.VariableInstance; | ||
| import org.activiti.engine.delegate.event.ActivitiEventType; | ||
| import org.activiti.engine.delegate.event.impl.ActivitiVariableEventImpl; | ||
| import org.activiti.engine.impl.variable.StringType; | ||
| import org.activiti.engine.impl.variable.VariableType; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ToVariableCreatedConverterTest { | ||
|
|
||
| private ToVariableCreatedConverter converter = new ToVariableCreatedConverter(); | ||
|
|
||
| @Test | ||
| void should_convertToVariableCreatedEvent() { | ||
| ActivitiVariableEventImpl internalEvent = new ActivitiVariableEventImpl(ActivitiEventType.VARIABLE_CREATED); | ||
| internalEvent.setVariableName("variableName"); | ||
| internalEvent.setProcessInstanceId("processInstanceId"); | ||
| internalEvent.setTaskId("taskId"); | ||
| VariableType variableType = new StringType(100); | ||
| internalEvent.setVariableType(variableType); | ||
| Object value = mock(Object.class); | ||
| internalEvent.setVariableValue(value); | ||
|
|
||
| Optional<VariableCreatedEvent> result = converter.from(internalEvent); | ||
|
|
||
| assertThat(result).isPresent(); | ||
| VariableCreatedEvent actualEvent = result.get(); | ||
| assertThat(actualEvent.getEventType()).isEqualTo(VariableEvents.VARIABLE_CREATED); | ||
| assertThat(actualEvent.getProcessInstanceId()).isEqualTo("processInstanceId"); | ||
| VariableInstance actualEntity = actualEvent.getEntity(); | ||
| assertThat(actualEntity.getName()).isEqualTo("variableName"); | ||
| assertThat(actualEntity.getProcessInstanceId()).isEqualTo("processInstanceId"); | ||
| assertThat(actualEntity.getTaskId()).isEqualTo("taskId"); | ||
| assertThat(actualEntity.getType()).isEqualTo("string"); | ||
| Object actualValue = actualEntity.getValue(); | ||
| assertThat(actualValue).isSameAs(value); | ||
| } | ||
|
|
||
| } |
60 changes: 60 additions & 0 deletions
60
...mpl/src/test/java/org/activiti/runtime/api/event/impl/ToVariableDeletedConverterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright 2010-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.activiti.runtime.api.event.impl; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import java.util.Optional; | ||
| import org.activiti.api.model.shared.event.VariableDeletedEvent; | ||
| import org.activiti.api.model.shared.event.VariableEvent.VariableEvents; | ||
| import org.activiti.api.model.shared.model.VariableInstance; | ||
| import org.activiti.engine.delegate.event.ActivitiEventType; | ||
| import org.activiti.engine.delegate.event.impl.ActivitiVariableEventImpl; | ||
| import org.activiti.engine.impl.variable.BooleanType; | ||
| import org.activiti.engine.impl.variable.VariableType; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ToVariableDeletedConverterTest { | ||
|
|
||
| private ToVariableDeletedConverter converter = new ToVariableDeletedConverter(); | ||
|
|
||
| @Test | ||
| void should_convertToVariableDeletedEvent() { | ||
| ActivitiVariableEventImpl internalEvent = new ActivitiVariableEventImpl(ActivitiEventType.VARIABLE_DELETED); | ||
| internalEvent.setVariableName("variableName"); | ||
| internalEvent.setProcessInstanceId("processInstanceId"); | ||
| internalEvent.setTaskId("taskId"); | ||
| VariableType variableType = new BooleanType(); | ||
| internalEvent.setVariableType(variableType); | ||
| Object value = mock(Object.class); | ||
| internalEvent.setVariableValue(value); | ||
|
|
||
| Optional<VariableDeletedEvent> result = converter.from(internalEvent); | ||
|
|
||
| assertThat(result).isPresent(); | ||
| VariableDeletedEvent actualEvent = result.get(); | ||
| assertThat(actualEvent.getEventType()).isEqualTo(VariableEvents.VARIABLE_DELETED); | ||
| VariableInstance actualEntity = actualEvent.getEntity(); | ||
| assertThat(actualEntity.getName()).isEqualTo("variableName"); | ||
| assertThat(actualEntity.getProcessInstanceId()).isEqualTo("processInstanceId"); | ||
| assertThat(actualEntity.getTaskId()).isEqualTo("taskId"); | ||
| assertThat(actualEntity.getType()).isEqualTo("boolean"); | ||
| Object actualValue = actualEntity.getValue(); | ||
| assertThat(actualValue).isSameAs(value); | ||
|
|
||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
...mpl/src/test/java/org/activiti/runtime/api/event/impl/ToVariableUpdatedConverterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright 2010-2020 Alfresco Software, Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.activiti.runtime.api.event.impl; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import java.util.Optional; | ||
| import org.activiti.api.model.shared.event.VariableEvent.VariableEvents; | ||
| import org.activiti.api.model.shared.event.VariableUpdatedEvent; | ||
| import org.activiti.api.model.shared.model.VariableInstance; | ||
| import org.activiti.engine.delegate.event.impl.ActivitiVariableUpdatedEventImpl; | ||
| import org.activiti.engine.impl.variable.IntegerType; | ||
| import org.activiti.engine.impl.variable.VariableType; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ToVariableUpdatedConverterTest { | ||
|
|
||
| private ToVariableUpdatedConverter converter = new ToVariableUpdatedConverter(); | ||
|
|
||
| @Test | ||
| void should_convertToVariableUpdatedEvent() { | ||
| ActivitiVariableUpdatedEventImpl internalEvent = new ActivitiVariableUpdatedEventImpl(); | ||
| internalEvent.setVariableName("variableName"); | ||
| internalEvent.setProcessInstanceId("processInstanceId"); | ||
| internalEvent.setTaskId("taskId"); | ||
| VariableType variableType = new IntegerType(); | ||
| internalEvent.setVariableType(variableType); | ||
| Object value = mock(Object.class); | ||
| internalEvent.setVariableValue(value); | ||
| Object previousValue = mock(Object.class); | ||
| internalEvent.setVariablePreviousValue(previousValue); | ||
|
|
||
| Optional<VariableUpdatedEvent> result = converter.from(internalEvent); | ||
|
|
||
| assertThat(result).isPresent(); | ||
| VariableUpdatedEvent actualEvent = result.get(); | ||
| assertThat(actualEvent.getEventType()).isEqualTo(VariableEvents.VARIABLE_UPDATED); | ||
| VariableInstance actualEntity = actualEvent.getEntity(); | ||
| assertThat(actualEntity.getName()).isEqualTo("variableName"); | ||
| assertThat(actualEntity.getProcessInstanceId()).isEqualTo("processInstanceId"); | ||
| assertThat(actualEntity.getTaskId()).isEqualTo("taskId"); | ||
| assertThat(actualEntity.getType()).isEqualTo("integer"); | ||
| Object actualValue = actualEntity.getValue(); | ||
| Object actualPreviousValue = actualEvent.getPreviousValue(); | ||
| assertThat(actualPreviousValue).isSameAs(previousValue); | ||
| assertThat(actualValue).isSameAs(value); | ||
| assertThat(previousValue).isNotSameAs(value); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.