Skip to content

Commit 6d24a2d

Browse files
James RobertsonJames Robertson
James Robertson
authored and
James Robertson
committed
tidy tests
1 parent 91ec311 commit 6d24a2d

File tree

15 files changed

+202
-83
lines changed

15 files changed

+202
-83
lines changed

‎samples/.idea/compiler.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/announcements/src/main/java/Sendbird.java‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,31 @@ public SendBirdGroupChannel viewChannelByUrl(String channelUrl){
3838
return null;
3939
}
4040

41-
public GcListChannelsResponse listChannels(){
41+
public OcDeleteChannelByUrl200Response deleteChannelByUrl(String channelUrl){
42+
43+
try {
44+
OcDeleteChannelByUrl200Response result = apiInstance.gcDeleteChannelByUrl(apiToken, channelUrl);
45+
return result;
46+
} catch (ApiException e) {
47+
System.err.println("Exception when calling GroupChannelApi#gcViewChannelByUrl");
48+
System.err.println("Status code: " + e.getCode());
49+
System.err.println("Reason: " + e.getResponseBody());
50+
System.err.println("Response headers: " + e.getResponseHeaders());
51+
e.printStackTrace();
52+
}
53+
54+
return null;
55+
}
56+
57+
public GcListChannelsResponse listChannels(String nameStartswith){
4258
String token = null; // String |
4359
Integer limit = 10; // Integer |
44-
String distinctMode = "distinct"; // String |
60+
String distinctMode = "all"; // String |
4561
String publicMode = null; // String |
4662
String superMode = null; // String |
4763
Integer createdAfter = null; // Integer |
4864
Integer createdBefore = null; // Integer |
49-
Boolean showEmpty = false; // Boolean |
65+
Boolean showEmpty = true; // Boolean |
5066
Boolean showMember = true; // Boolean |
5167
Boolean showDeliveryReceipt = false; // Boolean |
5268
Boolean showReadReceipt = true; // Boolean |
@@ -58,8 +74,8 @@ public GcListChannelsResponse listChannels(){
5874
String customTypeStartswith = null; // String |
5975
String channelUrls = null; // String |
6076
String name = null; // String |
77+
// String nameStartswith = null; // String |
6178
String nameContains = null; // String |
62-
String nameStartswith = null; // String |
6379
String membersExactlyIn = null; // String |
6480
String membersIncludeIn = null; // String |
6581
String queryType = null; // String |
@@ -97,8 +113,7 @@ public GcListChannelsResponse listChannels(){
97113

98114
public SendBirdGroupChannel createChannel(List userIds){
99115
GcCreateChannelData gcCreateChannelData = new GcCreateChannelData();
100-
gcCreateChannelData.name("JAVA-SDK-GROUP");
101-
116+
gcCreateChannelData.name("SB::test-gc::Java::e2e::"+UUID.randomUUID().toString());
102117

103118
gcCreateChannelData.userIds(userIds);
104119
gcCreateChannelData.isDistinct(false);
@@ -174,7 +189,7 @@ public User(ApiClient defaultClient){
174189
public SendBirdUser createUser(){
175190
CreateUserData createUserData = new CreateUserData(); // CreateUserData |
176191
createUserData.userId(UUID.randomUUID().toString());
177-
createUserData.nickname("nickname");
192+
createUserData.nickname("SB::test-user::Java::e2e::"+UUID.randomUUID().toString());
178193
try {
179194
SendBirdUser result = apiInstance.createUser(apiToken, createUserData);
180195
return result;
@@ -218,7 +233,7 @@ public SendBirdUser deleteUserById(String userId){
218233
return null;
219234
}
220235

221-
public ListUsersResponse listUsers(){
236+
public ListUsersResponse listUsers(String nicknameStartswith){
222237

223238
try {
224239
String token = null;
@@ -227,7 +242,7 @@ public ListUsersResponse listUsers(){
227242
Boolean showBot = true;
228243
String userIds = null;
229244
String nickname = null;
230-
String nicknameStartswith = null;
245+
// String nicknameStartswith = nicknameStartswith;
231246
String metadatakey = null;
232247
String metadatavaluesIn = null;
233248
ListUsersResponse result = apiInstance.listUsers(apiToken, token, limit, activeMode, showBot, userIds, nickname, nicknameStartswith, metadatakey, metadatavaluesIn);

‎samples/announcements/src/test/java/AnnouncementsTest.java‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,47 @@
11
import org.junit.jupiter.api.DisplayName;
22
import org.junit.jupiter.api.Test;
3-
import org.openapitools.client.model.SendBirdUser;
3+
import org.junit.jupiter.api.AfterAll;
4+
import org.openapitools.client.model.*;
5+
import org.sendbird.client.ApiClient;
6+
import org.sendbird.client.Configuration;
47

5-
import java.math.BigDecimal;
6-
7-
import static org.junit.jupiter.api.Assertions.*;
88

99
class AnnouncementsTest {
10+
11+
1012
@Test
1113
@DisplayName("send announcement")
1214
void testSendAnnouncement() {
1315
Announcements announcements = new Announcements();
1416
announcements.sendAnnouncement();
17+
1518
}
1619

20+
21+
@AfterAll
22+
public static void tearDown() {
23+
System.out.println("AbstractBaseTest.tearDown");
24+
ApiClient defaultClient = Configuration.getDefaultApiClient();
25+
defaultClient.setBasePath("https://api-"+Config.appId+".sendbird.com");
26+
User user = new User(defaultClient);
27+
GroupChannel groupChannel = new GroupChannel(defaultClient);
28+
29+
ListUsersResponse users = user.listUsers("SB::test-user::Java::e2e::");
30+
for (int i = 0; i < users.getUsers().size(); i++) {
31+
String userIdToDelete = users.getUsers().get(i).getUserId();
32+
user.deleteUserById(userIdToDelete);
33+
}
34+
35+
GcListChannelsResponse groupChannelResponse = groupChannel.listChannels("SB::test-gc::Java::e2e::");
36+
System.out.println(groupChannelResponse);
37+
38+
for (int i = 0; i < groupChannelResponse.getChannels().size(); i++) {
39+
String channelUrlToDelete = groupChannelResponse.getChannels().get(i).getChannelUrl();
40+
groupChannel.deleteChannelByUrl(channelUrlToDelete);
41+
}
42+
43+
}
44+
45+
46+
1747
}

‎samples/authentication/src/main/java/Config.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ public class Config {
55
public static String appId = "";
66

77
}
8+

‎samples/authentication/src/main/java/Sendbird.java‎

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public User(ApiClient defaultClient){
2121
public SendBirdUser createUser(){
2222
CreateUserData createUserData = new CreateUserData(); // CreateUserData |
2323
createUserData.userId(UUID.randomUUID().toString());
24-
createUserData.nickname("nickname");
24+
createUserData.nickname("SB::test-user::Java::e2e::"+UUID.randomUUID().toString());
2525
try {
2626
SendBirdUser result = apiInstance.createUser(apiToken, createUserData);
2727
return result;
@@ -65,7 +65,7 @@ public SendBirdUser deleteUserById(String userId){
6565
return null;
6666
}
6767

68-
public ListUsersResponse listUsers(){
68+
public ListUsersResponse listUsers(String nicknameStartswith){
6969

7070
try {
7171
String token = null;
@@ -74,7 +74,7 @@ public ListUsersResponse listUsers(){
7474
Boolean showBot = true;
7575
String userIds = null;
7676
String nickname = null;
77-
String nicknameStartswith = null;
77+
// String nicknameStartswith = null;
7878
String metadatakey = null;
7979
String metadatavaluesIn = null;
8080
ListUsersResponse result = apiInstance.listUsers(apiToken, token, limit, activeMode, showBot, userIds, nickname, nicknameStartswith, metadatakey, metadatavaluesIn);
@@ -124,47 +124,3 @@ public AddRegistrationOrDeviceTokenResponse addRegistrationOrDeviceToken(String
124124
return null;
125125
}
126126
}
127-
128-
class Announcement {
129-
ApiClient defaultClient;
130-
String apiToken;
131-
AnnouncementApi apiInstance;
132-
133-
public Announcement(ApiClient defaultClient) {
134-
System.out.println("constructor");
135-
apiInstance = new AnnouncementApi(defaultClient);
136-
apiToken = Config.apiToken;
137-
}
138-
139-
public ScheduleAnnouncementResponse scheduleAnnouncement(String message, String type, String userId, String content, String targetAt, List<String> targetList, String channelType){
140-
ScheduleAnnouncementData scheduleAnnouncementData = new ScheduleAnnouncementData();
141-
ScheduleAnnouncementDataMessage scheduleAnnouncementDataMessage = new ScheduleAnnouncementDataMessage();
142-
143-
scheduleAnnouncementDataMessage.type(type);
144-
scheduleAnnouncementDataMessage.userId(userId);
145-
scheduleAnnouncementDataMessage.content(content);
146-
147-
148-
scheduleAnnouncementData.message(scheduleAnnouncementDataMessage);
149-
scheduleAnnouncementData.messageType(type);
150-
scheduleAnnouncementData.userId(userId);
151-
scheduleAnnouncementData.content(content);
152-
scheduleAnnouncementData.targetAt(targetAt);
153-
scheduleAnnouncementData.targetList(targetList);
154-
scheduleAnnouncementData.targetChannelType(channelType);
155-
156-
System.out.println(scheduleAnnouncementData);
157-
158-
try {
159-
ScheduleAnnouncementResponse result = apiInstance.scheduleAnnouncement(apiToken, scheduleAnnouncementData);
160-
System.out.println(result);
161-
} catch (ApiException e) {
162-
System.err.println("Exception when calling MessageApi#scheduleAnnouncement");
163-
System.err.println("Status code: " + e.getCode());
164-
System.err.println("Reason: " + e.getResponseBody());
165-
System.err.println("Response headers: " + e.getResponseHeaders());
166-
e.printStackTrace();
167-
}
168-
return null;
169-
}
170-
}

‎samples/authentication/src/test/java/AuthenticationTest.java‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import org.junit.jupiter.api.AfterAll;
12
import org.junit.jupiter.api.DisplayName;
23
import org.junit.jupiter.api.Test;
3-
import org.openapitools.client.model.SendBirdUser;
4+
import org.openapitools.client.model.*;
5+
import org.sendbird.client.ApiClient;
6+
import org.sendbird.client.Configuration;
47

58
import java.math.BigDecimal;
69

@@ -15,5 +18,21 @@ void testGenerateSessionToken() {
1518
auth.generateSessionToken();
1619
}
1720

21+
@AfterAll
22+
public static void tearDown() {
23+
System.out.println("AbstractBaseTest.tearDown");
24+
ApiClient defaultClient = Configuration.getDefaultApiClient();
25+
defaultClient.setBasePath("https://api-"+Config.appId+".sendbird.com");
26+
User user = new User(defaultClient);
27+
28+
ListUsersResponse users = user.listUsers("SB::test-user::Java::e2e::");
29+
30+
for (int i = 0; i < users.getUsers().size(); i++) {
31+
String userIdToDelete = users.getUsers().get(i).getUserId();
32+
user.deleteUserById(userIdToDelete);
33+
}
34+
35+
}
36+
1837

1938
}

‎samples/message-count/src/main/java/Sendbird.java‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ public GroupChannel(ApiClient defaultClient){
1818

1919
}
2020

21+
public OcDeleteChannelByUrl200Response deleteChannelByUrl(String channelUrl){
22+
23+
try {
24+
OcDeleteChannelByUrl200Response result = apiInstance.gcDeleteChannelByUrl(apiToken, channelUrl);
25+
return result;
26+
} catch (ApiException e) {
27+
System.err.println("Exception when calling GroupChannelApi#gcViewChannelByUrl");
28+
System.err.println("Status code: " + e.getCode());
29+
System.err.println("Reason: " + e.getResponseBody());
30+
System.err.println("Response headers: " + e.getResponseHeaders());
31+
e.printStackTrace();
32+
}
33+
34+
return null;
35+
}
36+
2137
public SendBirdGroupChannel viewChannelByUrl(String channelUrl){
2238
Boolean showDeliveryReceipt = false; // Boolean |
2339
Boolean showReadReceipt = false; // Boolean |
@@ -38,15 +54,15 @@ public SendBirdGroupChannel viewChannelByUrl(String channelUrl){
3854
return null;
3955
}
4056

41-
public GcListChannelsResponse listChannels(){
57+
public GcListChannelsResponse listChannels(String nameStartswith){
4258
String token = null; // String |
4359
Integer limit = 10; // Integer |
44-
String distinctMode = "distinct"; // String |
60+
String distinctMode = "all"; // String |
4561
String publicMode = null; // String |
4662
String superMode = null; // String |
4763
Integer createdAfter = null; // Integer |
4864
Integer createdBefore = null; // Integer |
49-
Boolean showEmpty = false; // Boolean |
65+
Boolean showEmpty = true; // Boolean |
5066
Boolean showMember = true; // Boolean |
5167
Boolean showDeliveryReceipt = false; // Boolean |
5268
Boolean showReadReceipt = true; // Boolean |
@@ -59,7 +75,7 @@ public GcListChannelsResponse listChannels(){
5975
String channelUrls = null; // String |
6076
String name = null; // String |
6177
String nameContains = null; // String |
62-
String nameStartswith = null; // String |
78+
// String nameStartswith = null; // String |
6379
String membersExactlyIn = null; // String |
6480
String membersIncludeIn = null; // String |
6581
String queryType = null; // String |
@@ -97,7 +113,7 @@ public GcListChannelsResponse listChannels(){
97113

98114
public SendBirdGroupChannel createChannel(List userIds){
99115
GcCreateChannelData gcCreateChannelData = new GcCreateChannelData();
100-
gcCreateChannelData.name("JAVA-SDK-GROUP");
116+
gcCreateChannelData.name("SB::test-gc::Java::e2e::"+UUID.randomUUID().toString());
101117

102118

103119
gcCreateChannelData.userIds(userIds);
@@ -175,7 +191,7 @@ public User(ApiClient defaultClient){
175191
public SendBirdUser createUser(){
176192
CreateUserData createUserData = new CreateUserData(); // CreateUserData |
177193
createUserData.userId(UUID.randomUUID().toString());
178-
createUserData.nickname("nickname");
194+
createUserData.nickname("SB::test-user::Java::e2e::"+UUID.randomUUID().toString());
179195
try {
180196
SendBirdUser result = apiInstance.createUser(apiToken, createUserData);
181197
return result;
@@ -219,7 +235,7 @@ public SendBirdUser deleteUserById(String userId){
219235
return null;
220236
}
221237

222-
public ListUsersResponse listUsers(){
238+
public ListUsersResponse listUsers(String nicknameStartswith){
223239

224240
try {
225241
String token = null;
@@ -228,7 +244,7 @@ public ListUsersResponse listUsers(){
228244
Boolean showBot = true;
229245
String userIds = null;
230246
String nickname = null;
231-
String nicknameStartswith = null;
247+
// String nicknameStartswith = null;
232248
String metadatakey = null;
233249
String metadatavaluesIn = null;
234250
ListUsersResponse result = apiInstance.listUsers(apiToken, token, limit, activeMode, showBot, userIds, nickname, nicknameStartswith, metadatakey, metadatavaluesIn);

‎samples/message-count/src/test/java/MessageCountTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
import org.junit.jupiter.api.AfterAll;
12
import org.junit.jupiter.api.DisplayName;
23
import org.junit.jupiter.api.Test;
4+
import org.openapitools.client.model.GcListChannelsResponse;
5+
import org.openapitools.client.model.ListUsersResponse;
36
import org.openapitools.client.model.SendBirdUser;
7+
import org.sendbird.client.ApiClient;
8+
import org.sendbird.client.Configuration;
49

510
import java.math.BigDecimal;
611

@@ -17,4 +22,28 @@ void testCountUnreadMessages() {
1722

1823
}
1924

25+
@AfterAll
26+
public static void tearDown() {
27+
System.out.println("AbstractBaseTest.tearDown");
28+
ApiClient defaultClient = Configuration.getDefaultApiClient();
29+
defaultClient.setBasePath("https://api-"+Config.appId+".sendbird.com");
30+
User user = new User(defaultClient);
31+
GroupChannel groupChannel = new GroupChannel(defaultClient);
32+
33+
ListUsersResponse users = user.listUsers("SB::test-user::Java::e2e::");
34+
for (int i = 0; i < users.getUsers().size(); i++) {
35+
String userIdToDelete = users.getUsers().get(i).getUserId();
36+
user.deleteUserById(userIdToDelete);
37+
}
38+
39+
GcListChannelsResponse groupChannelResponse = groupChannel.listChannels("SB::test-gc::Java::e2e::");
40+
System.out.println(groupChannelResponse);
41+
42+
for (int i = 0; i < groupChannelResponse.getChannels().size(); i++) {
43+
String channelUrlToDelete = groupChannelResponse.getChannels().get(i).getChannelUrl();
44+
groupChannel.deleteChannelByUrl(channelUrlToDelete);
45+
}
46+
47+
}
48+
2049
}

0 commit comments

Comments
 (0)