Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 05c7438

Browse files
author
BruceHaley
authored
Fix failing tests in BotBuilder-Java-4.0-daily-yaml (#1500)
* Add maven-javadoc-plugin skip (605) * Add maven-javadoc-plugin skip (217) * Add maven-javadoc-plugin skip (158) * Undo 2 skips, keep the one at 605 * Add Publish surefire-reports to artifacts * Tweak publish surefire * Try timeout 1 ms instead of 0 * Add .delay(500) to qnaMakerTraceActivity() * Try timeout 10 ms instead of 1 * Disable QnAMakerTests * Disable 2 OAuthPromptTimesOut_ tests * Disable another OAuthPromptTimesOut_ test * Add back 1 QnAMakerTests test * Cleanup * Try no longer skipping javadoc * Add back the .send delay * Run QnAMakerTests with debug logging * Pring method names * Add PrintMethodName() * Trying console writes * Clean up PrintMethodName * Switch back to System.out.println * Clean up PrintMethodName 2 * Uncomment assertEquals("BaseCamp: * Turn debug off * PrintMethodName tweak * Back to <include>**/*Test*.java * Re-enable OAuthPromptTimesOut_ tests * Delete log file * Try adding a delay to PromptTimeoutEndsDialogTest * Add another delay to PromptTimeoutEndsDialogTest * Add PrintMethodName(); to TranscriptStoreTests * Add delay to testDateLogUpdateActivities * Add another delay to testDateLogUpdateActivities * Add another sleep to testDateLogUpdateActivities * Add publish surefire-reports for bot-azure * Adjust delays in testDateLogUpdateActivities * Remove publish artifacts * Remove sleep, readjust delays to testDateLogUpdateActivities * Revert to commit c7ea9ff
1 parent 98b1767 commit 05c7438

File tree

4 files changed

+118
-3
lines changed

4 files changed

+118
-3
lines changed

‎libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java‎

Lines changed: 90 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ private String getTrainRequestUrl() {
107107

108108
@Test
109109
public void qnaMakerTraceActivity() {
110+
PrintMethodName();
111+
110112
MockWebServer mockWebServer = new MockWebServer();
111113
try {
112114
QnAMaker qna = this.qnaReturnsAnswer(mockWebServer);
@@ -139,6 +141,7 @@ public void qnaMakerTraceActivity() {
139141
Assert.assertTrue(activity.isType(ActivityTypes.TYPING));
140142
})
141143
.assertReply("echo:how do I clean the stove?")
144+
.delay(500) // This delay avoids the assert immediately above occasionally getting "bar".
142145
.send("bar")
143146
.assertReply(activity -> Assert.assertTrue(activity.isType(ActivityTypes.TYPING)))
144147
.assertReply("echo:bar")
@@ -170,6 +173,8 @@ public void qnaMakerTraceActivity() {
170173

171174
@Test
172175
public void qnaMakerTraceActivityEmptyText() {
176+
PrintMethodName();
177+
173178
MockWebServer mockWebServer = new MockWebServer();
174179
try {
175180
// Get basic Qna
@@ -199,6 +204,8 @@ public void qnaMakerTraceActivityEmptyText() {
199204

200205
@Test
201206
public void qnaMakerTraceActivityNullText() {
207+
PrintMethodName();
208+
202209
MockWebServer mockWebServer = new MockWebServer();
203210
try {
204211
// Get basic Qna
@@ -228,6 +235,8 @@ public void qnaMakerTraceActivityNullText() {
228235

229236
@Test
230237
public void qnaMakerTraceActivityNullContext() {
238+
PrintMethodName();
239+
231240
MockWebServer mockWebServer = new MockWebServer();
232241
try {
233242
// Get basic Qna
@@ -247,6 +256,8 @@ public void qnaMakerTraceActivityNullContext() {
247256

248257
@Test
249258
public void qnaMakerTraceActivityBadMessage() {
259+
PrintMethodName();
260+
250261
MockWebServer mockWebServer = new MockWebServer();
251262
try {
252263
// Get basic Qna
@@ -276,6 +287,8 @@ public void qnaMakerTraceActivityBadMessage() {
276287

277288
@Test
278289
public void qnaMakerTraceActivityNullActivity() {
290+
PrintMethodName();
291+
279292
MockWebServer mockWebServer = new MockWebServer();
280293
try {
281294
// Get basic Qna
@@ -299,6 +312,8 @@ public void qnaMakerTraceActivityNullActivity() {
299312

300313
@Test
301314
public void qnaMakerReturnsAnswer() {
315+
PrintMethodName();
316+
302317
MockWebServer mockWebServer = new MockWebServer();
303318
try {
304319
QnAMaker qna = this.qnaReturnsAnswer(mockWebServer);
@@ -319,6 +334,8 @@ public void qnaMakerReturnsAnswer() {
319334

320335
@Test
321336
public void qnaMakerReturnsAnswerRaw() {
337+
PrintMethodName();
338+
322339
MockWebServer mockWebServer = new MockWebServer();
323340
try {
324341
QnAMaker qna = this.qnaReturnsAnswer(mockWebServer);
@@ -344,6 +361,8 @@ public void qnaMakerReturnsAnswerRaw() {
344361

345362
@Test
346363
public void qnaMakerLowScoreVariation() {
364+
PrintMethodName();
365+
347366
MockWebServer mockWebServer = new MockWebServer();
348367
try {
349368
String content = readFileContent("QnaMaker_TopNAnswer.json");
@@ -394,6 +413,8 @@ public void qnaMakerLowScoreVariation() {
394413

395414
@Test
396415
public void qnaMakerCallTrain() {
416+
PrintMethodName();
417+
397418
MockWebServer mockWebServer = new MockWebServer();
398419
ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
399420
String url = this.getTrainRequestUrl();
@@ -441,6 +462,8 @@ public void qnaMakerCallTrain() {
441462

442463
@Test
443464
public void qnaMakerReturnsAnswerConfiguration() {
465+
PrintMethodName();
466+
444467
MockWebServer mockWebServer = new MockWebServer();
445468
try {
446469
QnAMaker qna = this.qnaReturnsAnswer(mockWebServer);
@@ -462,6 +485,8 @@ public void qnaMakerReturnsAnswerConfiguration() {
462485

463486
@Test
464487
public void qnaMakerReturnsAnswerWithFiltering() {
488+
PrintMethodName();
489+
465490
MockWebServer mockWebServer = new MockWebServer();
466491
try {
467492
String content = readFileContent("QnaMaker_UsesStrictFilters_ToReturnAnswer.json");
@@ -520,6 +545,8 @@ public void qnaMakerReturnsAnswerWithFiltering() {
520545

521546
@Test
522547
public void qnaMakerSetScoreThresholdWhenThresholdIsZero() {
548+
PrintMethodName();
549+
523550
MockWebServer mockWebServer = new MockWebServer();
524551
try {
525552
String content = readFileContent("QnaMaker_ReturnsAnswer.json");
@@ -560,6 +587,8 @@ public void qnaMakerSetScoreThresholdWhenThresholdIsZero() {
560587

561588
@Test
562589
public void qnaMakerTestThreshold() {
590+
PrintMethodName();
591+
563592
MockWebServer mockWebServer = new MockWebServer();
564593
try {
565594
String content = readFileContent("QnaMaker_TestThreshold.json");
@@ -598,6 +627,8 @@ public void qnaMakerTestThreshold() {
598627

599628
@Test
600629
public void qnaMakerTestScoreThresholdTooLargeOutOfRange() {
630+
PrintMethodName();
631+
601632
QnAMakerEndpoint qnAMakerEndpoint = new QnAMakerEndpoint();
602633
qnAMakerEndpoint.setKnowledgeBaseId(knowledgeBaseId);
603634
qnAMakerEndpoint.setEndpointKey(endpointKey);
@@ -612,6 +643,8 @@ public void qnaMakerTestScoreThresholdTooLargeOutOfRange() {
612643

613644
@Test
614645
public void qnaMakerTestScoreThresholdTooSmallOutOfRange() {
646+
PrintMethodName();
647+
615648
QnAMakerEndpoint qnAMakerEndpoint = new QnAMakerEndpoint();
616649
qnAMakerEndpoint.setKnowledgeBaseId(knowledgeBaseId);
617650
qnAMakerEndpoint.setEndpointKey(endpointKey);
@@ -626,6 +659,8 @@ public void qnaMakerTestScoreThresholdTooSmallOutOfRange() {
626659

627660
@Test
628661
public void qnaMakerReturnsAnswerWithContext() {
662+
PrintMethodName();
663+
629664
MockWebServer mockWebServer = new MockWebServer();
630665
try {
631666
String content = readFileContent("QnaMaker_ReturnsAnswerWithContext.json");
@@ -670,6 +705,8 @@ public void qnaMakerReturnsAnswerWithContext() {
670705

671706
@Test
672707
public void qnaMakerReturnAnswersWithoutContext() {
708+
PrintMethodName();
709+
673710
MockWebServer mockWebServer = new MockWebServer();
674711
try {
675712
String content = readFileContent("QnaMaker_ReturnsAnswerWithoutContext.json");
@@ -708,6 +745,8 @@ public void qnaMakerReturnAnswersWithoutContext() {
708745

709746
@Test
710747
public void qnaMakerReturnsHighScoreWhenIdPassed() {
748+
PrintMethodName();
749+
711750
MockWebServer mockWebServer = new MockWebServer();
712751
try {
713752
String content = readFileContent("QnaMaker_ReturnsAnswerWithContext.json");
@@ -747,6 +786,8 @@ public void qnaMakerReturnsHighScoreWhenIdPassed() {
747786

748787
@Test
749788
public void qnaMakerTestTopOutOfRange() {
789+
PrintMethodName();
790+
750791
QnAMakerEndpoint qnAMakerEndpoint = new QnAMakerEndpoint();
751792
qnAMakerEndpoint.setKnowledgeBaseId(knowledgeBaseId);
752793
qnAMakerEndpoint.setEndpointKey(endpointKey);
@@ -761,6 +802,8 @@ public void qnaMakerTestTopOutOfRange() {
761802

762803
@Test
763804
public void qnaMakerTestEndpointEmptyKbId() {
805+
PrintMethodName();
806+
764807
QnAMakerEndpoint qnAMakerEndpoint = new QnAMakerEndpoint();
765808
qnAMakerEndpoint.setKnowledgeBaseId(new String());
766809
qnAMakerEndpoint.setEndpointKey(endpointKey);
@@ -771,6 +814,8 @@ public void qnaMakerTestEndpointEmptyKbId() {
771814

772815
@Test
773816
public void qnaMakerTestEndpointEmptyEndpointKey() {
817+
PrintMethodName();
818+
774819
QnAMakerEndpoint qnAMakerEndpoint = new QnAMakerEndpoint();
775820
qnAMakerEndpoint.setKnowledgeBaseId(knowledgeBaseId);
776821
qnAMakerEndpoint.setEndpointKey(new String());
@@ -781,6 +826,8 @@ public void qnaMakerTestEndpointEmptyEndpointKey() {
781826

782827
@Test
783828
public void qnaMakerTestEndpointEmptyHost() {
829+
PrintMethodName();
830+
784831
QnAMakerEndpoint qnAMakerEndpoint = new QnAMakerEndpoint();
785832
qnAMakerEndpoint.setKnowledgeBaseId(knowledgeBaseId);
786833
qnAMakerEndpoint.setEndpointKey(endpointKey);
@@ -791,6 +838,8 @@ public void qnaMakerTestEndpointEmptyHost() {
791838

792839
@Test
793840
public void qnaMakerUserAgent() {
841+
PrintMethodName();
842+
794843
MockWebServer mockWebServer = new MockWebServer();
795844
try {
796845
QnAMaker qna = this.qnaReturnsAnswer(mockWebServer);
@@ -817,6 +866,8 @@ public void qnaMakerUserAgent() {
817866

818867
@Test
819868
public void qnaMakerV2LegacyEndpointShouldThrow() {
869+
PrintMethodName();
870+
820871
MockWebServer mockWebServer = new MockWebServer();
821872
try {
822873
String content = readFileContent("QnaMaker_LegacyEndpointAnswer.json");
@@ -848,6 +899,8 @@ public void qnaMakerV2LegacyEndpointShouldThrow() {
848899

849900
@Test
850901
public void qnaMakerV3LeagacyEndpointShouldThrow() {
902+
PrintMethodName();
903+
851904
MockWebServer mockWebServer = new MockWebServer();
852905
try {
853906
String content = readFileContent("QnaMaker_LegacyEndpointAnswer.json");
@@ -879,6 +932,8 @@ public void qnaMakerV3LeagacyEndpointShouldThrow() {
879932

880933
@Test
881934
public void qnaMakerReturnsAnswerWithMetadataBoost() {
935+
PrintMethodName();
936+
882937
MockWebServer mockWebServer = new MockWebServer();
883938
try {
884939
String content = readFileContent("QnaMaker_ReturnsAnswersWithMetadataBoost.json");
@@ -917,6 +972,8 @@ public void qnaMakerReturnsAnswerWithMetadataBoost() {
917972

918973
@Test
919974
public void qnaMakerTestThresholdInQueryOption() {
975+
PrintMethodName();
976+
920977
MockWebServer mockWebServer = new MockWebServer();
921978
try {
922979
String content = readFileContent("QnaMaker_ReturnsAnswer_GivenScoreThresholdQueryOption.json");
@@ -963,6 +1020,8 @@ public void qnaMakerTestThresholdInQueryOption() {
9631020

9641021
@Test
9651022
public void qnaMakerTestUnsuccessfulResponse() {
1023+
PrintMethodName();
1024+
9661025
MockWebServer mockWebServer = new MockWebServer();
9671026
mockWebServer.enqueue(new MockResponse().setResponseCode(502));
9681027
try {
@@ -988,6 +1047,8 @@ public void qnaMakerTestUnsuccessfulResponse() {
9881047

9891048
@Test
9901049
public void qnaMakerIsTestTrue() {
1050+
PrintMethodName();
1051+
9911052
MockWebServer mockWebServer = new MockWebServer();
9921053
try {
9931054
String content = readFileContent("QnaMaker_IsTest_True.json");
@@ -1026,6 +1087,8 @@ public void qnaMakerIsTestTrue() {
10261087

10271088
@Test
10281089
public void qnaMakerRankerTypeQuestionOnly() {
1090+
PrintMethodName();
1091+
10291092
MockWebServer mockWebServer = new MockWebServer();
10301093
try {
10311094
String content = readFileContent("QnaMaker_RankerType_QuestionOnly.json");
@@ -1064,6 +1127,8 @@ public void qnaMakerRankerTypeQuestionOnly() {
10641127

10651128
@Test
10661129
public void qnaMakerTestOptionsHydration() {
1130+
PrintMethodName();
1131+
10671132
MockWebServer mockWebServer = new MockWebServer();
10681133
try {
10691134
String url = this.getRequestUrl();
@@ -1183,6 +1248,8 @@ public void qnaMakerTestOptionsHydration() {
11831248

11841249
@Test
11851250
public void qnaMakerStrictFiltersCompoundOperationType() {
1251+
PrintMethodName();
1252+
11861253
MockWebServer mockWebServer = new MockWebServer();
11871254
try {
11881255
String content = readFileContent("QnaMaker_ReturnsAnswer.json");
@@ -1236,6 +1303,8 @@ public void qnaMakerStrictFiltersCompoundOperationType() {
12361303

12371304
@Test
12381305
public void telemetryNullTelemetryClient() {
1306+
PrintMethodName();
1307+
12391308
// Arrange
12401309
MockWebServer mockWebServer = new MockWebServer();
12411310
try {
@@ -1278,6 +1347,8 @@ public void telemetryNullTelemetryClient() {
12781347

12791348
@Test
12801349
public void telemetryReturnsAnswer() {
1350+
PrintMethodName();
1351+
12811352
// Arrange
12821353
MockWebServer mockWebServer = new MockWebServer();
12831354
try {
@@ -1341,6 +1412,8 @@ public void telemetryReturnsAnswer() {
13411412

13421413
@Test
13431414
public void telemetryReturnsAnswerWhenNoAnswerFoundInKB() {
1415+
PrintMethodName();
1416+
13441417
// Arrange
13451418
MockWebServer mockWebServer = new MockWebServer();
13461419
try {
@@ -1404,6 +1477,8 @@ public void telemetryReturnsAnswerWhenNoAnswerFoundInKB() {
14041477

14051478
@Test
14061479
public void telemetryPii() {
1480+
PrintMethodName();
1481+
14071482
// Arrange
14081483
MockWebServer mockWebServer = new MockWebServer();
14091484
try {
@@ -1470,6 +1545,8 @@ public void telemetryPii() {
14701545

14711546
@Test
14721547
public void telemetryOverride() {
1548+
PrintMethodName();
1549+
14731550
MockWebServer mockWebServer = new MockWebServer();
14741551
try {
14751552
String content = readFileContent("QnaMaker_ReturnsAnswer.json");
@@ -1537,7 +1614,9 @@ public void telemetryOverride() {
15371614

15381615
@Test
15391616
public void telemetryAdditionalPropsMetrics() {
1540-
//Arrange
1617+
PrintMethodName();
1618+
1619+
// Arrange
15411620
MockWebServer mockWebServer = new MockWebServer();
15421621
try {
15431622
String content = readFileContent("QnaMaker_ReturnsAnswer.json");
@@ -1614,6 +1693,8 @@ public void telemetryAdditionalPropsMetrics() {
16141693

16151694
@Test
16161695
public void telemetryAdditionalPropsOverride() {
1696+
PrintMethodName();
1697+
16171698
// Arrange
16181699
MockWebServer mockWebServer = new MockWebServer();
16191700
try {
@@ -1687,7 +1768,9 @@ public void telemetryAdditionalPropsOverride() {
16871768

16881769
@Test
16891770
public void telemetryFillPropsOverride() {
1690-
//Arrange
1771+
PrintMethodName();
1772+
1773+
// Arrange
16911774
MockWebServer mockWebServer = new MockWebServer();
16921775
try {
16931776
String content = readFileContent("QnaMaker_ReturnsAnswer.json");
@@ -1765,6 +1848,11 @@ public void telemetryFillPropsOverride() {
17651848
}
17661849
}
17671850

1851+
private void PrintMethodName()
1852+
{
1853+
System.out.println("Running " + (new Throwable().getStackTrace()[1].getMethodName()) + "()");
1854+
}
1855+
17681856
private static TurnContext getContext(String utterance) {
17691857
TestAdapter b = new TestAdapter();
17701858
Activity a = new Activity(ActivityTypes.MESSAGE);

0 commit comments

Comments
 (0)