Mirror/ollama4j
1
0
Fork 1
mirror of https://github.com/amithkoujalgi/ollama4j.git synced 2025-11-04 02:20:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor integration tests and update Makefile targets

Browse Source 
Refactored OllamaAPIIntegrationTest to simplify stream handlers and remove unused StringBuffer variables. Updated Makefile to ensure formatting is applied before running test targets. Adjusted logback.xml pattern to use full logger name for improved logging clarity.
This commit is contained in:
amithkoujalgi
2025-09-17 20:49:53 +05:30
parent 300f1691e7
commit ba3d8925f2
3 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/test/java/io/github/ollama4j/integrationtests/OllamaAPIIntegrationTest.java
View File

@@ -41,7 +41,7 @@ import org.testcontainers.ollama.OllamaContainer;
@OllamaToolService(providers = {AnnotatedTool.class})
@TestMethodOrder(OrderAnnotation.class)
@SuppressWarnings({"HttpUrlsUsage", "SpellCheckingInspection"})
@SuppressWarnings({"HttpUrlsUsage", "SpellCheckingInspection", "FieldCanBeLocal", "ConstantValue"})
class OllamaAPIIntegrationTest {
private static final Logger LOG = LoggerFactory.getLogger(OllamaAPIIntegrationTest.class);
@@ -105,11 +105,8 @@ class OllamaAPIIntegrationTest {
@Order(1)
void testVersionAPI()
throws URISyntaxException, IOException, OllamaBaseException, InterruptedException {
// String expectedVersion = ollama.getDockerImageName().split(":")[1];
String actualVersion = api.getVersion();
assertNotNull(actualVersion);
// assertEquals(expectedVersion, actualVersion, "Version should match the Docker
// image version");
String version = api.getVersion();
assertNotNull(version);
}
@Test
@@ -225,7 +222,6 @@ class OllamaAPIIntegrationTest {
throws OllamaBaseException, IOException, URISyntaxException, InterruptedException {
api.pullModel(GENERAL_PURPOSE_MODEL);
boolean raw = false;
StringBuffer sb = new StringBuffer();
OllamaResult result =
api.generate(
GENERAL_PURPOSE_MODEL,
@@ -233,15 +229,11 @@ class OllamaAPIIntegrationTest {
+ " Lisa?",
raw,
new OptionsBuilder().build(),
(s) -> {
LOG.info(s);
sb.append(s);
});
LOG::info);
assertNotNull(result);
assertNotNull(result.getResponse());
assertFalse(result.getResponse().isEmpty());
assertEquals(sb.toString(), result.getResponse());
}
@Test
@@ -522,10 +514,10 @@ class OllamaAPIIntegrationTest {
api.chat(
requestModel,
new OllamaChatStreamObserver(
(s) -> {
s -> {
LOG.info(s.toUpperCase());
},
(s) -> {
s -> {
LOG.info(s.toLowerCase());
}));
@@ -670,10 +662,10 @@ class OllamaAPIIntegrationTest {
api.chat(
requestModel,
new OllamaChatStreamObserver(
(s) -> {
s -> {
LOG.info(s.toUpperCase());
},
(s) -> {
s -> {
LOG.info(s.toLowerCase());
}));
assertNotNull(chatResult);
@@ -706,10 +698,10 @@ class OllamaAPIIntegrationTest {
api.chat(
requestModel,
new OllamaChatStreamObserver(
(s) -> {
s -> {
LOG.info(s.toUpperCase());
},
(s) -> {
s -> {
LOG.info(s.toLowerCase());
}));
@@ -827,8 +819,6 @@ class OllamaAPIIntegrationTest {
File imageFile = getImageFileFromClasspath("roses.jpg");
StringBuffer sb = new StringBuffer();
OllamaResult result =
api.generateWithImages(
VISION_MODEL,
@@ -836,14 +826,10 @@ class OllamaAPIIntegrationTest {
List.of(imageFile),
new OptionsBuilder().build(),
null,
(s) -> {
LOG.info(s);
sb.append(s);
});
LOG::info);
assertNotNull(result);
assertNotNull(result.getResponse());
assertFalse(result.getResponse().isEmpty());
assertEquals(sb.toString(), result.getResponse());
}
@Test
@@ -874,30 +860,24 @@ class OllamaAPIIntegrationTest {
void testGenerateWithThinkingAndStreamHandler()
throws OllamaBaseException, IOException, URISyntaxException, InterruptedException {
api.pullModel(THINKING_TOOL_MODEL);
boolean raw = false;
StringBuffer sb = new StringBuffer();
OllamaResult result =
api.generate(
THINKING_TOOL_MODEL,
"Who are you?",
raw,
new OptionsBuilder().build(),
(thinkingToken) -> {
sb.append(thinkingToken);
LOG.info(thinkingToken);
thinkingToken -> {
LOG.info(thinkingToken.toUpperCase());
},
(resToken) -> {
sb.append(resToken);
LOG.info(resToken);
resToken -> {
LOG.info(resToken.toLowerCase());
});
assertNotNull(result);
assertNotNull(result.getResponse());
assertFalse(result.getResponse().isEmpty());
assertNotNull(result.getThinking());
assertFalse(result.getThinking().isEmpty());
assertEquals(sb.toString(), result.getThinking() + result.getResponse());
}
private File getImageFileFromClasspath(String fileName) {

2
src/test/resources/logback.xml
View File

@@ -2,7 +2,7 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} %msg%n</pattern>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger %msg%n</pattern>
</encoder>
</appender>