You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2017/07/21 19:38:35 UTC
[1/2] storm git commit: STORM-2650: Expand property substitution test
for Flux to cover non-string properties
Repository: storm
Updated Branches:
refs/heads/1.x-branch d182584a6 -> 62a251b00
STORM-2650: Expand property substitution test for Flux to cover non-string properties
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/02c39ecd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/02c39ecd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/02c39ecd
Branch: refs/heads/1.x-branch
Commit: 02c39ecdb3eb661b0ffd21ee5f6bf0780382bcec
Parents: d182584
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Thu Jul 20 17:22:42 2017 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Fri Jul 21 21:33:24 2017 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/storm/flux/TCKTest.java | 9 +++++++++
.../src/test/resources/configs/substitution-test.yaml | 3 ++-
.../flux-core/src/test/resources/configs/test.properties | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/02c39ecd/external/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java b/external/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java
index bb5d7ec..bc2351f 100644
--- a/external/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java
+++ b/external/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java
@@ -17,6 +17,8 @@
*/
package org.apache.storm.flux;
+import static org.hamcrest.CoreMatchers.is;
+
import org.apache.storm.Config;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.flux.model.ExecutionContext;
@@ -29,6 +31,8 @@ import java.io.File;
import static org.junit.Assert.*;
+import java.util.Collections;
+
public class TCKTest {
@Test
public void testTCK() throws Exception {
@@ -251,6 +255,11 @@ public class TCKTest {
assertEquals("ENV variable not replaced.",
envPath,
context.getTopologyDef().getConfig().get("test.env.value"));
+
+ //Test substitution where the target type is List
+ assertThat("List property is not replaced by the expected value",
+ Collections.singletonList("A string list"),
+ is(context.getTopologyDef().getConfig().get("list.property.target")));
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/02c39ecd/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml b/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml
index ce9e62d..3d521e1 100644
--- a/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml
+++ b/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml
@@ -43,7 +43,8 @@ config:
topology.workers: 1
# test environent variable substitution
test.env.value: ${ENV-PATH}
- # ...
+ # test variable substitution for list type
+ list.property.target: ${a.list.property}
# spout definitions
spouts:
http://git-wip-us.apache.org/repos/asf/storm/blob/02c39ecd/external/flux/flux-core/src/test/resources/configs/test.properties
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/resources/configs/test.properties b/external/flux/flux-core/src/test/resources/configs/test.properties
index ecd89d9..afa3592 100644
--- a/external/flux/flux-core/src/test/resources/configs/test.properties
+++ b/external/flux/flux-core/src/test/resources/configs/test.properties
@@ -15,4 +15,5 @@
# limitations under the License.
topology.name: substitution-topology
+a.list.property: ["A string list"]
some.other.property: foo bar
\ No newline at end of file
[2/2] storm git commit: Changelog: STORM-2650
Posted by sr...@apache.org.
Changelog: STORM-2650
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/62a251b0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/62a251b0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/62a251b0
Branch: refs/heads/1.x-branch
Commit: 62a251b004042f36d4818ebe700ddef60ce605b4
Parents: 02c39ec
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Fri Jul 21 21:35:42 2017 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Fri Jul 21 21:35:42 2017 +0200
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/62a251b0/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eefc92f..c858f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.2.0
+ * STORM-2650: Expand property substitution test for Flux to cover non-string properties
* STORM-2642: Storm-kafka-client spout cannot be serialized when using manual partition assignment
* STORM-2541: Fix storm-kafka-client manual subscription not being able to start consuming
* STORM-2548: Simplify KafkaSpoutConfig to avoid duplicating KafkaConsumer configuration parameters