Skip to content

Commit 5fa8024

Browse files
committed
Removed unnecessary test implementation, use mocks
1 parent 54aeb1d commit 5fa8024

9 files changed

+24
-257
lines changed

src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty;
2424
import org.jetbrains.annotations.NotNull;
2525
import org.junit.jupiter.api.Test;
26-
import util.implementations.CustomUserProperty;
2726

2827
import java.util.*;
2928
import java.util.stream.Stream;
3029

3130
import static org.junit.jupiter.api.Assertions.*;
31+
import static org.mockito.Mockito.mock;
3232

3333
/**
3434
* @author Michael Walter
@@ -49,7 +49,7 @@ void addAll_error_when_one_element_is_custom_implementation() {
4949

5050
final List<Mqtt5UserProperty> userProperties = new ArrayList<>();
5151
userProperties.add(userProperty);
52-
userProperties.add(new CustomUserProperty());
52+
userProperties.add(mock(Mqtt5UserProperty.class));
5353

5454
final Mqtt5UserPropertiesBuilder userPropertiesBuilder = Mqtt5UserProperties.builder();
5555

src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription;
2626
import org.jetbrains.annotations.NotNull;
2727
import org.junit.jupiter.api.Test;
28-
import util.implementations.CustomMqtt5Subscription;
2928

3029
import java.util.*;
3130
import java.util.stream.Stream;
3231

3332
import static org.junit.jupiter.api.Assertions.*;
33+
import static org.mockito.Mockito.mock;
3434

3535
/**
3636
* @author Michael Walter
@@ -46,7 +46,7 @@ void addSubscription_error_when_subscription_is_null() {
4646
void addSubscription_error_when_subscription_is_implemented() {
4747
assertThrows(
4848
IllegalArgumentException.class,
49-
() -> Mqtt5Subscribe.builder().addSubscription(new CustomMqtt5Subscription()));
49+
() -> Mqtt5Subscribe.builder().addSubscription(mock(Mqtt5Subscription.class)));
5050
}
5151

5252
@Test
@@ -176,7 +176,7 @@ void addSubscriptions_error_when_subscription_is_implemented() {
176176

177177
final List<Mqtt5Subscription> subscriptions = new ArrayList<>();
178178
subscriptions.add(subscription);
179-
subscriptions.add(new CustomMqtt5Subscription());
179+
subscriptions.add(mock(Mqtt5Subscription.class));
180180

181181
final Mqtt5SubscribeBuilder.Complete builder = Mqtt5Subscribe.builder().topicFilter("first");
182182
assertThrows(IllegalArgumentException.class, () -> builder.addSubscriptions(subscriptions));

src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription;
2525
import org.jetbrains.annotations.NotNull;
2626
import org.junit.jupiter.api.Test;
27-
import util.implementations.CustomMqtt3Subscription;
2827

2928
import java.util.*;
3029
import java.util.stream.Stream;
3130

3231
import static org.junit.jupiter.api.Assertions.*;
32+
import static org.mockito.Mockito.mock;
3333

3434
/**
3535
* @author Michael Walter
@@ -45,7 +45,7 @@ void addSubscription_error_when_subscription_is_null() {
4545
void addSubscription_error_when_subscription_is_implemented() {
4646
assertThrows(
4747
IllegalArgumentException.class,
48-
() -> Mqtt3Subscribe.builder().addSubscription(new CustomMqtt3Subscription()));
48+
() -> Mqtt3Subscribe.builder().addSubscription(mock(Mqtt3Subscription.class)));
4949
}
5050

5151
@Test
@@ -164,7 +164,7 @@ void addSubscriptions_error_when_subscription_is_implemented() {
164164

165165
final List<Mqtt3Subscription> subscriptions = new ArrayList<>();
166166
subscriptions.add(subscription);
167-
subscriptions.add(new CustomMqtt3Subscription());
167+
subscriptions.add(mock(Mqtt3Subscription.class));
168168

169169
final Mqtt3SubscribeBuilder.Complete builder = Mqtt3Subscribe.builder().topicFilter("first");
170170
assertThrows(IllegalArgumentException.class, () -> builder.addSubscriptions(subscriptions));

src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import com.hivemq.client.mqtt.datatypes.MqttTopicFilter;
2222
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
2323
import org.junit.jupiter.api.Test;
24-
import util.implementations.CustomMqttTopicFilter;
2524

2625
import java.util.ArrayList;
2726
import java.util.List;
2827
import java.util.stream.Stream;
2928

3029
import static org.junit.jupiter.api.Assertions.assertEquals;
3130
import static org.junit.jupiter.api.Assertions.assertThrows;
31+
import static org.mockito.Mockito.mock;
3232

3333
/**
3434
* @author Michael Walter
@@ -50,7 +50,7 @@ void addTopicFilter_error_when_mqtt_topic_is_null() {
5050
@Test
5151
void addTopicFilter_error_when_topic_object_is_implemented() {
5252
assertThrows(IllegalArgumentException.class,
53-
() -> Mqtt5Unsubscribe.builder().addTopicFilter(new CustomMqttTopicFilter()));
53+
() -> Mqtt5Unsubscribe.builder().addTopicFilter(mock(MqttTopicFilter.class)));
5454
}
5555

5656
@Test
@@ -325,7 +325,11 @@ void addTopicFilters_nested_topic_builder_is_used_and_then_addTopicFilters() {
325325

326326
final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder()
327327
.topicFilter()
328-
.addLevel("first").addLevel("second").multiLevelWildcard().applyTopicFilter().addTopicFilters(topics)
328+
.addLevel("first")
329+
.addLevel("second")
330+
.multiLevelWildcard()
331+
.applyTopicFilter()
332+
.addTopicFilters(topics)
329333
.build();
330334

331335
final List<? extends MqttTopicFilter> unsubscribeTopics = subscribe.getTopicFilters();
@@ -366,7 +370,7 @@ void addTopicFilters_fluent_topic_is_finished_if_addTopicFilters_is_used_second_
366370
void addTopicFilters_error_when_topic_object_is_implemented() {
367371

368372
final ImmutableList<MqttTopicFilter> topicFilters =
369-
ImmutableList.of(MqttTopicFilter.of("test"), new CustomMqttTopicFilter());
373+
ImmutableList.of(MqttTopicFilter.of("test"), mock(MqttTopicFilter.class));
370374

371375
assertThrows(IllegalArgumentException.class, () -> Mqtt5Unsubscribe.builder().addTopicFilters(topicFilters));
372376
}

src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import com.hivemq.client.mqtt.datatypes.MqttTopicFilter;
2222
import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe;
2323
import org.junit.jupiter.api.Test;
24-
import util.implementations.CustomMqttTopicFilter;
2524

2625
import java.util.ArrayList;
2726
import java.util.List;
2827
import java.util.stream.Stream;
2928

3029
import static org.junit.jupiter.api.Assertions.assertEquals;
3130
import static org.junit.jupiter.api.Assertions.assertThrows;
31+
import static org.mockito.Mockito.mock;
3232

3333
/**
3434
* @author Michael Walter
@@ -50,7 +50,7 @@ void addTopicFilter_error_when_mqtt_topic_is_null() {
5050
@Test
5151
void addTopicFilter_error_when_topic_object_is_implemented() {
5252
assertThrows(IllegalArgumentException.class,
53-
() -> Mqtt3Unsubscribe.builder().addTopicFilter(new CustomMqttTopicFilter()));
53+
() -> Mqtt3Unsubscribe.builder().addTopicFilter(mock(MqttTopicFilter.class)));
5454
}
5555

5656
@Test
@@ -325,7 +325,11 @@ void addTopicFilters_nested_topic_builder_is_used_and_then_addTopicFilters() {
325325

326326
final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder()
327327
.topicFilter()
328-
.addLevel("first").addLevel("second").multiLevelWildcard().applyTopicFilter().addTopicFilters(topics)
328+
.addLevel("first")
329+
.addLevel("second")
330+
.multiLevelWildcard()
331+
.applyTopicFilter()
332+
.addTopicFilters(topics)
329333
.build();
330334

331335
final List<? extends MqttTopicFilter> unsubscribeTopics = subscribe.getTopicFilters();
@@ -366,7 +370,7 @@ void addTopicFilters_fluent_topic_is_finished_if_addTopicFilters_is_used_second_
366370
void addTopicFilters_error_when_topic_object_is_implemented() {
367371

368372
final ImmutableList<MqttTopicFilter> topicFilters =
369-
ImmutableList.of(MqttTopicFilter.of("test"), new CustomMqttTopicFilter());
373+
ImmutableList.of(MqttTopicFilter.of("test"), mock(MqttTopicFilter.class));
370374

371375
assertThrows(IllegalArgumentException.class, () -> Mqtt3Unsubscribe.builder().addTopicFilters(topicFilters));
372376
}

src/test/java/util/implementations/CustomMqtt3Subscription.java

-46
This file was deleted.

src/test/java/util/implementations/CustomMqtt5Subscription.java

-61
This file was deleted.

src/test/java/util/implementations/CustomMqttTopicFilter.java

-91
This file was deleted.

0 commit comments

Comments
 (0)