Skip to content

Commit fd3df0c

Browse files
kevinkowakevinkowa
committed
test(integration tests): new integration tests for assistant-v1, disco-v2, and lang-translator-v3
1 parent 1d0ca4e commit fd3df0c

File tree

5 files changed

+639
-240
lines changed

5 files changed

+639
-240
lines changed

‎assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java‎

Lines changed: 61 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,8 @@
1515
import static org.junit.Assert.assertNotNull;
1616
import static org.junit.Assert.assertTrue;
1717

18-
import com.ibm.watson.assistant.v2.model.CreateSessionOptions;
19-
import com.ibm.watson.assistant.v2.model.DeleteSessionOptions;
20-
import com.ibm.watson.assistant.v2.model.MessageContext;
21-
import com.ibm.watson.assistant.v2.model.MessageContextStateless;
22-
import com.ibm.watson.assistant.v2.model.MessageInput;
23-
import com.ibm.watson.assistant.v2.model.MessageInputOptions;
24-
import com.ibm.watson.assistant.v2.model.MessageInputOptionsStateless;
25-
import com.ibm.watson.assistant.v2.model.MessageInputStateless;
26-
import com.ibm.watson.assistant.v2.model.MessageOptions;
27-
import com.ibm.watson.assistant.v2.model.MessageResponse;
28-
import com.ibm.watson.assistant.v2.model.MessageResponseStateless;
29-
import com.ibm.watson.assistant.v2.model.MessageStatelessOptions;
30-
import com.ibm.watson.assistant.v2.model.RuntimeResponseGeneric;
31-
import com.ibm.watson.assistant.v2.model.SessionResponse;
18+
import com.ibm.watson.assistant.v2.model.*;
19+
import com.ibm.watson.assistant.v2.model.ListLogsOptions.Builder;
3220
import com.ibm.watson.common.RetryRunner;
3321
import java.util.Arrays;
3422
import java.util.List;
@@ -60,32 +48,32 @@ public void setUp() throws Exception {
6048
public void testSendMessages() {
6149
// get session ID
6250
CreateSessionOptions createSessionOptions =
63-
new CreateSessionOptions.Builder().assistantId(assistantId).build();
51+
new CreateSessionOptions.Builder().assistantId(assistantId).build();
6452
SessionResponse sessionResponse =
65-
service.createSession(createSessionOptions).execute().getResult();
53+
service.createSession(createSessionOptions).execute().getResult();
6654
String sessionId = sessionResponse.getSessionId();
6755

6856
final List<String> messages =
69-
Arrays.asList("I want some pizza.", "I'd like 3 pizzas.", "Large");
57+
Arrays.asList("I want some pizza.", "I'd like 3 pizzas.", "Large");
7058
MessageContext context = new MessageContext.Builder().build();
7159

7260
try {
7361
// send messages
7462
for (String message : messages) {
7563
MessageInputOptions inputOptions = new MessageInputOptions.Builder().debug(true).build();
7664
MessageInput input =
77-
new MessageInput.Builder()
78-
.text(message)
79-
.messageType(MessageInput.MessageType.TEXT)
80-
.options(inputOptions)
81-
.build();
65+
new MessageInput.Builder()
66+
.text(message)
67+
.messageType(MessageInput.MessageType.TEXT)
68+
.options(inputOptions)
69+
.build();
8270
MessageOptions messageOptions =
83-
new MessageOptions.Builder()
84-
.assistantId(assistantId)
85-
.sessionId(sessionId)
86-
.input(input)
87-
.context(context)
88-
.build();
71+
new MessageOptions.Builder()
72+
.assistantId(assistantId)
73+
.sessionId(sessionId)
74+
.input(input)
75+
.context(context)
76+
.build();
8977
MessageResponse messageResponse = service.message(messageOptions).execute().getResult();
9078

9179
// message assertions
@@ -108,7 +96,7 @@ public void testSendMessages() {
10896
} finally {
10997
// delete session
11098
DeleteSessionOptions deleteSessionOptions =
111-
new DeleteSessionOptions.Builder().assistantId(assistantId).sessionId(sessionId).build();
99+
new DeleteSessionOptions.Builder().assistantId(assistantId).sessionId(sessionId).build();
112100
service.deleteSession(deleteSessionOptions).execute();
113101
}
114102
}
@@ -118,34 +106,34 @@ public void testSendMessages() {
118106
public void testSendMessageStateless() {
119107
// get session ID
120108
CreateSessionOptions createSessionOptions =
121-
new CreateSessionOptions.Builder().assistantId(assistantId).build();
109+
new CreateSessionOptions.Builder().assistantId(assistantId).build();
122110
SessionResponse sessionResponse =
123-
service.createSession(createSessionOptions).execute().getResult();
111+
service.createSession(createSessionOptions).execute().getResult();
124112
String sessionId = sessionResponse.getSessionId();
125113

126114
final List<String> messages =
127-
Arrays.asList("I want some pizza.", "I'd like 3 pizzas.", "Large");
115+
Arrays.asList("I want some pizza.", "I'd like 3 pizzas.", "Large");
128116
MessageContextStateless context = new MessageContextStateless.Builder().build();
129117

130118
try {
131119
// send messages
132120
for (String message : messages) {
133121
MessageInputOptionsStateless inputOptions =
134-
new MessageInputOptionsStateless.Builder().debug(true).build();
122+
new MessageInputOptionsStateless.Builder().debug(true).build();
135123
MessageInputStateless input =
136-
new MessageInputStateless.Builder()
137-
.text(message)
138-
.messageType(MessageInput.MessageType.TEXT)
139-
.options(inputOptions)
140-
.build();
124+
new MessageInputStateless.Builder()
125+
.text(message)
126+
.messageType(MessageInput.MessageType.TEXT)
127+
.options(inputOptions)
128+
.build();
141129
MessageStatelessOptions messageOptions =
142-
new MessageStatelessOptions.Builder()
143-
.assistantId(assistantId)
144-
.input(input)
145-
.context(context)
146-
.build();
130+
new MessageStatelessOptions.Builder()
131+
.assistantId(assistantId)
132+
.input(input)
133+
.context(context)
134+
.build();
147135
MessageResponseStateless messageResponse =
148-
service.messageStateless(messageOptions).execute().getResult();
136+
service.messageStateless(messageOptions).execute().getResult();
149137

150138
// message assertions
151139
List<RuntimeResponseGeneric> genericResponses = messageResponse.getOutput().getGeneric();
@@ -167,8 +155,36 @@ public void testSendMessageStateless() {
167155
} finally {
168156
// delete session
169157
DeleteSessionOptions deleteSessionOptions =
170-
new DeleteSessionOptions.Builder().assistantId(assistantId).sessionId(sessionId).build();
158+
new DeleteSessionOptions.Builder().assistantId(assistantId).sessionId(sessionId).build();
171159
service.deleteSession(deleteSessionOptions).execute();
172160
}
173161
}
162+
163+
/** Test List Logs. */
164+
//@Test
165+
public void testListLogs() {
166+
// list logs sorted by timestamp and that contain the text Hello
167+
Builder builder = new ListLogsOptions.Builder();
168+
builder.assistantId(assistantId);
169+
builder.sort("request_timestamp");
170+
builder.filter("request.input.text::\"Hello\"");
171+
builder.pageLimit(5);
172+
173+
LogCollection logCollection = service.listLogs(builder.build()).execute().getResult();
174+
175+
assertNotNull(logCollection);
176+
assertTrue(logCollection.getLogs().get(0).getRequest().input().text().contains("Hello"));
177+
assertTrue(logCollection.getLogs().get(0).getLanguage().equals("en"));
178+
}
179+
180+
/** Test Delete User Data. */
181+
/*
182+
@Test
183+
public void testDeleteUserData(){
184+
String customerIdExample = "";
185+
Response<Void> deleteUserDataResponse = service.deleteUserData(new DeleteUserDataOptions.Builder().customerId(customerIdExample).build()).execute();
186+
187+
assertTrue(deleteUserDataResponse.getStatusCode() == 204);
188+
}
189+
*/
174190
}

‎assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@ public void setUp() throws Exception {
5858
super.setUp();
5959
String apiKey = getProperty("assistant.apikey");
6060
assistantId = getProperty("assistant.assistant_id");
61+
// String iam_url = getProperty("assistant.auth_url");
6162

6263
Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
6364

65+
// Authenticator authenticator = new IamAuthenticator(apiKey, iam_url, null, null, false, null);
66+
6467
Authenticator authenticator = new IamAuthenticator(apiKey);
6568
service = new Assistant("2019-02-28", authenticator);
6669
service.setServiceUrl(getProperty("assistant.url"));

0 commit comments

Comments
 (0)