Repository: nifi Updated Branches: refs/heads/master defb6f5b6 -> 194fc048f
NIFI-1721 updated mock framework to return correct number of threads from mock context Signed-off-by: Matt Burgess <mattyb...@apache.org> This closes #408 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/194fc048 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/194fc048 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/194fc048 Branch: refs/heads/master Commit: 194fc048fb856c079e1e55e746b82375b836397d Parents: defb6f5 Author: Pierre Villard <pierre.villard...@gmail.com> Authored: Tue May 3 15:40:59 2016 +0200 Committer: Matt Burgess <mattyb...@apache.org> Committed: Tue May 3 15:09:29 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/util/MockProcessContext.java | 7 ++++++- .../org/apache/nifi/util/StandardProcessorTestRunner.java | 1 + .../apache/nifi/util/TestStandardProcessorTestRunner.java | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/194fc048/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java ---------------------------------------------------------------------- diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java index 01b415f..b6272ee 100644 --- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java +++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java @@ -55,6 +55,7 @@ public class MockProcessContext extends MockControllerServiceLookup implements S private boolean allowExpressionValidation = true; private volatile boolean incomingConnection = true; private volatile boolean nonLoopConnection = true; + private int numThreads = 1; private volatile Set<Relationship> connections = new HashSet<>(); private volatile Set<Relationship> unavailableRelationships = new HashSet<>(); @@ -174,7 +175,7 @@ public class MockProcessContext extends MockControllerServiceLookup implements S @Override public int getMaxConcurrentTasks() { - return 1; + return numThreads; } public void setAnnotationData(final String annotationData) { @@ -360,4 +361,8 @@ public class MockProcessContext extends MockControllerServiceLookup implements S public String getName() { return ""; } + + protected void setNumThreads(int numThreads) { + this.numThreads = numThreads; + } } http://git-wip-us.apache.org/repos/asf/nifi/blob/194fc048/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java ---------------------------------------------------------------------- diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java index c7cded1..5aa6d43 100644 --- a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java +++ b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java @@ -531,6 +531,7 @@ public class StandardProcessorTestRunner implements TestRunner { } this.numThreads = threadCount; + this.context.setNumThreads(threadCount); } @Override http://git-wip-us.apache.org/repos/asf/nifi/blob/194fc048/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java ---------------------------------------------------------------------- diff --git a/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java b/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java index a15f6ee..2ac908f 100644 --- a/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java +++ b/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java @@ -47,6 +47,15 @@ public class TestStandardProcessorTestRunner { assertEquals(1, proc.getOnStoppedCallsWithoutContext()); } + @Test + public void testNumThreads() { + final ProcessorWithOnStop proc = new ProcessorWithOnStop(); + final TestRunner runner = TestRunners.newTestRunner(proc); + runner.setThreadCount(5); + runner.run(1, true); + assertEquals(5, runner.getProcessContext().getMaxConcurrentTasks()); + } + @Test(expected = AssertionError.class) @Ignore("This should not be enabled until we actually fail processor unit tests for using deprecated methods") public void testFailOnDeprecatedTypeAnnotation() {
