Skip to content

Commit 16d0cc2

Browse files
committed
modify PluginMockFactory
1 parent b511583 commit 16d0cc2

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

src/test/java/org/hydev/mcpm/client/database/DatabaseInteractorUpdateTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public static void setup() {
2929

3030
smallInteractor = PluginMockFactory.interactor(List.of(
3131
PluginMockFactory.model(1),
32-
PluginMockFactory.model(2, "name", List.of("ver.1", "ver.2")),
33-
PluginMockFactory.model(3, "test", List.of("update", "update update")),
34-
PluginMockFactory.model(4, "test", List.of("1.0", "2.0", "3.0"))
32+
PluginMockFactory.model(2, "name", null, List.of("ver.1", "ver.2"), null),
33+
PluginMockFactory.model(3, "test", null, List.of("update", "update update"), null),
34+
PluginMockFactory.model(4, "test", null, List.of("1.0", "2.0", "3.0"), null)
3535
));
3636
}
3737

src/test/java/org/hydev/mcpm/client/database/SearchInteractorTest.java

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import java.util.Optional;
1313
import java.util.stream.Collectors;
1414

15+
import static org.junit.jupiter.api.Assertions.assertEquals;
16+
1517
/**
1618
* Test suite for the SearchInteractor class.
1719
*
@@ -52,65 +54,65 @@ void testSearchByNameSuccessMatch() {
5254
var result = database.search(
5355
new SearchPackagesInput(SearchPackagesType.BY_NAME, "multiverse-core", true));
5456

55-
assert result.state() == SearchPackagesResult.State.SUCCESS;
57+
assertEquals(result.state(), SearchPackagesResult.State.SUCCESS);
5658

5759
var text = formatStr(result, ", ");
58-
assert text.equals("Multiverse-Core");
60+
assertEquals(text, "Multiverse-Core");
5961
}
6062

6163
@Test
6264
void testSearchByNameSuccessNoMatch() {
6365
var result = database.search(
6466
new SearchPackagesInput(SearchPackagesType.BY_NAME, "pp", true));
6567

66-
assert result.state() == SearchPackagesResult.State.SUCCESS;
68+
assertEquals(result.state(), SearchPackagesResult.State.SUCCESS);
6769

6870
var text = formatStr(result, ", ");
69-
assert text.equals("");
71+
assertEquals(text, "");
7072
}
7173

7274
@Test
7375
void testSearchByKeywordSuccessMatch() {
7476
var result = database.search(
7577
new SearchPackagesInput(SearchPackagesType.BY_KEYWORD, "players and", true));
7678

77-
assert result.state() == SearchPackagesResult.State.SUCCESS;
79+
assertEquals(result.state(), SearchPackagesResult.State.SUCCESS);
7880

7981
var text = formatStr(result, ", ");
80-
assert text.equals("Holographic Displays, WorldGuard");
82+
assertEquals(text, "Holographic Displays, WorldGuard");
8183
}
8284

8385
@Test
8486
void testSearchByKeywordSuccessNoMatch() {
8587
var result = database.search(
8688
new SearchPackagesInput(SearchPackagesType.BY_KEYWORD, "pp", true));
8789

88-
assert result.state() == SearchPackagesResult.State.SUCCESS;
90+
assertEquals(result.state(), SearchPackagesResult.State.SUCCESS);
8991

9092
var text = formatStr(result, ", ");
91-
assert text.equals("");
93+
assertEquals(text, "");
9294
}
9395

9496
@Test
9597
void testSearchByCommandSuccessMatch() {
9698
var result = database.search(
9799
new SearchPackagesInput(SearchPackagesType.BY_COMMAND, "/ungod", true));
98100

99-
assert result.state() == SearchPackagesResult.State.SUCCESS;
101+
assertEquals(result.state(), SearchPackagesResult.State.SUCCESS);
100102

101103
var text = formatStr(result, ", ");
102-
assert text.equals("WorldGuard, Holographic Displays");
104+
assertEquals(text, "WorldGuard, Holographic Displays");
103105
}
104106

105107
@Test
106108
void testSearchByCommandSuccessNoMatch() {
107109
var result = database.search(
108110
new SearchPackagesInput(SearchPackagesType.BY_COMMAND, "pp", true));
109111

110-
assert result.state() == SearchPackagesResult.State.SUCCESS;
112+
assertEquals(result.state(), SearchPackagesResult.State.SUCCESS);
111113

112114
var text = formatStr(result, ", ");
113-
assert text.equals("");
115+
assertEquals(text, "");
114116
}
115117

116118
@Test
@@ -122,9 +124,9 @@ void testInvalidSearch() {
122124
var result3 = database.search(
123125
new SearchPackagesInput(SearchPackagesType.BY_COMMAND, "", true));
124126

125-
assert result1.state() == SearchPackagesResult.State.INVALID_INPUT;
126-
assert result2.state() == SearchPackagesResult.State.INVALID_INPUT;
127-
assert result3.state() == SearchPackagesResult.State.INVALID_INPUT;
127+
assertEquals(result1.state(), SearchPackagesResult.State.INVALID_INPUT);
128+
assertEquals(result2.state(), SearchPackagesResult.State.INVALID_INPUT);
129+
assertEquals(result3.state(), SearchPackagesResult.State.INVALID_INPUT);
128130
assert result1.plugins().isEmpty();
129131
assert result2.plugins().isEmpty();
130132
assert result3.plugins().isEmpty();

0 commit comments

Comments
 (0)