lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Feature dmf integration tests (#459)

Browse Source 
* Add rabbit mq integration test
* Change DMF Api for ActionUpdateStatus JSON
* Add test for invalid target messages.
* Insert tests for AmqpAuthenticationMessageHandler

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* - Added vhost creation to tests
- Added missing test 
- Created beans for dmf client and vhost
- refactoring


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

* Completed missing tests

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

* Create vhost after every test class

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Add readme.md

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Add check if rabbit mq management is available

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* refactoring test

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

* Create integration test for amqpAuthentication
Add test description

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Fix sonar issue
Add rabbitmq username and password

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Merge master

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Fix some code smells

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Make some member immutable
Change executor

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
Dennis Melzer
2017-03-22 15:50:03 +01:00
committed by GitHub
parent 59107c521f
commit 7de6edb5fe
24 changed files with 2124 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SpSenderService.java
View File

@@ -53,7 +53,7 @@ public class SpSenderService extends SenderService {
public SpSenderService(final RabbitTemplate rabbitTemplate, final AmqpProperties amqpProperties,
final SimulationProperties simulationProperties) {
super(rabbitTemplate, amqpProperties);
this.spExchange = AmqpSettings.DMF_EXCHANGE;
spExchange = AmqpSettings.DMF_EXCHANGE;
this.simulationProperties = simulationProperties;
}
@@ -226,15 +226,13 @@ public class SpSenderService extends SenderService {
final List<String> updateResultMessages, final Long actionId) {
final MessageProperties messageProperties = new MessageProperties();
final Map<String, Object> headers = messageProperties.getHeaders();
final ActionUpdateStatus actionUpdateStatus = new ActionUpdateStatus();
actionUpdateStatus.setActionStatus(actionStatus);
final ActionUpdateStatus actionUpdateStatus = new ActionUpdateStatus(actionId, actionStatus);
headers.put(MessageHeaderKey.TYPE, MessageType.EVENT.name());
headers.put(MessageHeaderKey.TENANT, tenant);
headers.put(MessageHeaderKey.TOPIC, EventTopic.UPDATE_ACTION_STATUS.name());
headers.put(MessageHeaderKey.CONTENT_TYPE, MessageProperties.CONTENT_TYPE_JSON);
actionUpdateStatus.addMessage(updateResultMessages);
actionUpdateStatus.setActionId(actionId);
return convertMessage(actionUpdateStatus, messageProperties);
}
@@ -242,14 +240,12 @@ public class SpSenderService extends SenderService {
final List<String> updateResultMessages) {
final MessageProperties messageProperties = new MessageProperties();
final Map<String, Object> headers = messageProperties.getHeaders();
final ActionUpdateStatus actionUpdateStatus = new ActionUpdateStatus();
actionUpdateStatus.setActionStatus(actionStatus);
final ActionUpdateStatus actionUpdateStatus = new ActionUpdateStatus(cacheValue.getActionId(), actionStatus);
headers.put(MessageHeaderKey.TYPE, MessageType.EVENT.name());
headers.put(MessageHeaderKey.TENANT, cacheValue.getTenant());
headers.put(MessageHeaderKey.TOPIC, EventTopic.UPDATE_ACTION_STATUS.name());
headers.put(MessageHeaderKey.CONTENT_TYPE, MessageProperties.CONTENT_TYPE_JSON);
actionUpdateStatus.addMessage(updateResultMessages);
actionUpdateStatus.setActionId(cacheValue.getActionId());
return convertMessage(actionUpdateStatus, messageProperties);
}