diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml index 2ff5c962..311ee15b 100755 --- a/distribution/src/main/assembly/assembly.xml +++ b/distribution/src/main/assembly/assembly.xml @@ -19,6 +19,11 @@ ../broker/migrate/h2/ /migrate/h2 + + + ../wildfire_jmeter/test_plan/ + /tools/jmeter + @@ -63,6 +68,11 @@ config/ + + ../wildfire_jmeter/target/wildfire-xmeter-jar-with-dependencies.jar + tools/jmeter + + ../broker/target/moquette-broker-${project.version}.jar lib/ diff --git a/wildfire_jmeter/screenshots/conn_sampler.png b/wildfire_jmeter/screenshots/conn_sampler.png deleted file mode 100755 index 30c60d34..00000000 Binary files a/wildfire_jmeter/screenshots/conn_sampler.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/mqtt_jmeter_plugin.png b/wildfire_jmeter/screenshots/mqtt_jmeter_plugin.png deleted file mode 100755 index 2f124d25..00000000 Binary files a/wildfire_jmeter/screenshots/mqtt_jmeter_plugin.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/payload_setting.png b/wildfire_jmeter/screenshots/payload_setting.png deleted file mode 100755 index 17961930..00000000 Binary files a/wildfire_jmeter/screenshots/payload_setting.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/protocol_setting.png b/wildfire_jmeter/screenshots/protocol_setting.png deleted file mode 100755 index 565a2539..00000000 Binary files a/wildfire_jmeter/screenshots/protocol_setting.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/pub_sampler.png b/wildfire_jmeter/screenshots/pub_sampler.png deleted file mode 100755 index a057ad19..00000000 Binary files a/wildfire_jmeter/screenshots/pub_sampler.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/ssl_conn.png b/wildfire_jmeter/screenshots/ssl_conn.png deleted file mode 100755 index 1751542b..00000000 Binary files a/wildfire_jmeter/screenshots/ssl_conn.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/sub_sampler.png b/wildfire_jmeter/screenshots/sub_sampler.png deleted file mode 100755 index cbd92958..00000000 Binary files a/wildfire_jmeter/screenshots/sub_sampler.png and /dev/null differ diff --git a/wildfire_jmeter/screenshots/sub_testplan.png b/wildfire_jmeter/screenshots/sub_testplan.png deleted file mode 100755 index 1799271e..00000000 Binary files a/wildfire_jmeter/screenshots/sub_testplan.png and /dev/null differ diff --git a/wildfire_jmeter/src/main/java/net/xmeter/samplers/SendMessageSampler.java b/wildfire_jmeter/src/main/java/net/xmeter/samplers/SendMessageSampler.java index 077910ff..4b265021 100755 --- a/wildfire_jmeter/src/main/java/net/xmeter/samplers/SendMessageSampler.java +++ b/wildfire_jmeter/src/main/java/net/xmeter/samplers/SendMessageSampler.java @@ -192,7 +192,7 @@ public class SendMessageSampler extends AbstractMQTTSampler implements ThreadLis final Object lock = new Object(); - WFCMessage.Conversation conversation = WFCMessage.Conversation.newBuilder().setType(0).setTarget("yzyOyOKK").setLine(0).build(); + WFCMessage.Conversation conversation = WFCMessage.Conversation.newBuilder().setType(0).setTarget(getTarget()).setLine(0).build(); WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.newBuilder().setType(1).setSearchableContent(getMessage()).build(); final List ret = new ArrayList<>(); diff --git a/wildfire_jmeter/test_plan/Wildfire Connection Sampler.jmx b/wildfire_jmeter/test_plan/Wildfire Connection Sampler.jmx new file mode 100644 index 00000000..27393a7d --- /dev/null +++ b/wildfire_jmeter/test_plan/Wildfire Connection Sampler.jmx @@ -0,0 +1,124 @@ + + + + + + false + false + + + + + + + + continue + + false + 1 + + 100 + 10 + 1557848062000 + 1557848062000 + false + + + + + + 127.0.0.1 + 80 + true + 10 + test + true + conn_ + true + 300 + 1800 + 0 + 0 + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + + + + + + + + + + true + + + + diff --git a/wildfire_jmeter/test_plan/Wildfire Send Message Sampler.jmx b/wildfire_jmeter/test_plan/Wildfire Send Message Sampler.jmx new file mode 100644 index 00000000..086ee870 --- /dev/null +++ b/wildfire_jmeter/test_plan/Wildfire Send Message Sampler.jmx @@ -0,0 +1,126 @@ + + + + + + false + false + + + + + + + + continue + + false + 10 + + 1 + 10 + 1557931868000 + 1557931868000 + false + + + + + + 127.0.0.1 + 80 + true + 10 + test_ + true + client_ + true + 300 + 1800 + 0 + 0 + test_topic + hello from jmeter + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + + + + + + + + + + true + + + +