@@ -72,7 +72,7 @@ protected Duration getRequestTimeout() {
7272 }
7373
7474 protected Duration getInitializationTimeout () {
75- return Duration .ofSeconds (2 );
75+ return Duration .ofSeconds (20 );
7676 }
7777
7878 McpAsyncClient client (McpClientTransport transport ) {
@@ -503,57 +503,64 @@ void testRemoveNonExistentRoot() {
503503
504504 @ Test
505505 void testReadResource () {
506+ AtomicInteger resourceCount = new AtomicInteger ();
506507 withClient (createMcpTransport (), client -> {
507508 Flux <McpSchema .ReadResourceResult > resources = client .initialize ()
508509 .then (client .listResources (null ))
509- .flatMapMany (r -> Flux .fromIterable (r .resources ()))
510+ .flatMapMany (r -> {
511+ List <Resource > l = r .resources ();
512+ resourceCount .set (l .size ());
513+ return Flux .fromIterable (l );
514+ })
510515 .flatMap (r -> client .readResource (r ));
511516
512- StepVerifier .create (resources ).recordWith (ArrayList ::new ).consumeRecordedWith (readResourceResults -> {
513-
514- for (ReadResourceResult result : readResourceResults ) {
515-
516- assertThat (result ).isNotNull ();
517- assertThat (result .contents ()).isNotNull ().isNotEmpty ();
518-
519- // Validate each content item
520- for (ResourceContents content : result .contents ()) {
521- assertThat (content ).isNotNull ();
522- assertThat (content .uri ()).isNotNull ().isNotEmpty ();
523- assertThat (content .mimeType ()).isNotNull ().isNotEmpty ();
524-
525- // Validate content based on its type with more comprehensive
526- // checks
527- switch (content .mimeType ()) {
528- case "text/plain" -> {
529- TextResourceContents textContent = assertInstanceOf (TextResourceContents .class ,
530- content );
531- assertThat (textContent .text ()).isNotNull ().isNotEmpty ();
532- assertThat (textContent .uri ()).isNotEmpty ();
533- }
534- case "application/octet-stream" -> {
535- BlobResourceContents blobContent = assertInstanceOf (BlobResourceContents .class ,
536- content );
537- assertThat (blobContent .blob ()).isNotNull ().isNotEmpty ();
538- assertThat (blobContent .uri ()).isNotNull ().isNotEmpty ();
539- // Validate base64 encoding format
540- assertThat (blobContent .blob ()).matches ("^[A-Za-z0-9+/]*={0,2}$" );
541- }
542- default -> {
543-
544- // Still validate basic properties
545- if (content instanceof TextResourceContents textContent ) {
546- assertThat (textContent .text ()).isNotNull ();
517+ StepVerifier .create (resources )
518+ .recordWith (ArrayList ::new )
519+ .thenConsumeWhile (res -> true )
520+ .consumeRecordedWith (readResourceResults -> {
521+ assertThat (readResourceResults .size ()).isEqualTo (resourceCount .get ());
522+ for (ReadResourceResult result : readResourceResults ) {
523+
524+ assertThat (result ).isNotNull ();
525+ assertThat (result .contents ()).isNotNull ().isNotEmpty ();
526+
527+ // Validate each content item
528+ for (ResourceContents content : result .contents ()) {
529+ assertThat (content ).isNotNull ();
530+ assertThat (content .uri ()).isNotNull ().isNotEmpty ();
531+ assertThat (content .mimeType ()).isNotNull ().isNotEmpty ();
532+
533+ // Validate content based on its type with more comprehensive
534+ // checks
535+ switch (content .mimeType ()) {
536+ case "text/plain" -> {
537+ TextResourceContents textContent = assertInstanceOf (TextResourceContents .class ,
538+ content );
539+ assertThat (textContent .text ()).isNotNull ().isNotEmpty ();
540+ assertThat (textContent .uri ()).isNotEmpty ();
541+ }
542+ case "application/octet-stream" -> {
543+ BlobResourceContents blobContent = assertInstanceOf (BlobResourceContents .class ,
544+ content );
545+ assertThat (blobContent .blob ()).isNotNull ().isNotEmpty ();
546+ assertThat (blobContent .uri ()).isNotNull ().isNotEmpty ();
547+ // Validate base64 encoding format
548+ assertThat (blobContent .blob ()).matches ("^[A-Za-z0-9+/]*={0,2}$" );
547549 }
548- else if (content instanceof BlobResourceContents blobContent ) {
549- assertThat (blobContent .blob ()).isNotNull ();
550+ default -> {
551+
552+ // Still validate basic properties
553+ if (content instanceof TextResourceContents textContent ) {
554+ assertThat (textContent .text ()).isNotNull ();
555+ }
556+ else if (content instanceof BlobResourceContents blobContent ) {
557+ assertThat (blobContent .blob ()).isNotNull ();
558+ }
550559 }
551560 }
552561 }
553562 }
554- }
555- })
556- .expectNextCount (10 ) // Expect 10 elements
563+ })
557564 .verifyComplete ();
558565 });
559566 }
@@ -693,7 +700,6 @@ void testInitializeWithAllCapabilities() {
693700 assertThat (result .capabilities ()).isNotNull ();
694701 }).verifyComplete ());
695702 }
696-
697703 // ---------------------------------------
698704 // Logging Tests
699705 // ---------------------------------------
@@ -773,7 +779,7 @@ void testSampling() {
773779 if (!(content instanceof McpSchema .TextContent text ))
774780 return ;
775781
776- assertThat (text .text ()).endsWith (response ); // Prefixed
782+ assertThat (text .text ()).contains (response );
777783 });
778784
779785 // Verify sampling request parameters received in our callback
0 commit comments