Repository: nifi Updated Branches: refs/heads/master f31f2a5f2 -> e1880785d
NIFI-4021: Fix StandardFlowSynchronizerSpec to pass independently. This closes #1892. Signed-off-by: Andy LoPresto <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e1880785 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e1880785 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e1880785 Branch: refs/heads/master Commit: e1880785d0fa5995507479d8d74a1189968a661c Parents: f31f2a5 Author: Koji Kawamura <[email protected]> Authored: Tue Jun 6 11:08:08 2017 +0900 Committer: Andy LoPresto <[email protected]> Committed: Mon Jun 5 19:25:07 2017 -0700 ---------------------------------------------------------------------- .../controller/StandardFlowSynchronizerSpec.groovy | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e1880785/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/StandardFlowSynchronizerSpec.groovy ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/StandardFlowSynchronizerSpec.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/StandardFlowSynchronizerSpec.groovy index e54bbe8..7483228 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/StandardFlowSynchronizerSpec.groovy +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/controller/StandardFlowSynchronizerSpec.groovy @@ -37,14 +37,16 @@ import spock.lang.Unroll class StandardFlowSynchronizerSpec extends Specification { @Shared - def systemBundle; + def systemBundle + @Shared + def nifiProperties def setupSpec() { def propFile = StandardFlowSynchronizerSpec.class.getResource("/standardflowsynchronizerspec.nifi.properties").getFile() - def niFiProperties = NiFiProperties.createBasicNiFiProperties(propFile, null); - systemBundle = SystemBundle.create(niFiProperties); - ExtensionManager.discoverExtensions(systemBundle, Collections.emptySet()); + nifiProperties = NiFiProperties.createBasicNiFiProperties(propFile, null) + systemBundle = SystemBundle.create(nifiProperties) + ExtensionManager.discoverExtensions(systemBundle, Collections.emptySet()) } def teardownSpec() { @@ -75,8 +77,7 @@ class StandardFlowSynchronizerSpec extends Specification { def Map<String, Connection> connectionMocksById = [:] def Map<String, List<Position>> bendPointPositionsByConnectionId = [:] // the unit under test - def nifiProperties = NiFiProperties.createBasicNiFiProperties(null, null) - def flowSynchronizer = new StandardFlowSynchronizer(null,nifiProperties) + def flowSynchronizer = new StandardFlowSynchronizer(null, nifiProperties) def firstRootGroup = Mock ProcessGroup when: "the flow is synchronized with the current state of the controller"
