modelcontextprotocol/java-sdk
Watch
1
0
Fork
You've already forked java-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete outdated test

Browse source
This commit is contained in:
Christian Tzolov 2024-12-13 00:02:35 +01:00
commit c332300651
2 changed files with 4 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/StdioServerTransport.java
View file

@ -58,8 +58,6 @@ public class StdioServerTransport extends AbstractMcpTransport {
private Scheduler errorScheduler; private Scheduler errorScheduler;
volatile boolean isRunning;
private final ServerParameters params; private final ServerParameters params;
public StdioServerTransport(ServerParameters params) { public StdioServerTransport(ServerParameters params) {
@ -112,7 +110,6 @@ public class StdioServerTransport extends AbstractMcpTransport {
} }
// Start threads // Start threads
this.isRunning = true;
startInboundProcessing(); startInboundProcessing();
startOutboundProcessing(); startOutboundProcessing();
startErrorProcessing(); startErrorProcessing();
@ -136,7 +133,7 @@ public class StdioServerTransport extends AbstractMcpTransport {
try (BufferedReader processErrorReader = new BufferedReader( try (BufferedReader processErrorReader = new BufferedReader(
new InputStreamReader(process.getErrorStream()))) { new InputStreamReader(process.getErrorStream()))) {
String line; String line;
while (isRunning && processErrorReader != null && (line = processErrorReader.readLine()) != null) { while ((line = processErrorReader.readLine()) != null) {
try { try {
System.out.println("Received error line: " + line); System.out.println("Received error line: " + line);
// TODO: handle errors, etc. // TODO: handle errors, etc.
@ -148,12 +145,7 @@ public class StdioServerTransport extends AbstractMcpTransport {
} }
} }
catch (IOException e) { catch (IOException e) {
if (this.isRunning) { throw new RuntimeException(e);
throw new RuntimeException(e);
}
}
finally {
this.isRunning = false;
} }
}); });
} }
@ -162,7 +154,7 @@ public class StdioServerTransport extends AbstractMcpTransport {
this.inboundScheduler.schedule(() -> { this.inboundScheduler.schedule(() -> {
try (BufferedReader processReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { try (BufferedReader processReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
String line; String line;
while (this.isRunning && processReader != null && (line = processReader.readLine()) != null) { while ((line = processReader.readLine()) != null) {
try { try {
JSONRPCMessage message = deserializeJsonRpcMessage(line); JSONRPCMessage message = deserializeJsonRpcMessage(line);
if (!this.getInboundSink().tryEmitNext(message).isSuccess()) { if (!this.getInboundSink().tryEmitNext(message).isSuccess()) {
@ -176,12 +168,7 @@ public class StdioServerTransport extends AbstractMcpTransport {
} }
} }
catch (IOException e) { catch (IOException e) {
if (isRunning) { throw new RuntimeException(e);
throw new RuntimeException(e);
}
}
finally {
isRunning = false;
} }
}); });
} }
@ -230,8 +217,6 @@ public class StdioServerTransport extends AbstractMcpTransport {
@Override @Override
public Mono<Void> closeGracefully() { public Mono<Void> closeGracefully() {
this.isRunning = false;
return Mono.fromFuture(() -> { return Mono.fromFuture(() -> {
System.out.println("Sending TERM to process"); System.out.println("Sending TERM to process");
if (this.process != null) { if (this.process != null) {

134
spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/stdio/StdioServerTransportTests.java
View file

@ -1,134 +0,0 @@
/*
* Copyright 2024-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ai.mcp.client.stdio;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Christian Tzolov
*
*/
public class StdioServerTransportTests {
@Mock
private ServerParameters mockParams;
@Mock
private Process mockProcess;
@Mock
private BufferedReader mockErrorReader;
@Mock
private BufferedReader mockReader;
@Mock
private BufferedWriter mockWriter;
@Mock
ProcessBuilder mockProcessBuilder;
private StdioServerTransport stdioServerTransport;
@BeforeEach
public void setUp() {
MockitoAnnotations.openMocks(this);
when(mockParams.getCommand()).thenReturn("dummyCommand");
when(mockParams.getArgs()).thenReturn(List.of("arg1", "arg2"));
when(mockParams.getEnv()).thenReturn(new HashMap<>(Map.of("key", "value")));
stdioServerTransport = new StdioServerTransport(mockParams, new ObjectMapper()) {
@Override
protected ProcessBuilder getProcessBuilder() {
return mockProcessBuilder;
}
};
}
@Test
public void testStart_Success() throws IOException {
// Arrange
when(mockProcessBuilder.start()).thenReturn(mockProcess);
when(mockProcess.getInputStream()).thenReturn(mock(InputStream.class));
when(mockProcess.getOutputStream()).thenReturn(mock(OutputStream.class));
when(mockProcess.errorReader()).thenReturn(mockErrorReader);
when(mockProcess.inputReader()).thenReturn(mockReader);
when(mockProcess.outputWriter()).thenReturn(mockWriter);
// Act
stdioServerTransport.start();
// Assert
// TODO: assertThat(stdioServerTransport.isRunning).isTrue();
verify(mockProcessBuilder).start();
}
@Test
public void testStart_ProcessStartFailure() throws IOException {
// Arrange
when(mockProcessBuilder.start()).thenThrow(new IOException("Failed to start process"));
// Act & Assert
RuntimeException exception = assertThrows(RuntimeException.class, () -> stdioServerTransport.start());
assertThat(exception.getMessage()).contains("Failed to start process with command");
}
@Test
public void testStart_NullInputStream() throws IOException {
// Arrange
when(mockProcessBuilder.start()).thenReturn(mockProcess);
when(mockProcess.getInputStream()).thenReturn(null);
when(mockProcess.getOutputStream()).thenReturn(mock(OutputStream.class));
// Act & Assert
RuntimeException exception = assertThrows(RuntimeException.class, () -> stdioServerTransport.start());
assertThat(exception.getMessage()).contains("Process input or output stream is null");
verify(mockProcess).destroy();
}
@Test
public void testStart_NullOutputStream() throws IOException {
// Arrange
when(mockProcessBuilder.start()).thenReturn(mockProcess);
when(mockProcess.getInputStream()).thenReturn(mock(InputStream.class));
when(mockProcess.getOutputStream()).thenReturn(null);
// Act & Assert
RuntimeException exception = assertThrows(RuntimeException.class, () -> stdioServerTransport.start());
assertThat(exception.getMessage()).contains("Process input or output stream is null");
verify(mockProcess).destroy();
}
}