You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/02 03:21:13 UTC
[02/50] [abbrv] incubator-edgent git commit: - Fixed a problem in the
test code which makes it fail on java7
- Fixed a problem in the test code which makes it fail on java7
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/3be8c498
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/3be8c498
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/3be8c498
Branch: refs/heads/develop
Commit: 3be8c498737c0d0b2b5a27ed9d20632eed8c589f
Parents: b176fd2
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 24 00:07:39 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 24 00:07:39 2017 +0200
----------------------------------------------------------------------
connectors/mqtt/pom.xml | 6 ++++++
.../edgent/test/connectors/mqtt/MqttStreamsTestManual.java | 3 ++-
platforms/java7/connectors/mqtt/pom.xml | 6 ++++++
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3be8c498/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index 38cdbba..a6ac968 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -112,5 +112,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3be8c498/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
----------------------------------------------------------------------
diff --git a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
index 3a7938c..018c1c6 100644
--- a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
+++ b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
@@ -39,6 +39,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.commons.lang3.StringUtils;
import org.apache.edgent.connectors.mqtt.MqttConfig;
import org.apache.edgent.connectors.mqtt.MqttStreams;
import org.apache.edgent.function.BiFunction;
@@ -791,7 +792,7 @@ public class MqttStreamsTestManual extends ConnectorTestBase {
// propTester.add("mqtt.persistence", "some.persistence.classname",
// () -> configRef.get().getPersistence());
propTester.add("mqtt.serverURLs", "tcp://somehost:1234,ssl://somehost:5678",
- () -> String.join(",", configRef.get().getServerURLs()));
+ () -> StringUtils.join(configRef.get().getServerURLs(), ","));
propTester.add("mqtt.subscriberIdleReconnectIntervalSec", "14",
() -> ((Integer)configRef.get().getSubscriberIdleReconnectInterval()).toString());
propTester.add("mqtt.trustStore", "some/path/truststore",
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3be8c498/platforms/java7/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 71c64ed..438754d 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -121,5 +121,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>