From 0a62603cd9ec580353d04e92ab9ba371757cfbf2 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Mon, 26 Nov 2018 16:30:49 +0000 Subject: [PATCH 01/11] Remove tests that should be in Framework bundle. Remove Core from requirements as its required by the framework --- Tests/App/Entity/EntityX.php | 42 --- Tests/App/Producers/ErrorTriggerProducer.php | 88 ----- Tests/App/Producers/HelperProducer.php | 93 ----- Tests/App/Producers/SpyProducer.php | 94 ------ .../Resources/Fixtures/Csv/happy-comma.csv | 8 - Tests/App/Resources/Fixtures/Csv/happy.csv | 8 - Tests/App/Resources/Fixtures/default/ok.json | 1 - Tests/App/Resources/FrozenFlows/.gitkeep | 0 Tests/App/Resources/TestFlows/.project | 11 - .../AsyncErrorRecovery/recoverable.xml | 19 -- .../TestFlows/AsyncErrorRecovery/test.yml | 17 - .../recoverableWithDelay.xml | 19 -- .../AsyncErrorRecoveryWithDelay/test.yml | 34 -- .../recoverableWithDelayProgressive.xml | 19 -- .../test.yml | 51 --- Tests/App/Resources/TestFlows/Csv/csv.xml | 16 - Tests/App/Resources/TestFlows/Csv/csv2.xml | 16 - .../Resources/TestFlows/Csv/csvGeneric.xml | 17 - Tests/App/Resources/TestFlows/Csv/test.yml | 45 --- .../Resources/TestFlows/Logging/exception.xml | 15 - .../App/Resources/TestFlows/Logging/test.yml | 8 - .../exception.xml | 15 - .../LoggingWithCustomErrorMessage/test.yml | 8 - .../TestFlows/Multicast/multicast.xml | 24 -- .../Resources/TestFlows/Multicast/test.yml | 4 - .../Resources/TestFlows/Pipeline/pipeline.xml | 18 - .../App/Resources/TestFlows/Pipeline/test.yml | 3 - .../App/Resources/TestFlows/Queue/enqueue.xml | 13 - .../TestFlows/Queue/queueMulticast.xml | 16 - .../Resources/TestFlows/Queue/queueSimple.xml | 16 - Tests/App/Resources/TestFlows/Queue/test.yml | 10 - .../App/Resources/TestFlows/Router/router.xml | 23 -- Tests/App/Resources/TestFlows/Router/test.yml | 3 - .../App/Resources/TestFlows/Simple/simple.xml | 28 -- Tests/App/Resources/TestFlows/Simple/test.yml | 5 - .../Subroutines/multicastSubroutine.xml | 16 - .../Subroutines/routerSubroutine.xml | 16 - .../Subroutines/simpleSubroutine.xml | 15 - .../Resources/TestFlows/Subroutines/test.yml | 10 - .../Resources/TestFlows/Throttler/test.yml | 27 -- .../Throttler/test_async_delayed.yml | 23 -- .../TestFlows/Throttler/throttler.xml | 25 -- .../Throttler/throttler_async_delayed.xml | 27 -- .../Resources/TestFlows/Transformer/test.yml | 2 - .../TestFlows/Transformer/transformer.xml | 17 - .../TestFlows/TryCatch/test_catched.yml | 3 - .../TestFlows/TryCatch/test_not_catched.yml | 4 - .../TestFlows/TryCatch/test_with_recovery.yml | 17 - .../Resources/TestFlows/TryCatch/tryCatch.xml | 100 ------ Tests/App/config/config.yml | 6 +- Tests/App/config/csv.yml | 64 ---- Tests/App/config/routing_endpoints.yml | 90 +---- Tests/App/config/routing_itineraries.yml | 3 - .../FlowsBuilderCompilerPassTest.php | 4 +- Tests/Fixtures/Exception/TestException.php | 14 - .../CamelTestFlowInvalidURIError.xml | 6 - .../XMLBadFormed/CamelTestFlowXMLError.xml | 6 - .../CamelTestFlowError.xml | 6 - .../CamelTestFlowSuccess.xml | 6 - .../Frozen/.gitkeep | 0 Tests/Functional/FlowsTest.php | 319 ------------------ composer.json | 1 - 62 files changed, 6 insertions(+), 1628 deletions(-) delete mode 100644 Tests/App/Entity/EntityX.php delete mode 100644 Tests/App/Producers/ErrorTriggerProducer.php delete mode 100644 Tests/App/Producers/HelperProducer.php delete mode 100644 Tests/App/Producers/SpyProducer.php delete mode 100755 Tests/App/Resources/Fixtures/Csv/happy-comma.csv delete mode 100755 Tests/App/Resources/Fixtures/Csv/happy.csv delete mode 100644 Tests/App/Resources/Fixtures/default/ok.json delete mode 100644 Tests/App/Resources/FrozenFlows/.gitkeep delete mode 100644 Tests/App/Resources/TestFlows/.project delete mode 100644 Tests/App/Resources/TestFlows/AsyncErrorRecovery/recoverable.xml delete mode 100644 Tests/App/Resources/TestFlows/AsyncErrorRecovery/test.yml delete mode 100644 Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/recoverableWithDelay.xml delete mode 100644 Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/test.yml delete mode 100644 Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/recoverableWithDelayProgressive.xml delete mode 100644 Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Csv/csv.xml delete mode 100644 Tests/App/Resources/TestFlows/Csv/csv2.xml delete mode 100644 Tests/App/Resources/TestFlows/Csv/csvGeneric.xml delete mode 100644 Tests/App/Resources/TestFlows/Csv/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Logging/exception.xml delete mode 100644 Tests/App/Resources/TestFlows/Logging/test.yml delete mode 100644 Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/exception.xml delete mode 100644 Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Multicast/multicast.xml delete mode 100644 Tests/App/Resources/TestFlows/Multicast/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Pipeline/pipeline.xml delete mode 100644 Tests/App/Resources/TestFlows/Pipeline/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Queue/enqueue.xml delete mode 100644 Tests/App/Resources/TestFlows/Queue/queueMulticast.xml delete mode 100644 Tests/App/Resources/TestFlows/Queue/queueSimple.xml delete mode 100644 Tests/App/Resources/TestFlows/Queue/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Router/router.xml delete mode 100644 Tests/App/Resources/TestFlows/Router/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Simple/simple.xml delete mode 100644 Tests/App/Resources/TestFlows/Simple/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Subroutines/multicastSubroutine.xml delete mode 100644 Tests/App/Resources/TestFlows/Subroutines/routerSubroutine.xml delete mode 100644 Tests/App/Resources/TestFlows/Subroutines/simpleSubroutine.xml delete mode 100644 Tests/App/Resources/TestFlows/Subroutines/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Throttler/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Throttler/test_async_delayed.yml delete mode 100644 Tests/App/Resources/TestFlows/Throttler/throttler.xml delete mode 100644 Tests/App/Resources/TestFlows/Throttler/throttler_async_delayed.xml delete mode 100644 Tests/App/Resources/TestFlows/Transformer/test.yml delete mode 100644 Tests/App/Resources/TestFlows/Transformer/transformer.xml delete mode 100644 Tests/App/Resources/TestFlows/TryCatch/test_catched.yml delete mode 100644 Tests/App/Resources/TestFlows/TryCatch/test_not_catched.yml delete mode 100644 Tests/App/Resources/TestFlows/TryCatch/test_with_recovery.yml delete mode 100644 Tests/App/Resources/TestFlows/TryCatch/tryCatch.xml delete mode 100644 Tests/App/config/csv.yml delete mode 100644 Tests/App/config/routing_itineraries.yml delete mode 100644 Tests/Fixtures/Exception/TestException.php delete mode 100644 Tests/Fixtures/FlowsBuilderCompilerPassFailures/InvalidURI/CamelTestFlowInvalidURIError.xml delete mode 100644 Tests/Fixtures/FlowsBuilderCompilerPassFailures/XMLBadFormed/CamelTestFlowXMLError.xml delete mode 100644 Tests/Fixtures/FlowsBuilderCompilerPassFailures/findAbstractEndpointException/CamelTestFlowError.xml delete mode 100644 Tests/Fixtures/FlowsBuilderCompilerPassSuccess/CamelTestFlowSuccess.xml delete mode 100644 Tests/Fixtures/FlowsBuilderCompilerPassSuccess/Frozen/.gitkeep delete mode 100644 Tests/Functional/FlowsTest.php diff --git a/Tests/App/Entity/EntityX.php b/Tests/App/Entity/EntityX.php deleted file mode 100644 index 4d3a4a75..00000000 --- a/Tests/App/Entity/EntityX.php +++ /dev/null @@ -1,42 +0,0 @@ -x = $x; - } - - /** - * @JMS\Type("integer") - * @JMS\Expose - * @JMS\Groups({"logs"}) - * - * @var int - */ - protected $x = 0; - - /** - * @return int - */ - public function getX() - { - return $this->x; - } - - /** - * @param int $x - */ - public function setX($x) - { - $this->x = $x; - } -} diff --git a/Tests/App/Producers/ErrorTriggerProducer.php b/Tests/App/Producers/ErrorTriggerProducer.php deleted file mode 100644 index 2b0d8346..00000000 --- a/Tests/App/Producers/ErrorTriggerProducer.php +++ /dev/null @@ -1,88 +0,0 @@ -getOptions(); - - if (self::$count < @$options[self::OPTION_NUMBER_ERRORS] || @$options[self::OPTION_FORCE]) { - $ex->getIn()->setBody(new EntityX(666)); - ++self::$count; - - if (@$options[self::OPTION_RECOVERABLE]) { - throw new SampleRecoverableException('test recoverable exception'); - } - - throw new \RuntimeException('test exception'); - } - } - - /** - * Key-Value array with the option name as key and the details as value. - * - * [OptionName => [description, array of valid values],..] - * - * @return array - */ - public function getOptionsDescriptions() - { - $options = [ - self::OPTION_RECOVERABLE => ['Whether the errors triggered are recoverable or not', []], - self::OPTION_FORCE => ['Force to throw the exception every time, not only "n" number of times', []], - self::OPTION_NUMBER_ERRORS => ['Define the number of times the exception will be throw', []] - ]; - - return $options; - } - - /** - * With this method this class can configure an OptionsResolver that will be used to validate the options. - * - * @param OptionsResolver $resolver - * - * @return mixed - */ - public function configureOptionsResolver(OptionsResolver $resolver) - { - $resolver->setRequired(self::OPTION_RECOVERABLE); - $resolver->setDefault(Protocol::OPTION_EXCHANGE_PATTERN, Protocol::EXCHANGE_PATTERN_IN_ONLY); - $resolver->setDefault(self::OPTION_RECOVERABLE, false); - $resolver->setDefault(self::OPTION_FORCE, false); - $resolver->setAllowedValues(Protocol::OPTION_EXCHANGE_PATTERN, [Protocol::EXCHANGE_PATTERN_IN_ONLY]); - $resolver->setDefault(self::OPTION_NUMBER_ERRORS, 1); - } -} diff --git a/Tests/App/Producers/HelperProducer.php b/Tests/App/Producers/HelperProducer.php deleted file mode 100644 index 340e7070..00000000 --- a/Tests/App/Producers/HelperProducer.php +++ /dev/null @@ -1,93 +0,0 @@ -getOptions(); - - /** @var EntityX $x */ - $x = $ex->getIn()->getBody(); - if (empty($x) || !($x instanceof EntityX)) { - throw new \InvalidArgumentException('Expected entity of type EntityX'); - } - - $operand = (int) @$options[self::OPTION_OPERAND]; - - switch (@$options[self::OPTION_OPERATION]) { - case self::OPERATION_MULTIPLY: - $message = $this->messageFactory->createMessage(new EntityX($x->getX() * $operand)); - $ex->setOut($message); - break; - case self::OPERATION_ADD: - $message = $this->messageFactory->createMessage(new EntityX($x->getX() + $operand)); - $ex->setOut($message); - break; - } - } - - /** - * Key-Value array with the option name as key and the details as value. - * - * [OptionName => [description, array of valid values],..] - * - * @return array - */ - public function getOptionsDescriptions() - { - $options = [ - self::OPTION_OPERATION => ['Operation to apply to the EntityX in the body of the incoming messages', [ - self::OPERATION_ADD => 'Adds operand to the entityX value', - self::OPERATION_MULTIPLY => 'Multiplies operand by the entityX value', - ]], - self::OPTION_OPERAND => ['Operand to use (number)', []], - ]; - - return $options; - } - - /** - * With this method this class can configure an OptionsResolver that will be used to validate the options. - * - * @param OptionsResolver $resolver - * - * @return mixed - */ - public function configureOptionsResolver(OptionsResolver $resolver) - { - $resolver->setRequired(self::OPTION_OPERATION); - $resolver->setAllowedValues(self::OPTION_OPERATION, [self::OPERATION_ADD, self::OPERATION_MULTIPLY]); - - $resolver->setRequired(self::OPTION_OPERAND); - $resolver->setAllowedTypes(self::OPTION_OPERAND, ['numeric']); - - $resolver->setDefault(Protocol::OPTION_EXCHANGE_PATTERN, Protocol::EXCHANGE_PATTERN_IN_OUT); - } -} diff --git a/Tests/App/Producers/SpyProducer.php b/Tests/App/Producers/SpyProducer.php deleted file mode 100644 index 712d1c95..00000000 --- a/Tests/App/Producers/SpyProducer.php +++ /dev/null @@ -1,94 +0,0 @@ -getOptions(); - /** @var EntityX $x */ - $x = $ex->getIn()->getBody(); - - $path = $options[self::OPTION_PATH]; - - if (!array_key_exists($path, $this->array)) { - $this->array[$path] = []; - } - - if ($x instanceof SerializableArray) { - $this->array[$path] = $x->toArray(); - } else { - $this->array[$path][] = $x->getX(); - } - - } - - /** - * @return array - */ - public function getData($path) - { - if (array_key_exists($path, $this->array)) { - return $this->array[$path]; - } else { - return []; - } - } - - /** - * Key-Value array with the option name as key and the details as value. - * - * [OptionName => [description, array of valid values],..] - * - * @return array - */ - public function getOptionsDescriptions() - { - $options = [ - self::OPTION_PATH => ['Path to store the messages crossing this spy', []], - ]; - - return $options; - } - - /** - * With this method this class can configure an OptionsResolver that will be used to validate the options. - * - * @param OptionsResolver $resolver - * - * @return mixed - */ - public function configureOptionsResolver(OptionsResolver $resolver) - { - $resolver->setDefault(Protocol::OPTION_EXCHANGE_PATTERN, Protocol::EXCHANGE_PATTERN_IN_ONLY); - $resolver->setAllowedValues(Protocol::OPTION_EXCHANGE_PATTERN, [Protocol::EXCHANGE_PATTERN_IN_ONLY]); - - $resolver->setRequired(self::OPTION_PATH); - $resolver->setAllowedTypes(self::OPTION_PATH, ['string']); - } -} diff --git a/Tests/App/Resources/Fixtures/Csv/happy-comma.csv b/Tests/App/Resources/Fixtures/Csv/happy-comma.csv deleted file mode 100755 index ce7db7b6..00000000 --- a/Tests/App/Resources/Fixtures/Csv/happy-comma.csv +++ /dev/null @@ -1,8 +0,0 @@ -a1,b1,c1 -a2,b2,c2 -a3,b3,c3 -a4,b4,c4 -a5,b5,c5 -a6,b6,c6 -a7,b7,c7 -hello diff --git a/Tests/App/Resources/Fixtures/Csv/happy.csv b/Tests/App/Resources/Fixtures/Csv/happy.csv deleted file mode 100755 index a88f868f..00000000 --- a/Tests/App/Resources/Fixtures/Csv/happy.csv +++ /dev/null @@ -1,8 +0,0 @@ -a1|b1|c1 -a2|b2|c2 -a3|b3|c3 -a4|b4|c4 -a5|b5|c5 -a6|b6|c6 -a7|b7|c7 -hello diff --git a/Tests/App/Resources/Fixtures/default/ok.json b/Tests/App/Resources/Fixtures/default/ok.json deleted file mode 100644 index 77588190..00000000 --- a/Tests/App/Resources/Fixtures/default/ok.json +++ /dev/null @@ -1 +0,0 @@ -{"_type":"Smartbox\\ApiBundle\\Entity\\OK","_apiVersion":"v1"} \ No newline at end of file diff --git a/Tests/App/Resources/FrozenFlows/.gitkeep b/Tests/App/Resources/FrozenFlows/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/App/Resources/TestFlows/.project b/Tests/App/Resources/TestFlows/.project deleted file mode 100644 index ae845e9f..00000000 --- a/Tests/App/Resources/TestFlows/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - TestFlows - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/AsyncErrorRecovery/recoverable.xml b/Tests/App/Resources/TestFlows/AsyncErrorRecovery/recoverable.xml deleted file mode 100644 index deb819cf..00000000 --- a/Tests/App/Resources/TestFlows/AsyncErrorRecovery/recoverable.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/AsyncErrorRecovery/test.yml b/Tests/App/Resources/TestFlows/AsyncErrorRecovery/test.yml deleted file mode 100644 index 122cab00..00000000 --- a/Tests/App/Resources/TestFlows/AsyncErrorRecovery/test.yml +++ /dev/null @@ -1,17 +0,0 @@ -steps: - - {type: configureHandler, name: async, retryDelay: 0 } - - - {type: handle, from: test://queues/recoveryAsyncRecoverable, in: 1, out: 1} - - {type: consume, uri: queue://main/recoveryAsyncRecoverable, amount: 1 } - - # Check that the message was partially processed - - { type: checkSpy, path: before_error/recoverable, values: [6]} - - # Check that the message didn't succeed - - { type: checkSpy, path: after_error/recoverable, values: []} - - # Check that we can recover and that previous steps are not repeated - - {type: consume, uri: queue://main/recoveryAsyncRecoverable, amount: 1 } - - - { type: checkSpy, path: before_error/recoverable, values: [6]} - - { type: checkSpy, path: after_error/recoverable, values: [11]} \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/recoverableWithDelay.xml b/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/recoverableWithDelay.xml deleted file mode 100644 index 468e2d6a..00000000 --- a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/recoverableWithDelay.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/test.yml b/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/test.yml deleted file mode 100644 index 3c73509f..00000000 --- a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelay/test.yml +++ /dev/null @@ -1,34 +0,0 @@ -steps: - - {type: handle, from: test://queues/delayRecoveryAsyncRecoverableWithDelay, in: 1, out: 1 } - - # Configure the handler with a 5 second delay - - {type: configureHandler, name: async, retryDelay: 5 } - - # Consume a first time - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelay, amount: 1 } - - # Check that the message was partially processed - - { type: checkSpy, path: before_error/recoverableDelay, values: [6]} - - # Try to consume the message again - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelay, amount: 1 } - - # Check that the message has still the same value - - { type: checkSpy, path: before_error/recoverableDelay, values: [6] } - - # Check that the message still didn't succeed - - { type: checkSpy, path: after_error/recoverableDelay, values: [] } - - # Wait until the end of the delay - - {type: wait, delay: 5 } - - # Check that we can recover and that previous steps are not repeated - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelay, amount: 1 } - - - { type: checkSpy, path: before_error/recoverableDelay, values: [6] } - - # Check the final value - - { type: checkSpy, path: after_error/recoverableDelay, values: [11] } - - # Reset the handler - - {type: configureHandler, name: async, retryDelay: 0 } diff --git a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/recoverableWithDelayProgressive.xml b/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/recoverableWithDelayProgressive.xml deleted file mode 100644 index 16feb8ed..00000000 --- a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/recoverableWithDelayProgressive.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/test.yml b/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/test.yml deleted file mode 100644 index 8970d6da..00000000 --- a/Tests/App/Resources/TestFlows/AsyncErrorRecoveryWithDelayProgressive/test.yml +++ /dev/null @@ -1,51 +0,0 @@ -steps: - - {type: handle, from: test://queues/delayRecoveryAsyncRecoverableWithDelayProgressive, in: 1, out: 1} - - # Configure the handler with a 5 second delay - - {type: configureHandler, name: async, retryDelay: 5, retryStrategy: progressive, retryDelayFactor: 2} - - # Consume a first time - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelayProgressive, amount: 1} - - # Check that the message was partially processed - - {type: checkSpy, path: before_error/recoverableDelayProgressive, values: [6]} - - # Check that we can recover and that previous steps are not repeated - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelayProgressive, amount: 1} - - - {type: checkSpy, path: before_error/recoverableDelayProgressive, values: [6]} - - # Check that the message still didn't succeed - - {type: checkSpy, path: after_error/recoverableDelayProgressive, values: []} - - # Wait until the end of the delay - - {type: wait, delay: 5} - - # Check that we can recover and that previous steps are not repeated - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelayProgressive, amount: 1} - - - {type: checkSpy, path: before_error/recoverableDelayProgressive, values: [6]} - - - {type: checkSpy, path: after_error/recoverableDelayProgressive, values: []} - - - {type: wait, delay: 5} - - # Check that we can the delay is still not finished - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelayProgressive, amount: 1} - - - {type: checkSpy, path: before_error/recoverableDelayProgressive, values: [6]} - - - {type: checkSpy, path: after_error/recoverableDelayProgressive, values: []} - - - {type: wait, delay: 5} - - # Check that we can recover and that previous steps are not repeated - - {type: consume, uri: queue://main/delayRecoveryAsyncRecoverableWithDelayProgressive, amount: 1} - - - {type: checkSpy, path: before_error/recoverableDelayProgressive, values: [6]} - - # Check the final value - - {type: checkSpy, path: after_error/recoverableDelayProgressive, values: [11]} - - # Reset the handler - - {type: configureHandler, name: async, retryDelay: 0} diff --git a/Tests/App/Resources/TestFlows/Csv/csv.xml b/Tests/App/Resources/TestFlows/Csv/csv.xml deleted file mode 100644 index 3274ab43..00000000 --- a/Tests/App/Resources/TestFlows/Csv/csv.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Csv/csv2.xml b/Tests/App/Resources/TestFlows/Csv/csv2.xml deleted file mode 100644 index 91eb06d7..00000000 --- a/Tests/App/Resources/TestFlows/Csv/csv2.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Csv/csvGeneric.xml b/Tests/App/Resources/TestFlows/Csv/csvGeneric.xml deleted file mode 100644 index 5794b899..00000000 --- a/Tests/App/Resources/TestFlows/Csv/csvGeneric.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Csv/test.yml b/Tests/App/Resources/TestFlows/Csv/test.yml deleted file mode 100644 index 29c8eb1a..00000000 --- a/Tests/App/Resources/TestFlows/Csv/test.yml +++ /dev/null @@ -1,45 +0,0 @@ -steps: - - {type: configureHandler, name: async, retryDelay: 0 } - - # We need to copy the recource we will use for the generic test - - {type: copyTmpResource, from: Csv/happy-comma.csv } - - # Consume one set of rows from the csv, the amount here is 1, but the consumer is set to read 3 lines - - {type: consume, uri: csv://test/consumer/read_happy, amount: 1 } - - # Test that we returned 3 lines as expected from the csv - - - type: checkSpyArray - path: csv/read_file1 - values: - lines: - - ['a1', 'b1', 'c1' ] - - ['a2', 'b2', 'c2' ] - - ['a3', 'b3', 'c3' ] - - # Consume one set of rows from the csv, the amount here is 1, but the consumer is set to read 2 lines - - {type: consume, uri: csv://test/consumer_2/read_happy, amount: 1 } - - # Test that we returned 2 lines as expected from the csv - - - type: checkSpyArray - path: csv/read_file2 - values: - lines: - - ['a1', 'b1', 'c1' ] - - ['a2', 'b2', 'c2' ] - - # And the csvGeneric - # Consume one set of rows from the csv, the amount here is 1, but the consumer is set to read 2 lines - - {type: consume, uri: csv://generic//tmp/camel-config-test/happy-comma.csv, amount: 1 } - - # Test that we returned 1 lines as expected from the csv - - - type: checkSpyArray - path: csv/read_file3 - values: - lines: - - ['a1', 'b1', 'c1' ] - - # Clean up all the tmp files after our selves - - {type: cleanTmpResources } \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Logging/exception.xml b/Tests/App/Resources/TestFlows/Logging/exception.xml deleted file mode 100644 index ceacb8f2..00000000 --- a/Tests/App/Resources/TestFlows/Logging/exception.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Logging/test.yml b/Tests/App/Resources/TestFlows/Logging/test.yml deleted file mode 100644 index 0d976380..00000000 --- a/Tests/App/Resources/TestFlows/Logging/test.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: - - {type: expectedException, class: 'Smartbox\Integration\CamelConfigBundle\Tests\Fixtures\Exception\TestException'} - - {type: handle, from: test://logging/exception, in: 1} - - {type: checkLogs, message: "Event \"smartesb.handler.before_handle\" occurred", level: "Debug"} - - {type: checkLogs, message: "Event \"smartesb.handler.before_process\" occurred", level: "Debug"} - - {type: checkLogs, message: "Event \"smartesb.handler.after_process\" occurred", level: "Debug"} - - {type: checkLogs, message: "Event \"smartesb.handler.after_handle\" occurred", level: "Debug"} - - {type: checkLogs, message: "This is a test exception", level: "Error"} diff --git a/Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/exception.xml b/Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/exception.xml deleted file mode 100644 index 62989344..00000000 --- a/Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/exception.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/test.yml b/Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/test.yml deleted file mode 100644 index ff2a7bc3..00000000 --- a/Tests/App/Resources/TestFlows/LoggingWithCustomErrorMessage/test.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: - - {type: expectedException, class: 'Smartbox\Integration\CamelConfigBundle\Tests\Fixtures\Exception\TestException'} - - {type: handle, from: test://logging/exceptionWithMessage, in: 1} - - {type: checkLogs, message: 'Event "smartesb.handler.before_handle" occurred', level: 'Debug'} - - {type: checkLogs, message: 'Event "smartesb.handler.before_process" occurred', level: 'Debug'} - - {type: checkLogs, message: 'Event "smartesb.handler.after_process" occurred', level: 'Debug'} - - {type: checkLogs, message: 'Event "smartesb.handler.after_handle" occurred', level: 'Debug'} - - {type: checkLogs, message: 'This is a custom message', level: 'Error'} diff --git a/Tests/App/Resources/TestFlows/Multicast/multicast.xml b/Tests/App/Resources/TestFlows/Multicast/multicast.xml deleted file mode 100644 index 85c05ae2..00000000 --- a/Tests/App/Resources/TestFlows/Multicast/multicast.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Multicast/test.yml b/Tests/App/Resources/TestFlows/Multicast/test.yml deleted file mode 100644 index 3f39396c..00000000 --- a/Tests/App/Resources/TestFlows/Multicast/test.yml +++ /dev/null @@ -1,4 +0,0 @@ -steps: - - { type: handle, from: "test://multicast", in: 1, out: 1} # We perform no aggregation, so the main exchange doesn't change - - { type: checkSpy, path: "multicast/a", values: [5]} - - { type: checkSpy, path: "multicast/b", values: [2]} \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Pipeline/pipeline.xml b/Tests/App/Resources/TestFlows/Pipeline/pipeline.xml deleted file mode 100644 index bfeaad77..00000000 --- a/Tests/App/Resources/TestFlows/Pipeline/pipeline.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Pipeline/test.yml b/Tests/App/Resources/TestFlows/Pipeline/test.yml deleted file mode 100644 index 3a92676c..00000000 --- a/Tests/App/Resources/TestFlows/Pipeline/test.yml +++ /dev/null @@ -1,3 +0,0 @@ -steps: - - { type: handle, from: "test://pipeline", in: 1, out: 5} - - { type: checkSpy, path: "pipeline/a", values: [5]} \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Queue/enqueue.xml b/Tests/App/Resources/TestFlows/Queue/enqueue.xml deleted file mode 100644 index 9d1c2145..00000000 --- a/Tests/App/Resources/TestFlows/Queue/enqueue.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Queue/queueMulticast.xml b/Tests/App/Resources/TestFlows/Queue/queueMulticast.xml deleted file mode 100644 index 85f6823c..00000000 --- a/Tests/App/Resources/TestFlows/Queue/queueMulticast.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Queue/queueSimple.xml b/Tests/App/Resources/TestFlows/Queue/queueSimple.xml deleted file mode 100644 index e1f96fd3..00000000 --- a/Tests/App/Resources/TestFlows/Queue/queueSimple.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Queue/test.yml b/Tests/App/Resources/TestFlows/Queue/test.yml deleted file mode 100644 index 7328c7ea..00000000 --- a/Tests/App/Resources/TestFlows/Queue/test.yml +++ /dev/null @@ -1,10 +0,0 @@ -steps: - - { type: handle, from: "test://queues/simple", in: 1, out: in } - - { type: consume, uri: "queue://main/simple", amount: 1} - - { type: checkSpy, path: "queue/simple/result", values: [1+10] } - - - { type: handle, from: "test://queues/multicast", in: 2, out: in } # Enqueue the message - - { type: consume, uri: "queue://main/multicast", amount: 3} # ...we need to consume also the 2 child exchanges - - { type: checkSpy, path: "queue/multicast/result", values: [2] } - - { type: checkSpy, path: "multicast/a", values: [2*5] } - - { type: checkSpy, path: "multicast/b", values: [2*2] } \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Router/router.xml b/Tests/App/Resources/TestFlows/Router/router.xml deleted file mode 100644 index 24248d59..00000000 --- a/Tests/App/Resources/TestFlows/Router/router.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - (msg.getBody().getX() % 2) == 0 - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Router/test.yml b/Tests/App/Resources/TestFlows/Router/test.yml deleted file mode 100644 index f26c389f..00000000 --- a/Tests/App/Resources/TestFlows/Router/test.yml +++ /dev/null @@ -1,3 +0,0 @@ -steps: - - { type: handle, from: "test://router", in: 1, out: 2} - - { type: handle, from: "test://router", in: 2, out: 10} \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Simple/simple.xml b/Tests/App/Resources/TestFlows/Simple/simple.xml deleted file mode 100644 index 74cc581c..00000000 --- a/Tests/App/Resources/TestFlows/Simple/simple.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Simple/test.yml b/Tests/App/Resources/TestFlows/Simple/test.yml deleted file mode 100644 index a5c46241..00000000 --- a/Tests/App/Resources/TestFlows/Simple/test.yml +++ /dev/null @@ -1,5 +0,0 @@ -steps: - - { type: handle, from: "test://simple1", in: 1, out: 5} - - { type: handle, from: "test://simple2", in: 1, out: 2} - - { type: handle, from: "test://simple3", in: 1, out: 6} - - { type: handle, from: "test://simple4", in: 1, out: 12} \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Subroutines/multicastSubroutine.xml b/Tests/App/Resources/TestFlows/Subroutines/multicastSubroutine.xml deleted file mode 100644 index 267411bc..00000000 --- a/Tests/App/Resources/TestFlows/Subroutines/multicastSubroutine.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Subroutines/routerSubroutine.xml b/Tests/App/Resources/TestFlows/Subroutines/routerSubroutine.xml deleted file mode 100644 index 6fdf6467..00000000 --- a/Tests/App/Resources/TestFlows/Subroutines/routerSubroutine.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Subroutines/simpleSubroutine.xml b/Tests/App/Resources/TestFlows/Subroutines/simpleSubroutine.xml deleted file mode 100644 index 6ee8f084..00000000 --- a/Tests/App/Resources/TestFlows/Subroutines/simpleSubroutine.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Subroutines/test.yml b/Tests/App/Resources/TestFlows/Subroutines/test.yml deleted file mode 100644 index ab3ba39b..00000000 --- a/Tests/App/Resources/TestFlows/Subroutines/test.yml +++ /dev/null @@ -1,10 +0,0 @@ -steps: - - { type: handle, from: "test://subroutines/simple", in: 1, out: 1 + 10} - - - { type: handle, from: "test://subroutines/router", in: 1, out: (1*2)+10 } - - { type: handle, from: "test://subroutines/router", in: 2, out: (2*5)+10 } - - - - { type: handle, from: "test://subroutines/multicast", in: 1, out: 1+10 } - - { type: checkSpy, path: "multicast/a", values: [1*5] } - - { type: checkSpy, path: "multicast/b", values: [1*2] } \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Throttler/test.yml b/Tests/App/Resources/TestFlows/Throttler/test.yml deleted file mode 100644 index e6a4b63e..00000000 --- a/Tests/App/Resources/TestFlows/Throttler/test.yml +++ /dev/null @@ -1,27 +0,0 @@ -steps: - -# Send 2 messages, consume 2 messages, first one should pass, second one not - - { type: handle, from: "test://queues/throttler", in: 1, out: in } # Enqueue the message - - { type: handle, from: "test://queues/throttler", in: 1, out: in } # Enqueue the message - - - { type: consume, uri: "queue://main/throttler", amount: 2} # Consume the two messages - - { type: checkSpy, path: "throttler/before", values: [1,1] } - - { type: checkSpy, path: "throttler/after", values: [5] } # spy contains only one result (second message is moved to the failed transactions) - - - { type: wait, delay: 3 } # Wait until the end of the reset, then consume again and check that the message passes - - - { type: handle, from: "test://queues/throttler", in: 2, out: in } # The queue will be empty so we enqueue a new message - - { type: consume, uri: "queue://main/throttler", amount: 1} # we consume the new message - - - { type: checkSpy, path: "throttler/before", values: [1,1,2] } # We check the inputs of the three consumed messages - - { type: checkSpy, path: "throttler/after", values: [5,10] } # only the first and the last produced an output (the second was moved to the failed transactions) - - -## Sync - -# First message should pass - - { type: handle, from: "test://throttler", in: 1, out: 5} - -# Second message should fail - - { type: expectedException, class: 'Smartbox\Integration\FrameworkBundle\Core\Processors\Exceptions\ThrottlingLimitReachedException'} - - { type: handle, from: "test://throttler", in: 1, out: 1} diff --git a/Tests/App/Resources/TestFlows/Throttler/test_async_delayed.yml b/Tests/App/Resources/TestFlows/Throttler/test_async_delayed.yml deleted file mode 100644 index 1be4b336..00000000 --- a/Tests/App/Resources/TestFlows/Throttler/test_async_delayed.yml +++ /dev/null @@ -1,23 +0,0 @@ -steps: -#Async - -# Send 2 messages, consume 2 messages, first one should pass, second one not - - { type: handle, from: "test://queues/throttlerAsync", in: 1, out: in } # Enqueue the message - - { type: handle, from: "test://queues/throttlerAsync", in: 1, out: in } # Enqueue the message - - - { type: consume, uri: "queue://main/throttlerAsync", amount: 2} # Consume the two messages - - { type: checkSpy, path: "throttlerAsync/before", values: [1,1] } - - { type: checkSpy, path: "throttlerAsync/after", values: [5] } # spy contains only one result (second message is throttled) - - - { type: wait, delay: 3 } # Wait until the end of the reset, then consume again and check that the message passes - - - { type: consume, uri: "queue://main/throttle", amount: 1} # When a message gets throttled it will be put in the uri defined in smartesb.handlers.async - - { type: checkSpy, path: "throttlerAsync/before", values: [1,1] } - - { type: checkSpy, path: "throttlerAsync/after", values: [5,5] } # spy now contains both results - -# First message should pass - - { type: handle, from: "test://throttlerAsync", in: 1, out: 5} - -# Second message should throw an exception - - { type: expectedException, class: 'Smartbox\Integration\FrameworkBundle\Core\Processors\Exceptions\ThrottledException'} - - { type: handle, from: "test://throttlerAsync", in: 1, out: 1} diff --git a/Tests/App/Resources/TestFlows/Throttler/throttler.xml b/Tests/App/Resources/TestFlows/Throttler/throttler.xml deleted file mode 100644 index 0e072b7c..00000000 --- a/Tests/App/Resources/TestFlows/Throttler/throttler.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - 1+0 - - - - - - - - 1+0 - - - - - - diff --git a/Tests/App/Resources/TestFlows/Throttler/throttler_async_delayed.xml b/Tests/App/Resources/TestFlows/Throttler/throttler_async_delayed.xml deleted file mode 100644 index 31524905..00000000 --- a/Tests/App/Resources/TestFlows/Throttler/throttler_async_delayed.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - 1+0 - - - - - - - - 1+0 - - - - - - - diff --git a/Tests/App/Resources/TestFlows/Transformer/test.yml b/Tests/App/Resources/TestFlows/Transformer/test.yml deleted file mode 100644 index 5d5faf00..00000000 --- a/Tests/App/Resources/TestFlows/Transformer/test.yml +++ /dev/null @@ -1,2 +0,0 @@ -steps: - - { type: handle, from: "test://transformer", in: 1, out: 11} \ No newline at end of file diff --git a/Tests/App/Resources/TestFlows/Transformer/transformer.xml b/Tests/App/Resources/TestFlows/Transformer/transformer.xml deleted file mode 100644 index acbc01ad..00000000 --- a/Tests/App/Resources/TestFlows/Transformer/transformer.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - msg.getBody().setX(msg.getBody().getX()+10) - - - - - diff --git a/Tests/App/Resources/TestFlows/TryCatch/test_catched.yml b/Tests/App/Resources/TestFlows/TryCatch/test_catched.yml deleted file mode 100644 index 07669824..00000000 --- a/Tests/App/Resources/TestFlows/TryCatch/test_catched.yml +++ /dev/null @@ -1,3 +0,0 @@ -steps: - - { type: handle, from: "test://try1", in: 1, out: 22 } - - { type: handle, from: "test://try2", in: 1, out: 42 } diff --git a/Tests/App/Resources/TestFlows/TryCatch/test_not_catched.yml b/Tests/App/Resources/TestFlows/TryCatch/test_not_catched.yml deleted file mode 100644 index 693b27c0..00000000 --- a/Tests/App/Resources/TestFlows/TryCatch/test_not_catched.yml +++ /dev/null @@ -1,4 +0,0 @@ -steps: - - { type: expectedException, class: 'Smartbox\Integration\FrameworkBundle\Tests\Fixtures\Exceptions\SampleRecoverableException'} - - { type: handle, from: "test://try3", in: 1, out: 21 } - diff --git a/Tests/App/Resources/TestFlows/TryCatch/test_with_recovery.yml b/Tests/App/Resources/TestFlows/TryCatch/test_with_recovery.yml deleted file mode 100644 index 177d164f..00000000 --- a/Tests/App/Resources/TestFlows/TryCatch/test_with_recovery.yml +++ /dev/null @@ -1,17 +0,0 @@ -steps: - - {type: configureHandler, name: async, retryDelay: 0 } - - - {type: handle, from: test://queues/tryAsync, in: 1, out: 1} - - {type: consume, uri: queue://main/tryAsync, amount: 1 } - - # Check that the message was partially processed - - { type: checkSpy, path: try/async/before_first_error, values: [6]} - - { type: checkSpy, path: try/async/after_first_error, values: []} - - { type: checkSpy, path: try/async/after_all, values: []} - - # Check that we can recover, that previous steps are not repeated and that the try/catch still works - - {type: consume, uri: queue://main/tryAsync, amount: 1 } - - - { type: checkSpy, path: try/async/before_first_error, values: [6]} - - { type: checkSpy, path: try/async/after_first_error, values: [11]} - - { type: checkSpy, path: try/async/after_all, values: [61]} diff --git a/Tests/App/Resources/TestFlows/TryCatch/tryCatch.xml b/Tests/App/Resources/TestFlows/TryCatch/tryCatch.xml deleted file mode 100644 index 75bad74b..00000000 --- a/Tests/App/Resources/TestFlows/TryCatch/tryCatch.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - try/catch description - - - - - 1 == 2 - - - - - - true - - - - - - - - - - - - - - - - - - 1 == 2 - - - - - - true - - - - - - - - - - - - - - - - - - - 1 == 2 - - - - - - - - - - - - - - - - - - - - - - not isRecoverable(exception) - - - - - - - - - - - diff --git a/Tests/App/config/config.yml b/Tests/App/config/config.yml index 80b4922f..3eb663a7 100644 --- a/Tests/App/config/config.yml +++ b/Tests/App/config/config.yml @@ -1,11 +1,9 @@ imports: - { resource: services.yml } - - { resource: csv.yml } - { resource: parameters.yml } - { resource: "@SmartboxIntegrationFrameworkBundle/Resources/config/default_configured_consumers.yml" } - { resource: "@SmartboxIntegrationFrameworkBundle/Resources/config/default_configured_producers.yml" } - framework: secret: "%secret%" validation: { enable_annotations: true } @@ -45,8 +43,8 @@ smartbox_core: smartbox_integration_camel_config: flows_directories: - - "%kernel.root_dir%/Resources/TestFlows" - frozen_flows_directory: "%kernel.root_dir%/Resources/FrozenFlows" + - "%kernel.root_dir%/Resources/Fixtures/TestFlows" + frozen_flows_directory: "%kernel.root_dir%/Resources/Fixtures/FrozenFlows" smartbox_integration_framework: diff --git a/Tests/App/config/csv.yml b/Tests/App/config/csv.yml deleted file mode 100644 index ed03a9a1..00000000 --- a/Tests/App/config/csv.yml +++ /dev/null @@ -1,64 +0,0 @@ -smartbox_integration_framework: - consumers: - test_csv: - class: Smartbox\Integration\FrameworkBundle\Components\FileService\Csv\CsvConfigurableConsumer - description: Consume from csv file - calls: - - [setConfigurableStepsProvider,[@smartesb.steps_provider.csv_file]] - options: - delimiter: '|' - enclosure: '"' - escape_char: '\' - stop_on_eof: true - methods: - read_happy: - description: Read out some | csv file, 3 lines at a time - query_steps: - - read_lines: - result_name: xyxx - max_lines: 3 - filename: happy.csv - query_result: - lines: eval: results['xyxx'] - on_consume: ~ - - test_csv_2: - class: Smartbox\Integration\FrameworkBundle\Components\FileService\Csv\CsvConfigurableConsumer - description: Consume from csv file - calls: - - [setConfigurableStepsProvider,[@smartesb.steps_provider.csv_file]] - options: - delimiter: ',' - enclosure: '"' - escape_char: '\' - stop_on_eof: true - methods: - read_happy: - description: Read from a , csv file, 2 lines at a time - # The path to where our write flow test should have written - query_steps: - - read_lines: - result_name: xyxx - max_lines: 2 - filename: happy-comma.csv - query_result: - lines: eval: results['xyxx'] - on_consume: ~ - - producers: - test_csv: - class: Smartbox\Integration\FrameworkBundle\Components\FileService\Csv\CsvConfigurableProducer - description: Producer to write out csv files - calls: - - [setConfigurableStepsProvider,["@smartesb.steps_provider.csv_file"]] - options: - delimiter: ',' - enclosure: '"' - escape_char: '\' - methods: - write_happy: - description: Append lines to the csv file - steps: - - append_lines: - rows: eval: body['lines'] - response: [] diff --git a/Tests/App/config/routing_endpoints.yml b/Tests/App/config/routing_endpoints.yml index ffcf8ada..068b57eb 100644 --- a/Tests/App/config/routing_endpoints.yml +++ b/Tests/App/config/routing_endpoints.yml @@ -1,88 +1,2 @@ -queues.generic: - pattern: "queue://{queue_driver}/{queue}" - defaults: - _protocol: @smartesb.protocols.queue - prefix: "test/camelconfig/" - persistent: false # For the tests we don't really want to persist our messages - - requirements: - queue: "[a-zA-Z0-9/]+" - -nosql.configurable: - pattern: "nosql://{nosql_driver}/{method}/{collection}" - defaults: - _protocol: @smartesb.protocols.configurable.nosql - _producer: @smartesb.producers.mongo - _handler: @smartesb.handlers.sync - prefix: "" - nosql_driver: main - requirements: - collection: "[_\-a-zA-Z0-9/]+" - nosql_driver: "[a-zA-Z0-9]+" - -smartbox_integration_platform: - resource: "@SmartboxIntegrationFrameworkBundle/Resources/config/default_endpoint_routes.yml" - prefix: / - -## For testing purposes -test: - pattern: "test://{path}" - defaults: - _protocol: @smartesb.protocols.direct - requirements: - path: "[a-zA-Z0-9/_\-]+" - -helper: - pattern: "helper://{operation}/{operand}" - defaults: - _protocol: @smartesb.protocols.base - _producer: @producer.helper - -spy: - pattern: "spy://{path}" - defaults: - _protocol: @smartesb.protocols.base - _producer: @producer.spy - requirements: - path: "[a-zA-Z0-9/_-]+" - -error.triggerer.recoverable: - pattern: "error://recoverable/{nb_errors}" - defaults: - _protocol: @smartesb.protocols.base - _producer: @producer.error.triggerer - recoverable: true - nb_errors: 1 - -error.triggerer.unrecoverable: - pattern: "error://unrecoverable" - defaults: - _protocol: @smartesb.protocols.base - _producer: @producer.error.triggerer - recoverable: false - -csv.test.consumer.read: - pattern: "csv://test/consumer/{method}" - defaults: - _protocol: "@smartesb.protocols.configurable.csv_file" - _consumer: "@smartesb.consumers.test_csv" - _handler: "@smartesb.handlers.async" - path: "%kernel.root_dir%/Resources/Fixtures/Csv/" - -csv.test.consumer.read_2: - pattern: "csv://test/consumer_2/{method}" - defaults: - _protocol: "@smartesb.protocols.configurable.csv_file" - _consumer: "@smartesb.consumers.test_csv_2" - _handler: "@smartesb.handlers.async" - path: "/tmp/camel-config-test" - -csv.test.producer.write: - pattern: "csv://test/producer/{method}/{default_path}" - defaults: - _protocol: "@smartesb.protocols.configurable.csv_file" - _producer: "@smartesb.producers.test_csv" - root_path: "/tmp/camel-config-test" - delimiter: "," - requirements: - default_path: ".*" \ No newline at end of file +# This file is required as the integration-framework wants to require it in its configuration. +# This file can be removed if the integration-framework no longer requires it in integration-framework-bundle:Resources/config/routing.yml under smartesb.router.endpoints \ No newline at end of file diff --git a/Tests/App/config/routing_itineraries.yml b/Tests/App/config/routing_itineraries.yml deleted file mode 100644 index 3f0eb569..00000000 --- a/Tests/App/config/routing_itineraries.yml +++ /dev/null @@ -1,3 +0,0 @@ -auto_generated_routes: - resource: @smartesb.map.itineraries - type: itineraries \ No newline at end of file diff --git a/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php b/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php index 49a87a55..a3efdb53 100644 --- a/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php +++ b/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php @@ -54,8 +54,8 @@ public function testProcess() ->setMethods(['getNamespace', 'getAlias', 'getFlowsDirectories', 'getFrozenFlowsDirectory', 'getXsdValidationBasePath', 'load']) ->getMock(); - $extension->method('getFlowsDirectories')->willReturn(__DIR__.'/../Fixtures/FlowsBuilderCompilerPassSuccess'); - $extension->method('getFrozenFlowsDirectory')->willReturn(__DIR__.'/../Fixtures/FlowsBuilderCompilerPassSuccess/Frozen'); + $extension->method('getFlowsDirectories')->willReturn(__DIR__ . '/../App/Resources/Fixtures/FlowsBuilderCompilerPassSuccess'); + $extension->method('getFrozenFlowsDirectory')->willReturn(__DIR__ . '/../App/Resources/Fixtures/FlowsBuilderCompilerPassSuccess/Frozen'); $extension->method('getAlias') ->will($this->returnValue('smartbox_integration_camel_config')); diff --git a/Tests/Fixtures/Exception/TestException.php b/Tests/Fixtures/Exception/TestException.php deleted file mode 100644 index 86b1b5c3..00000000 --- a/Tests/Fixtures/Exception/TestException.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tests/Fixtures/FlowsBuilderCompilerPassFailures/XMLBadFormed/CamelTestFlowXMLError.xml b/Tests/Fixtures/FlowsBuilderCompilerPassFailures/XMLBadFormed/CamelTestFlowXMLError.xml deleted file mode 100644 index e2640379..00000000 --- a/Tests/Fixtures/FlowsBuilderCompilerPassFailures/XMLBadFormed/CamelTestFlowXMLError.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - to uri="custom://business_demo/getBoxInTransit"/> - - \ No newline at end of file diff --git a/Tests/Fixtures/FlowsBuilderCompilerPassFailures/findAbstractEndpointException/CamelTestFlowError.xml b/Tests/Fixtures/FlowsBuilderCompilerPassFailures/findAbstractEndpointException/CamelTestFlowError.xml deleted file mode 100644 index f61174e6..00000000 --- a/Tests/Fixtures/FlowsBuilderCompilerPassFailures/findAbstractEndpointException/CamelTestFlowError.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tests/Fixtures/FlowsBuilderCompilerPassSuccess/CamelTestFlowSuccess.xml b/Tests/Fixtures/FlowsBuilderCompilerPassSuccess/CamelTestFlowSuccess.xml deleted file mode 100644 index f61174e6..00000000 --- a/Tests/Fixtures/FlowsBuilderCompilerPassSuccess/CamelTestFlowSuccess.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tests/Fixtures/FlowsBuilderCompilerPassSuccess/Frozen/.gitkeep b/Tests/Fixtures/FlowsBuilderCompilerPassSuccess/Frozen/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/Functional/FlowsTest.php b/Tests/Functional/FlowsTest.php deleted file mode 100644 index 5b034374..00000000 --- a/Tests/Functional/FlowsTest.php +++ /dev/null @@ -1,319 +0,0 @@ -setUp(); - $parser = new Parser(); - $finder = new Finder(); - $flowsDir = $this->getContainer()->getParameter('smartesb.flows_directories'); - $finder->name('*.yml'); - $finder->files()->in($flowsDir); - - $res = []; - - /** @var SplFileInfo $file */ - foreach ($finder as $file) { - $res[] = [$file->getRelativePath(), $parser->parse(file_get_contents($file->getRealpath()))]; - } - - return $res; - } - - /** - * @dataProvider flowsDataProvider - * - * @param $path - * @param array $conf - * - * @throws \Exception - */ - public function testFlow($path, array $conf) - { - if (!array_key_exists('steps', $conf)) { - throw new \Exception('Missing steps'); - } - - /** @var Logger $logger */ - $logger = $this->getContainer()->get('logger'); - foreach ($logger->getHandlers() as $handler) { - if ($handler instanceof DebugHandler) { - $this->loggerHandler = $handler; - break; - } - } - - foreach ($conf['steps'] as $step) { - $type = $step['type']; - switch ($type) { - case 'handle': - $this->handle($step); - break; - case 'checkSpy': - $this->checkSpy($step); - break; - case 'checkSpyArray': - $this->checkSpyArray($step); - break; - case 'consume': - $this->consume($step); - break; - case 'expectedException': - $this->expectedException($step); - break; - case 'checkLogs': - $this->checkLogs($step); - break; - case 'wait': - $this->wait($step); - break; - case 'configureHandler': - $this->configureHandler($step); - break; - case 'copyTmpResource': - $this->copyTmpResource($step); - break; - case 'cleanTmpResources': - $this->cleanTmpResources($step); - break; - } - } - } - - /** - * @param array $conf - * - * @throws \Exception - * @throws \Smartbox\Integration\FrameworkBundle\Core\Handlers\HandlerException - */ - private function handle(array $conf) - { - if (!array_key_exists('in', $conf) || !array_key_exists('from', $conf)) { - throw new \Exception('Missing parameter in handle step'); - } - - /** @var ExpressionEvaluator $evaluator */ - $evaluator = $this->getContainer()->get('smartesb.util.evaluator'); - - $in = $evaluator->evaluateWithVars($conf['in'], []); - - $message = $this->createMessage(new EntityX($in)); - $handler = $this->getContainer()->get('smartesb.helper')->getHandler('sync'); - $endpointFactory = $this->getContainer()->get('smartesb.endpoint_factory'); - $endpoint = $endpointFactory->createEndpoint($conf['from'], EndpointFactory::MODE_CONSUME); - - /** @var EntityX $result */ - $result = $handler->handle($message, $endpoint)->getBody(); - - if (isset($conf['out'])) { - $out = $evaluator->evaluateWithVars($conf['out'], ['in' => $in]); - $this->assertEquals($out, $result->getX(), 'Unexpected result when handling message from: '.$conf['from']); - } - } - - /** - * @param array $conf - * - * @throws \Exception - * @throws \Smartbox\Integration\FrameworkBundle\Core\Handlers\HandlerException - */ - private function checkSpy(array $conf) - { - if (!array_key_exists('path', $conf) || !array_key_exists('values', $conf)) { - throw new \Exception('Missing parameter in checkSpy step'); - } - $evaluator = $this->getContainer()->get('smartesb.util.evaluator'); - - $expectedValues = []; - foreach ($conf['values'] as $value) { - $expectedValues[] = $evaluator->evaluateWithVars($value, []); - } - - $values = $this->getContainer()->get('producer.spy')->getData($conf['path']); - - $this->assertEquals($expectedValues, $values, 'The spy '.$conf['path']." didn't contain the expected data"); - } - /** - * @param array $conf - * - * @throws \Exception - * @throws \Smartbox\Integration\FrameworkBundle\Core\Handlers\HandlerException - */ - private function checkSpyArray(array $conf) - { - if (!array_key_exists('path', $conf) || !array_key_exists('values', $conf)) { - throw new \Exception('Missing parameter in checkSpy step'); - } - - $expectedValues = $conf['values']; - - $values = $this->getContainer()->get('producer.spy')->getData($conf['path']); - - $this->assertSame($expectedValues, $values, 'The spy '.$conf['path']." didn't contain the expected data"); - } - - /** - * @param array $conf - * - * @throws \Exception - * @throws \Smartbox\Integration\FrameworkBundle\Core\Handlers\HandlerException - */ - private function consume(array $conf) - { - if (!array_key_exists('uri', $conf) || !array_key_exists('amount', $conf)) { - throw new \Exception('Missing parameter uri in consume step'); - } - - $uri = $conf['uri']; - - /** @var EndpointInterface $endpoint */ - $endpoint = $this->getContainer()->get('smartesb.endpoint_factory')->createEndpoint($uri, EndpointFactory::MODE_CONSUME); - $endpoint->consume($conf['amount']); - } - - private function expectedException(array $conf) - { - if (!array_key_exists('class', $conf)) { - $conf['class'] = ProcessingException::class; - } - - $this->expectException($conf['class']); - } - - private function checkLogs(array $conf) - { - if (!array_key_exists('level', $conf) || !array_key_exists('message', $conf)) { - throw new \Exception('Missing parameter in checkLogs step'); - } - - $level = $conf['level']; - $message = $conf['message']; - - $this->assertTrue($this->loggerHandler->hasRecordThatContains($message, $level)); - } - - /** - * @param array $conf - * - * @throws \Exception - */ - private function wait(array $conf) - { - if (!array_key_exists('delay', $conf)) { - throw new \Exception('Missing parameter in wait step'); - } - - $delay = $conf['delay']; - sleep($delay); - } - - /** - * @param array $conf - * - * @throws \Exception - */ - private function configureHandler(array $conf) - { - if (!array_key_exists('name', $conf)) { - throw new \Exception('Missing parameter in configureHandler step'); - } - - /** @var MessageHandler $handler */ - $handler = $this->getContainer()->get('smartesb.helper')->getHandler($conf['name']); - if (array_key_exists('retryDelay', $conf)) { - $handler->setRetryDelay($conf['retryDelay']); - } - - if (array_key_exists('retryStrategy', $conf)) { - $handler->setRetryStrategy($conf['retryStrategy']); - $handler->setRetryDelayFactor($conf['retryDelayFactor']); - } - } - - /** - * Copy a test resource to /tmp/camel-config-test for using - * - * conf['from'] The resource in %kernel.root_path%/Test/App/Resources you would like copied - * to /tmp/camel-config-test - * - * If the /tmp/camel-config-test does not exist it will be created - * - * @param array $conf - * - * @throws \Exception - */ - private function copyTmpResource(array $conf) - { - if (!array_key_exists('from', $conf)) { - throw new \Exception('Missing from parameter in copyTmpResource step'); - } - - $from_path = self::$kernel->getRootDir() . DIRECTORY_SEPARATOR . self::RESOURCE_FOLDER . DIRECTORY_SEPARATOR . $conf['from']; - - if (!is_file($from_path)) { - throw new \Exception("The resource path {$from_path} is not a file!"); - } - - - if (!is_dir(self::TMP_FOLDER)) { - mkdir(self::TMP_FOLDER); - } - - $to_path = self::TMP_FOLDER . DIRECTORY_SEPARATOR . basename($conf['from']); - - copy( $from_path, $to_path ); - } - - /** - * Clean up the copied and created file resources by removeing the folder /tmp/camel-config-test - * - * @param array $conf - * - * @throws \Exception - */ - private function cleanTmpResources(array $conf) - { - $files = glob(self::TMP_FOLDER . DIRECTORY_SEPARATOR . '*'); - foreach ($files as $file) { - if (is_file($file)) - unlink($file); // delete file - } - //remove the folder - rmdir(self::TMP_FOLDER); - } - - /** - * {@inheritdoc} - */ - protected function tearDown() - { - parent::tearDown(); - ErrorTriggerProducer::$count = 0; - } -} diff --git a/composer.json b/composer.json index d6d5349c..fe909e4c 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,6 @@ "phpunit/phpunit-mock-objects": "~3.2", "phpunit/phpunit": "~5.4.0", "sensio/generator-bundle": "~2.3", - "smartbox/core-bundle": "^1.0.0", "doctrine/doctrine-bundle": "^1.6", "doctrine/orm": "^2.5" }, From 91cbb87ef56e941362923b2ec478e02b40227a42 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Mon, 26 Nov 2018 16:59:07 +0000 Subject: [PATCH 02/11] Only depend on framework for tests --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index fe909e4c..f384f1cd 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,7 @@ "sensio/distribution-bundle": "^4.0.0", "sensio/framework-extra-bundle": "^3.0.0", "incenteev/composer-parameter-handler": "^2.0.0", - "jms/serializer-bundle": "^0.13.0", - "smartbox/integration-framework-bundle": "^1.0.0" + "jms/serializer-bundle": "^0.13.0" }, "require-dev": { "phpunit/php-code-coverage": "~4.0", @@ -27,7 +26,8 @@ "phpunit/phpunit": "~5.4.0", "sensio/generator-bundle": "~2.3", "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.5" + "doctrine/orm": "^2.5", + "smartbox/integration-framework-bundle": "^1.0.0" }, "config": { "bin-dir": "bin" From 2898d18c223055e6fc863a4e95a4f437ad304915 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 27 Nov 2018 09:24:25 +0000 Subject: [PATCH 03/11] Only depend on framework for tests and in dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f384f1cd..718a6858 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "sensio/generator-bundle": "~2.3", "doctrine/doctrine-bundle": "^1.6", "doctrine/orm": "^2.5", - "smartbox/integration-framework-bundle": "^1.0.0" + "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.0.0" }, "config": { "bin-dir": "bin" From 2f5ccfc870e3f838ac5161ea3498c361449494b5 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 27 Nov 2018 11:35:19 +0000 Subject: [PATCH 04/11] Remove unused services --- Tests/App/config/services.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Tests/App/config/services.yml b/Tests/App/config/services.yml index de2e2496..6ff49640 100644 --- a/Tests/App/config/services.yml +++ b/Tests/App/config/services.yml @@ -1,14 +1,3 @@ services: - producer.error.triggerer: - class: Smartbox\Integration\CamelConfigBundle\Tests\App\Producers\ErrorTriggerProducer - - producer.helper: - class: Smartbox\Integration\CamelConfigBundle\Tests\App\Producers\HelperProducer - calls: - - [setMessageFactory, [@smartesb.message_factory]] - - producer.spy: - class: Smartbox\Integration\CamelConfigBundle\Tests\App\Producers\SpyProducer - array_cache_service: class: Smartbox\Integration\CamelConfigBundle\Tests\App\ArrayCacheService \ No newline at end of file From 7bdecae13057d9ad7f30ffef330434769eb1a6a6 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Mon, 7 Jan 2019 12:33:21 +0000 Subject: [PATCH 05/11] Remove the compiler pass from the tests --- Tests/App/Resources/Fixtures/FrozenFlows/.gitkeep | 0 Tests/App/Resources/Fixtures/TestFlows/.gitkeep | 0 Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php | 2 ++ 3 files changed, 2 insertions(+) create mode 100644 Tests/App/Resources/Fixtures/FrozenFlows/.gitkeep create mode 100644 Tests/App/Resources/Fixtures/TestFlows/.gitkeep diff --git a/Tests/App/Resources/Fixtures/FrozenFlows/.gitkeep b/Tests/App/Resources/Fixtures/FrozenFlows/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Tests/App/Resources/Fixtures/TestFlows/.gitkeep b/Tests/App/Resources/Fixtures/TestFlows/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php b/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php index a3efdb53..241e1734 100644 --- a/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php +++ b/Tests/DependencyInjection/FlowsBuilderCompilerPassTest.php @@ -46,6 +46,8 @@ public function prepareContainer(ContainerBuilder $container) */ public function testProcess() { + $this->markTestSkipped('This test has been skipped as it should be moved to the framework bundle.'); + $compilerPass = new FlowsBuilderCompilerPass(); // Mock extension interface and its related methods From 9c563263de7118534a5afffa7937d097da44284e Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Mon, 7 Jan 2019 14:15:37 +0000 Subject: [PATCH 06/11] Update travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93e766e3..8025dc4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,10 @@ addons: language: php php: - - 5.6 - 7.0 - 7.1 + - 7.2 + - 7.3 env: - SYMFONY_VERSION=2.7.* @@ -15,7 +16,7 @@ env: matrix: allow_failures: - - php: 7.1 + - php: 7.3 before_install: - phpenv config-add travis/z_php.ini From 0deeb4855c1aa95d903669eb3986d122de7161ed Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 8 Jan 2019 09:31:43 +0000 Subject: [PATCH 07/11] bump the as of framework --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f46f28e2..53221c2f 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "jms/serializer-bundle": "*", "doctrine/doctrine-bundle": "^1.6", "doctrine/orm": "^2.5", - "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.0.0" + "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.26.0" }, "config": { "bin-dir": "bin" From 449165f013028c485acf94734918dc1415702e79 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 8 Jan 2019 09:39:58 +0000 Subject: [PATCH 08/11] bump the as of framework --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 53221c2f..bc4d7d14 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "symfony/symfony": "^2.8|^3.0|^4.0", "sensio/distribution-bundle": "^4.0.0", "incenteev/composer-parameter-handler": "^2.0.0", - "smartbox/integration-framework-bundle": "^1.0.0" + "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.26.0" }, "require-dev": { "symfony/monolog-bundle": "^2.4.0", @@ -23,9 +23,9 @@ "phpunit/phpunit": "~5.4.0", "sensio/generator-bundle": "~2.3", "jms/serializer-bundle": "*", + "smartbox/core-bundle": "^1.0.0", "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.5", - "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.26.0" + "doctrine/orm": "^2.5" }, "config": { "bin-dir": "bin" From e90b156b17487a6fdfed801775c0a714a89cc9fc Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 8 Jan 2019 09:44:47 +0000 Subject: [PATCH 09/11] bump the as of framework --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index bc4d7d14..cac885aa 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,7 @@ "ext-pcntl": "*", "symfony/symfony": "^2.8|^3.0|^4.0", "sensio/distribution-bundle": "^4.0.0", - "incenteev/composer-parameter-handler": "^2.0.0", - "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.26.0" + "incenteev/composer-parameter-handler": "^2.0.0" }, "require-dev": { "symfony/monolog-bundle": "^2.4.0", @@ -25,7 +24,8 @@ "jms/serializer-bundle": "*", "smartbox/core-bundle": "^1.0.0", "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.5" + "doctrine/orm": "^2.5", + "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.26.0" }, "config": { "bin-dir": "bin" From eae83ca43e8dd870c4a3073e441445e561043cff Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 8 Jan 2019 13:35:12 +0000 Subject: [PATCH 10/11] bump off framework --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index cac885aa..89d653c0 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,7 @@ "jms/serializer-bundle": "*", "smartbox/core-bundle": "^1.0.0", "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.5", - "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.26.0" + "doctrine/orm": "^2.5" }, "config": { "bin-dir": "bin" From 1776d3c162d6380d406dc857708a3fde886f3973 Mon Sep 17 00:00:00 2001 From: Shane McKinley Date: Tue, 8 Jan 2019 13:45:26 +0000 Subject: [PATCH 11/11] bump the as of framework --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 89d653c0..1601bca2 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,8 @@ "jms/serializer-bundle": "*", "smartbox/core-bundle": "^1.0.0", "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.5" + "doctrine/orm": "^2.5", + "smartbox/integration-framework-bundle": "dev-tidy/move-tests as 1.0.0" }, "config": { "bin-dir": "bin"