mutationList) {
@@ -95,15 +101,7 @@ public void generateUnittestRequest(String testCodeFile, String sourceCodeFile,
llmChatMediator.generateUnittestRequest(testCodeFile, sourceCodeFile, mutationList);
}
- // the mediator is dedicated to talk to the LLM, and when the response is ready, the service will propagate the response to the observers
- // so that on the UI layer, this is the place to notify all the observers
- // the mediator is not responsible for the UI, so it does not know the UI is a Swing UI
- @Override
- public void updateChatResponse(String responseType, String chatResponse) {
- LOG.info("Received chat response: " + chatResponse);
- notifyObservers("CHAT_RESPONSE:" + responseType, chatResponse);
- }
-
+
public void handleChatMessage(String message) {
LOG.info("Received chat message: " + message);
llmChatMediator.setOllamaClient(new OllamaClient(
@@ -121,10 +119,14 @@ public String dryRunGetPrompt(String testClassName, String sourceClassName, List
return llmChatMediator.dryRunGetPrompt(testClassName, sourceClassName, mutations);
}
+ @Override
public void onEventHappen(String eventName, Object eventObj) {
// Handle events from LLMChatMediator if needed
switch (eventName) {
- case "CLEAR_CHAT":
+ case ChatEvent.CHAT_REQUEST:
+ handleChatMessage(eventObj.toString());
+ break;
+ case ChatEvent.CLEAR_CHAT:
this.llmChatMediator.clearChat();
break;
default:
@@ -137,6 +139,6 @@ public String getChatHistory() {
}
public void propagateConfigChange() {
- notifyObservers("CONFIG_CHANGE:copyAsMarkdown", myState.copyAsMarkdown);
+ EventBusService.getInstance().post(new LLMConfigEvent(LLMConfigEvent.CONFIG_CHANGE_COPY_AS_MARKDOWN, myState.copyAsMarkdown));
}
}
\ No newline at end of file
diff --git a/src/main/java/com/github/jaksonlin/testcraft/infrastructure/services/system/EventBusService.java b/src/main/java/com/github/jaksonlin/testcraft/infrastructure/services/system/EventBusService.java
new file mode 100644
index 00000000..f68ffebc
--- /dev/null
+++ b/src/main/java/com/github/jaksonlin/testcraft/infrastructure/services/system/EventBusService.java
@@ -0,0 +1,51 @@
+package com.github.jaksonlin.testcraft.infrastructure.services.system;
+
+import com.github.jaksonlin.testcraft.infrastructure.messaging.events.BaseEvent;
+import com.google.common.eventbus.EventBus;
+import com.intellij.openapi.components.Service;
+import com.intellij.openapi.application.ApplicationManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Service(Service.Level.APP)
+public final class EventBusService {
+ private final EventBus eventBus;
+ private final Logger logger = LoggerFactory.getLogger(EventBusService.class);
+
+ public EventBusService() {
+ this.eventBus = new EventBus("TestCraftEventBus");
+ }
+
+ public void register(Object subscriber) {
+ try {
+ eventBus.register(subscriber);
+ logger.debug("Registered subscriber: {}", subscriber.getClass().getSimpleName());
+ } catch (Exception e) {
+ logger.error("Failed to register subscriber: " + subscriber, e);
+ }
+ }
+
+ public void unregister(Object subscriber) {
+ try {
+ eventBus.unregister(subscriber);
+ logger.debug("Unregistered subscriber: {}", subscriber.getClass().getSimpleName());
+ } catch (Exception e) {
+ logger.error("Failed to unregister subscriber: " + subscriber, e);
+ }
+ }
+
+ public void post(Object event) {
+ try {
+ if (event instanceof BaseEvent) {
+ logger.debug("Posting event: {}", ((BaseEvent) event).getEventType());
+ }
+ eventBus.post(event);
+ } catch (Exception e) {
+ logger.error("Failed to post event: " + event, e);
+ }
+ }
+
+ public static EventBusService getInstance() {
+ return ApplicationManager.getApplication().getService(EventBusService.class);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/jaksonlin/testcraft/infrastructure/services/system/I18nService.java b/src/main/java/com/github/jaksonlin/testcraft/infrastructure/services/system/I18nService.java
new file mode 100644
index 00000000..6c9c3032
--- /dev/null
+++ b/src/main/java/com/github/jaksonlin/testcraft/infrastructure/services/system/I18nService.java
@@ -0,0 +1,28 @@
+package com.github.jaksonlin.testcraft.infrastructure.services.system;
+
+import java.util.ResourceBundle;
+
+import org.jetbrains.annotations.PropertyKey;
+
+import com.intellij.AbstractBundle;
+import com.intellij.openapi.components.Service;
+import com.intellij.openapi.application.ApplicationManager;
+
+@Service(Service.Level.APP)
+public final class I18nService {
+ private final String BUNDLE = "messages.MyBundle";
+ private ResourceBundle ourBundle;
+ public String message(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
+ return AbstractBundle.message(getBundle(), key, params);
+ }
+ private ResourceBundle getBundle() {
+ if (ourBundle == null) {
+ ourBundle = ResourceBundle.getBundle(BUNDLE);
+ }
+ return ourBundle;
+ }
+
+ public static I18nService getInstance() {
+ return ApplicationManager.getApplication().getService(I18nService.class);
+ }
+}
diff --git a/src/main/java/com/github/jaksonlin/pitestintellij/settings/AnnotationSettingsComponent.java b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/AnnotationSettingsComponent.java
similarity index 66%
rename from src/main/java/com/github/jaksonlin/pitestintellij/settings/AnnotationSettingsComponent.java
rename to src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/AnnotationSettingsComponent.java
index b9b2fe01..6c0a7c3c 100644
--- a/src/main/java/com/github/jaksonlin/pitestintellij/settings/AnnotationSettingsComponent.java
+++ b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/AnnotationSettingsComponent.java
@@ -1,8 +1,7 @@
-package com.github.jaksonlin.pitestintellij.settings;
+package com.github.jaksonlin.testcraft.presentation.components.configuration;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.I18nService;
import com.intellij.json.JsonFileType;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.EditorSettings;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.editor.ex.EditorEx;
@@ -10,10 +9,8 @@
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBTextField;
import org.jetbrains.annotations.NotNull;
-import com.github.jaksonlin.pitestintellij.MyBundle;
import javax.swing.*;
-import javax.swing.event.HyperlinkEvent;
import java.awt.*;
public class AnnotationSettingsComponent {
@@ -23,7 +20,7 @@ public class AnnotationSettingsComponent {
private final JCheckBox autoImportCheckBox;
private final JCheckBox enableValidationCheckBox;
private static final int EDITOR_HEIGHT = 300;
-
+
private static final String EXAMPLE_JSON = "{\n" +
" \"fields\": [\n" +
" {\n" +
@@ -99,29 +96,29 @@ public AnnotationSettingsComponent() {
c.gridx = 0;
c.gridy = 0;
c.weighty = 0.0;
- JLabel importSettingsLabel = new JBLabel("" + MyBundle.message("settings.annotation.import.title") + "");
+ JLabel importSettingsLabel = new JBLabel("" + I18nService.getInstance().message("settings.annotation.import.title") + "");
contentPanel.add(importSettingsLabel, c);
// Package input
- addLabelAndField(contentPanel, MyBundle.message("settings.annotation.package.label"), packageTextField, 1,
- MyBundle.message("settings.annotation.package.tooltip"));
+ addLabelAndField(contentPanel, I18nService.getInstance().message("settings.annotation.package.label"), packageTextField, 1,
+ I18nService.getInstance().message("settings.annotation.package.tooltip"));
// Checkboxes
c.gridy = 2;
c.gridwidth = 2;
- autoImportCheckBox = new JCheckBox(MyBundle.message("settings.annotation.autoImport"));
- autoImportCheckBox.setToolTipText(MyBundle.message("settings.annotation.autoImport.tooltip"));
+ autoImportCheckBox = new JCheckBox(I18nService.getInstance().message("settings.annotation.autoImport"));
+ autoImportCheckBox.setToolTipText(I18nService.getInstance().message("settings.annotation.autoImport.tooltip"));
contentPanel.add(autoImportCheckBox, c);
c.gridy = 3;
- enableValidationCheckBox = new JCheckBox(MyBundle.message("settings.annotation.enableValidation"));
- enableValidationCheckBox.setToolTipText(MyBundle.message("settings.annotation.enableValidation.tooltip"));
+ enableValidationCheckBox = new JCheckBox(I18nService.getInstance().message("settings.annotation.enableValidation"));
+ enableValidationCheckBox.setToolTipText(I18nService.getInstance().message("settings.annotation.enableValidation.tooltip"));
contentPanel.add(enableValidationCheckBox, c);
// Schema Configuration section
c.gridy = 4;
c.insets = new Insets(15, 5, 5, 5);
- JLabel schemaLabel = new JBLabel("" + MyBundle.message("settings.annotation.schema.title") + "");
+ JLabel schemaLabel = new JBLabel("" + I18nService.getInstance().message("settings.annotation.schema.title") + "");
contentPanel.add(schemaLabel, c);
// Schema editor
@@ -132,7 +129,7 @@ public AnnotationSettingsComponent() {
// Wrap editor in a panel to ensure it expands properly
JPanel editorPanel = new JPanel(new BorderLayout());
- editorPanel.add(new JBLabel(MyBundle.message("settings.annotation.schema.label")), BorderLayout.NORTH);
+ editorPanel.add(new JBLabel(I18nService.getInstance().message("settings.annotation.schema.label")), BorderLayout.NORTH);
editorPanel.add(schemaEditor, BorderLayout.CENTER);
contentPanel.add(editorPanel, c);
@@ -145,55 +142,33 @@ public AnnotationSettingsComponent() {
JPanel helpPanel = new JPanel(new BorderLayout());
helpPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
- JLabel helpText = new JBLabel("" +
- "" + MyBundle.message("settings.annotation.schema.help.title") + "
" +
- "" + MyBundle.message("settings.annotation.schema.help.intro") + "
" +
-
- "" + MyBundle.message("settings.annotation.schema.help.structure.title") + "
" +
- "" +
- "- " + MyBundle.message("settings.annotation.schema.help.structure.1") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.structure.2") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.structure.3") + "
" +
- "
" +
+ JLabel helpText = new JBLabel("" +
+ "" + I18nService.getInstance().message("settings.annotation.schema.help.title") + "
" +
+ "" + I18nService.getInstance().message("settings.annotation.schema.help.intro") + "
" +
- "" + MyBundle.message("settings.annotation.schema.help.validation.title") + "
" +
+ "" + I18nService.getInstance().message("settings.annotation.schema.help.structure.title") + "
" +
"" +
- "- " + MyBundle.message("settings.annotation.schema.help.validation.1") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.validation.2") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.validation.3") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.validation.4") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.validation.5") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.structure.1") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.structure.2") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.structure.3") + "
" +
"
" +
- "" + MyBundle.message("settings.annotation.schema.help.valueProvider.title") + "
" +
+ "" + I18nService.getInstance().message("settings.annotation.schema.help.validation.title") + "
" +
"" +
- "- " + MyBundle.message("settings.annotation.schema.help.valueProvider.1") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.valueProvider.2") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.valueProvider.3") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.validation.1") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.validation.2") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.validation.3") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.validation.4") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.validation.5") + "
" +
"
" +
- "" + MyBundle.message("settings.annotation.schema.help.example.title") + "
" +
- "" +
- EXAMPLE_JSON.replace("<", "<").replace(">", ">").replace("\n", "
").replace(" ", " ") +
- "
" +
-
- "" + MyBundle.message("settings.annotation.schema.help.notes.title") + "
" +
+ "" + I18nService.getInstance().message("settings.annotation.schema.help.valueProvider.title") + "
" +
"" +
- "- " + MyBundle.message("settings.annotation.schema.help.notes.1") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.notes.2") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.notes.3") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.notes.4") + "
" +
- "- " + MyBundle.message("settings.annotation.schema.help.notes.5") + "
" +
+ "- " + I18nService.getInstance().message("settings.annotation.schema.help.valueProvider.1") + "
" +
"
" +
- "");
-
- // Create a scroll pane for the help text
- JScrollPane scrollPane = new JScrollPane(helpText);
- scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
- scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane.setBorder(BorderFactory.createEmptyBorder());
+ "");
- helpPanel.add(scrollPane, BorderLayout.CENTER);
+ helpPanel.add(helpText, BorderLayout.CENTER);
contentPanel.add(helpPanel, c);
// Add content panel to main panel
diff --git a/src/main/java/com/github/jaksonlin/pitestintellij/settings/InvalidTestCaseSettingsComponent.java b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/InvalidTestCaseSettingsComponent.java
similarity index 74%
rename from src/main/java/com/github/jaksonlin/pitestintellij/settings/InvalidTestCaseSettingsComponent.java
rename to src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/InvalidTestCaseSettingsComponent.java
index abcf0e7c..9b58ed9e 100644
--- a/src/main/java/com/github/jaksonlin/pitestintellij/settings/InvalidTestCaseSettingsComponent.java
+++ b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/InvalidTestCaseSettingsComponent.java
@@ -1,12 +1,13 @@
-package com.github.jaksonlin.pitestintellij.settings;
+package com.github.jaksonlin.testcraft.presentation.components.configuration;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.I18nService;
import com.intellij.openapi.editor.EditorSettings;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBLabel;
import org.jetbrains.annotations.NotNull;
-import com.github.jaksonlin.pitestintellij.MyBundle;
+
import javax.swing.*;
import java.awt.*;
@@ -36,30 +37,30 @@ public InvalidTestCaseSettingsComponent() {
c.gridx = 0;
c.gridy = 0;
c.weighty = 0.0;
- JLabel validationLabel = new JBLabel("" + MyBundle.message("settings.invalidTestCase.title") + "");
+ JLabel validationLabel = new JBLabel("" + I18nService.getInstance().message("settings.invalidTestCase.title") + "");
contentPanel.add(validationLabel, c);
// Checkboxes
c.gridy = 1;
- enableCheckbox = new JBCheckBox(MyBundle.message("settings.invalidTestCase.enableCheck"));
- enableCheckbox.setToolTipText(MyBundle.message("settings.invalidTestCase.enableCheck.tooltip"));
+ enableCheckbox = new JBCheckBox(I18nService.getInstance().message("settings.invalidTestCase.enableCheck"));
+ enableCheckbox.setToolTipText(I18nService.getInstance().message("settings.invalidTestCase.enableCheck.tooltip"));
contentPanel.add(enableCheckbox, c);
c.gridy = 2;
- enableCommentCheckbox = new JBCheckBox(MyBundle.message("settings.invalidTestCase.enableCommentCheck"));
- enableCommentCheckbox.setToolTipText(MyBundle.message("settings.invalidTestCase.enableCommentCheck.tooltip"));
+ enableCommentCheckbox = new JBCheckBox(I18nService.getInstance().message("settings.invalidTestCase.enableCommentCheck"));
+ enableCommentCheckbox.setToolTipText(I18nService.getInstance().message("settings.invalidTestCase.enableCommentCheck.tooltip"));
contentPanel.add(enableCommentCheckbox, c);
// Invalid Assertions section
c.gridy = 3;
c.insets = new Insets(15, 5, 5, 5);
- JLabel assertionsLabel = new JBLabel("" + MyBundle.message("settings.invalidTestCase.assertions.title") + "");
+ JLabel assertionsLabel = new JBLabel("" + I18nService.getInstance().message("settings.invalidTestCase.assertions.title") + "");
contentPanel.add(assertionsLabel, c);
// Editor description
c.gridy = 4;
c.insets = new Insets(5, 5, 5, 5);
- JLabel editorDesc = new JBLabel(MyBundle.message("settings.invalidTestCase.assertions.description"));
+ JLabel editorDesc = new JBLabel(I18nService.getInstance().message("settings.invalidTestCase.assertions.description"));
contentPanel.add(editorDesc, c);
// Assertion editor
@@ -73,11 +74,11 @@ public InvalidTestCaseSettingsComponent() {
c.weighty = 0.0; // Reset vertical weight
c.insets = new Insets(10, 5, 5, 5);
JLabel helpText = new JBLabel("" +
- "" + MyBundle.message("settings.invalidTestCase.assertions.examples.title") + "
" +
- MyBundle.message("settings.invalidTestCase.assertions.examples.1") + "
" +
- MyBundle.message("settings.invalidTestCase.assertions.examples.2") + "
" +
- MyBundle.message("settings.invalidTestCase.assertions.examples.3") + "
" +
- MyBundle.message("settings.invalidTestCase.assertions.examples.4") +
+ "" + I18nService.getInstance().message("settings.invalidTestCase.assertions.examples.title") + "
" +
+ I18nService.getInstance().message("settings.invalidTestCase.assertions.examples.1") + "
" +
+ I18nService.getInstance().message("settings.invalidTestCase.assertions.examples.2") + "
" +
+ I18nService.getInstance().message("settings.invalidTestCase.assertions.examples.3") + "
" +
+ I18nService.getInstance().message("settings.invalidTestCase.assertions.examples.4") +
"");
contentPanel.add(helpText, c);
diff --git a/src/main/java/com/github/jaksonlin/pitestintellij/settings/OllamaSettingsComponent.java b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/OllamaSettingsComponent.java
similarity index 68%
rename from src/main/java/com/github/jaksonlin/pitestintellij/settings/OllamaSettingsComponent.java
rename to src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/OllamaSettingsComponent.java
index 09f2f507..3fbfb9f3 100644
--- a/src/main/java/com/github/jaksonlin/pitestintellij/settings/OllamaSettingsComponent.java
+++ b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/configuration/OllamaSettingsComponent.java
@@ -1,15 +1,17 @@
-package com.github.jaksonlin.pitestintellij.settings;
+package com.github.jaksonlin.testcraft.presentation.components.configuration;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBTextField;
import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.NotNull;
-import com.github.jaksonlin.pitestintellij.util.OllamaClient;
-import com.github.jaksonlin.pitestintellij.MyBundle;
+import com.github.jaksonlin.testcraft.util.OllamaClient;
+
import javax.swing.*;
import java.awt.*;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.I18nService;
+
public class OllamaSettingsComponent {
private final JPanel mainPanel;
private final JBTextField hostField = new JBTextField();
@@ -30,49 +32,49 @@ public OllamaSettingsComponent() {
contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.Y_AXIS));
// Connection Settings Section
- JPanel connectionPanel = createSectionPanel(MyBundle.message("llm.settings.connection.title"));
+ JPanel connectionPanel = createSectionPanel(I18nService.getInstance().message("llm.settings.connection.title"));
GridBagConstraints c = new GridBagConstraints();
c.insets = JBUI.insets(5);
c.fill = GridBagConstraints.HORIZONTAL;
c.anchor = GridBagConstraints.LINE_START;
// Host field
- addLabelAndField(connectionPanel, MyBundle.message("llm.settings.host.label"), hostField,
- MyBundle.message("llm.settings.host.tooltip"));
+ addLabelAndField(connectionPanel, I18nService.getInstance().message("llm.settings.host.label"), hostField,
+ I18nService.getInstance().message("llm.settings.host.tooltip"));
// Port field
- addLabelAndField(connectionPanel, MyBundle.message("llm.settings.port.label"), portField,
- MyBundle.message("llm.settings.port.tooltip"));
+ addLabelAndField(connectionPanel, I18nService.getInstance().message("llm.settings.port.label"), portField,
+ I18nService.getInstance().message("llm.settings.port.tooltip"));
contentPanel.add(connectionPanel);
contentPanel.add(Box.createVerticalStrut(10));
// Model Settings Section
- JPanel modelPanel = createSectionPanel(MyBundle.message("llm.settings.model.title"));
+ JPanel modelPanel = createSectionPanel(I18nService.getInstance().message("llm.settings.model.title"));
// Model field
- addLabelAndField(modelPanel, MyBundle.message("llm.settings.model.label"), modelField,
- MyBundle.message("llm.settings.model.tooltip"));
+ addLabelAndField(modelPanel, I18nService.getInstance().message("llm.settings.model.label"), modelField,
+ I18nService.getInstance().message("llm.settings.model.tooltip"));
// Max Tokens field
- addLabelAndField(modelPanel, MyBundle.message("llm.settings.maxTokens.label"), maxTokensField,
- MyBundle.message("llm.settings.maxTokens.tooltip"));
+ addLabelAndField(modelPanel, I18nService.getInstance().message("llm.settings.maxTokens.label"), maxTokensField,
+ I18nService.getInstance().message("llm.settings.maxTokens.tooltip"));
// Temperature field
- addLabelAndField(modelPanel, MyBundle.message("llm.settings.temperature.label"), temperatureField,
- MyBundle.message("llm.settings.temperature.tooltip"));
+ addLabelAndField(modelPanel, I18nService.getInstance().message("llm.settings.temperature.label"), temperatureField,
+ I18nService.getInstance().message("llm.settings.temperature.tooltip"));
// Timeout field
- addLabelAndField(modelPanel, MyBundle.message("llm.settings.timeout.label"), timeoutField,
- MyBundle.message("llm.settings.timeout.tooltip"));
+ addLabelAndField(modelPanel, I18nService.getInstance().message("llm.settings.timeout.label"), timeoutField,
+ I18nService.getInstance().message("llm.settings.timeout.tooltip"));
contentPanel.add(modelPanel);
contentPanel.add(Box.createVerticalStrut(10));
// Output Settings Section
- JPanel outputPanel = createSectionPanel(MyBundle.message("llm.settings.output.title"));
- copyAsMarkdownCheckbox = new JCheckBox(MyBundle.message("llm.settings.copyMarkdown.label"));
- copyAsMarkdownCheckbox.setToolTipText(MyBundle.message("llm.settings.copyMarkdown.tooltip"));
+ JPanel outputPanel = createSectionPanel(I18nService.getInstance().message("llm.settings.output.title"));
+ copyAsMarkdownCheckbox = new JCheckBox(I18nService.getInstance().message("llm.settings.copyMarkdown.label"));
+ copyAsMarkdownCheckbox.setToolTipText(I18nService.getInstance().message("llm.settings.copyMarkdown.tooltip"));
copyAsMarkdownCheckbox.setAlignmentX(Component.LEFT_ALIGNMENT);
outputPanel.add(copyAsMarkdownCheckbox);
@@ -80,18 +82,18 @@ public OllamaSettingsComponent() {
contentPanel.add(Box.createVerticalStrut(10));
// Test Connection Section
- JPanel testPanel = createSectionPanel(MyBundle.message("llm.settings.test.title"));
- JButton testConnectionButton = new JButton(MyBundle.message("llm.settings.test.button"));
+ JPanel testPanel = createSectionPanel(I18nService.getInstance().message("llm.settings.test.title"));
+ JButton testConnectionButton = new JButton(I18nService.getInstance().message("llm.settings.test.button"));
testConnectionButton.setAlignmentX(Component.LEFT_ALIGNMENT);
testPanel.add(testConnectionButton);
// Add help text
JLabel helpText = new JBLabel("" +
- "" + MyBundle.message("llm.settings.help.title") + "
" +
+ "" + I18nService.getInstance().message("llm.settings.help.title") + "
" +
"" +
- "- " + MyBundle.message("llm.settings.help.running") + "
" +
- "- " + MyBundle.message("llm.settings.help.host") + "
" +
- "- " + MyBundle.message("llm.settings.help.port") + "
" +
+ "- " + I18nService.getInstance().message("llm.settings.help.running") + "
" +
+ "- " + I18nService.getInstance().message("llm.settings.help.host") + "
" +
+ "- " + I18nService.getInstance().message("llm.settings.help.port") + "
" +
"
" +
"");
helpText.setAlignmentX(Component.LEFT_ALIGNMENT);
@@ -152,18 +154,18 @@ private void testConnection() {
if (success) {
JOptionPane.showMessageDialog(mainPanel,
"Successfully connected to Ollama server!",
- MyBundle.message("llm.settings.test.title"),
+ I18nService.getInstance().message("llm.settings.test.title"),
JOptionPane.INFORMATION_MESSAGE);
} else {
JOptionPane.showMessageDialog(mainPanel,
- MyBundle.message("llm.error.connection"),
- MyBundle.message("llm.settings.test.title"),
+ I18nService.getInstance().message("llm.error.connection"),
+ I18nService.getInstance().message("llm.settings.test.title"),
JOptionPane.ERROR_MESSAGE);
}
} catch (Exception e) {
JOptionPane.showMessageDialog(mainPanel,
- MyBundle.message("llm.error.connection") + ": " + e.getMessage(),
- MyBundle.message("llm.settings.test.title"),
+ I18nService.getInstance().message("llm.error.connection") + ": " + e.getMessage(),
+ I18nService.getInstance().message("llm.settings.test.title"),
JOptionPane.ERROR_MESSAGE);
}
}
diff --git a/src/main/java/com/github/jaksonlin/testcraft/presentation/components/llmchat/ChatPanelComponent.java b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/llmchat/ChatPanelComponent.java
new file mode 100644
index 00000000..a0c32568
--- /dev/null
+++ b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/llmchat/ChatPanelComponent.java
@@ -0,0 +1,102 @@
+package com.github.jaksonlin.testcraft.presentation.components.llmchat;
+
+import com.github.jaksonlin.testcraft.infrastructure.messaging.events.ChatEvent;
+import com.github.jaksonlin.testcraft.infrastructure.messaging.events.TypedEventObserver;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.EventBusService;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.I18nService;
+import com.intellij.ui.components.JBScrollPane;
+import com.intellij.util.ui.JBUI;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import java.awt.BorderLayout;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyAdapter;
+
+public class ChatPanelComponent {
+
+ private final TypedEventObserver chatObserver = new TypedEventObserver(ChatEvent.class) {
+ @Override
+ protected void onTypedEvent(ChatEvent event) {
+ // Handle the chat event
+ switch (event.getEventType()) {
+ case ChatEvent.START_LOADING:
+ // disable input area and send button
+ setInputEnabled(false);
+ break;
+ case ChatEvent.STOP_LOADING:
+ case ChatEvent.CHAT_RESPONSE:
+ case ChatEvent.ERROR:
+ // enable input area and send button
+ setInputEnabled(true);
+ break;
+ }
+ }
+ };
+ private final JTextArea inputArea;
+ private final JButton sendButton;
+ private final JPanel masterPanel;
+
+ public ChatPanelComponent() {
+
+ // Input area
+ inputArea = new JTextArea(3, 40);
+ inputArea.setLineWrap(true);
+ inputArea.setWrapStyleWord(true);
+ JBScrollPane inputScrollPane = new JBScrollPane(inputArea);
+
+ // Send button
+ sendButton = new JButton(I18nService.getInstance().message("chat.send.button"));
+ sendButton.addActionListener(e -> sendMessage());
+
+ // Input panel (input area + send button)
+ masterPanel = new JPanel(new BorderLayout());
+ masterPanel.setBorder(JBUI.Borders.empty(5));
+ masterPanel.add(inputScrollPane, BorderLayout.CENTER);
+ masterPanel.add(sendButton, BorderLayout.EAST);
+
+ // Add key listener for Ctrl+Enter to send
+ inputArea.addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyPressed(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_ENTER && e.isControlDown()) {
+ sendMessage();
+ e.consume();
+ }
+ }
+ });
+
+
+ }
+
+
+ public JPanel getInputPanel() {
+ return masterPanel;
+ }
+
+ private void sendMessage() {
+ String message = inputArea.getText().trim();
+ if (!message.isEmpty()) {
+ EventBusService.getInstance().post(new ChatEvent(ChatEvent.CHAT_REQUEST, message));
+ inputArea.setText("");
+ inputArea.requestFocus();
+ }
+ }
+
+ public void clear() {
+ inputArea.setText("");
+ }
+
+ public void setInputEnabled(boolean enabled) {
+ inputArea.setEnabled(enabled);
+ sendButton.setEnabled(enabled);
+ if (enabled) {
+ inputArea.requestFocus();
+ }
+ }
+
+ public void dispose() {
+ chatObserver.unregister();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/jaksonlin/testcraft/presentation/components/llmchat/LLMResponseComponent.java b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/llmchat/LLMResponseComponent.java
new file mode 100644
index 00000000..49451490
--- /dev/null
+++ b/src/main/java/com/github/jaksonlin/testcraft/presentation/components/llmchat/LLMResponseComponent.java
@@ -0,0 +1,341 @@
+package com.github.jaksonlin.testcraft.presentation.components.llmchat;
+
+import com.github.jaksonlin.testcraft.infrastructure.messaging.events.ChatEvent;
+import com.github.jaksonlin.testcraft.infrastructure.messaging.events.LLMConfigEvent;
+import com.github.jaksonlin.testcraft.infrastructure.messaging.events.TypedEventObserver;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.EventBusService;
+import com.github.jaksonlin.testcraft.infrastructure.services.system.I18nService;
+import com.intellij.ui.components.JBScrollPane;
+import com.intellij.util.ui.JBUI;
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
+import com.intellij.ui.JBColor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.Toolkit;
+
+import javax.swing.*;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
+import java.awt.*;
+import java.util.Timer;
+import java.util.TimerTask;
+import javax.swing.text.html.HTMLDocument;
+
+public class LLMResponseComponent {
+ private final TypedEventObserver eventObserver = new TypedEventObserver(ChatEvent.class) {
+ @Override
+ public void onTypedEvent(ChatEvent event) {
+ switch (event.getEventType()) {
+ case ChatEvent.START_LOADING:
+ startLoading();
+ break;
+ case ChatEvent.STOP_LOADING:
+ stopLoading();
+ break;
+ case ChatEvent.CHAT_REQUEST:
+ if (!isLoading) {
+ appendMarkdownToOutput(String.format(MESSAGE_TEMPLATE, "user", I18nService.getInstance().message("llm.user"), event.getPayload().toString()));
+ startLoading();
+ }
+ break;
+ case ChatEvent.CHAT_RESPONSE:
+ stopLoading();
+ appendMarkdownToOutput(String.format(MESSAGE_TEMPLATE, "assistant", I18nService.getInstance().message("llm.assistant"), event.getPayload().toString()));
+ break;
+ case ChatEvent.COPY_CHAT_RESPONSE:
+ copyToClipboard(event.getPayload());
+ break;
+ case ChatEvent.DRY_RUN_PROMPT:
+ String dryRunPrompt = (String) event.getPayload();
+ if (dryRunPrompt.isEmpty()){
+ JOptionPane.showMessageDialog(masterPanel, I18nService.getInstance().message("llm.dry.run.prompt.empty"), I18nService.getInstance().message("llm.dry.run.prompt"), JOptionPane.INFORMATION_MESSAGE);
+ } else {
+ appendMarkdownToOutput(String.format(MESSAGE_TEMPLATE, "system", I18nService.getInstance().message("llm.system"), I18nService.getInstance().message("llm.dry.run.prompt") + "\n" + event.getPayload().toString()));
+ }
+ break;
+ case ChatEvent.ERROR:
+ JOptionPane.showMessageDialog(masterPanel, I18nService.getInstance().message("llm.error") + ": " + event.getPayload().toString(), I18nService.getInstance().message("llm.error"), JOptionPane.ERROR_MESSAGE);
+ break;
+ }
+ }
+ };
+
+ private final TypedEventObserver llmConfigObserver = new TypedEventObserver(LLMConfigEvent.class) {
+ @Override
+ public void onTypedEvent(LLMConfigEvent event) {
+ switch (event.getEventType()) {
+ case LLMConfigEvent.CONFIG_CHANGE_COPY_AS_MARKDOWN:
+ copyAsMarkdown = (boolean) event.getPayload();
+ break;
+ }
+ }
+ };
+ private final JEditorPane outputArea;
+ private boolean isLoading = false;
+ private boolean copyAsMarkdown = false;
+
+ private final HTMLEditorKit htmlKit;
+ private final StyleSheet styleSheet;
+ private final JPanel masterPanel;
+ private final JPanel loadingPanel;
+ private final Timer loadingTimer;
+ private final JLabel loadingLabel;
+
+
+ private final StringBuilder chatHistory = new StringBuilder();
+
+ public JPanel getMasterPanel() {
+ return masterPanel;
+ }
+
+
+ private static final String BASE_HTML_TEMPLATE =
+ "\n" +
+ "\n" +
+ "\n" +
+ " \n" +
+ "\n" +
+ "\n" +
+ " \n" +
+ " %s\n" +
+ "
\n" +
+ "\n" +
+ "";
+
+ private static final String MESSAGE_TEMPLATE =
+ "\n" +
+ " \n" +
+ "
%s
\n" +
+ "
- Adds a 'Unittest Helpers' menu to the right-click context menu in the editor, and the `Run Mutation Test` action to the submenu.
-
- Adds a 'Mutation Test History' tool window to display the history of mutation tests for each of the `mutated` classes.
-
- You can navigate to the source code of the mutated class by searching on the class name with enter key.
-
- Adds rendering of the mutation test result on the code editor.
-
- Automatic detection of the classpath dependencies for running the mutation test, making use of the Gradle API from the IntelliJ IDEA.
-
- Support long classpath for running the mutation test, especially for enterprise projects when there are thousands of classes in the classpath; and even jar files from other locations.
-
- Additional classes in resource directory (marked as resource in IDE) are added to the classpath for mutation testing.
-
- Usage: Right-click on a JUnit test file and select `Unittest Helpers` -> `Run Mutation Test` to run PIT mutation testing on the test file.
-
- ]]>
-
- 1.0.1-beta
+ TestCraft Pro is a comprehensive Java testing toolkit that enhances test quality through multiple features:
+
+
+ - Mutation Testing
+
+ - Run PITest on both Gradle and Maven projects
+ - Visual results in dedicated tool window
+ - Source code navigation and decoration
+
+
+ - Test Case Management
+
+ - Automated test case annotation generation
+ - Annotation validation and inspection
+ - Smart code completion for annotations
+
+
+ - Test Quality Assurance
+
+ - Assertion statement validation
+ - Missing assertion detection
+ - Test documentation verification
+
+
+
+
+ Originally evolved from pitest-gradle, TestCraft Pro has expanded to become a complete testing toolkit while maintaining all mutation testing capabilities.
+ ]]>
+
+ Change Notes
+ 1.0.10 - 2025-05-06
+
+ - bugfix, git command execution in a separate thread to avoid UI blocking
+
+ 1.0.9 - 2025-04-30
+
+ - bugfix, backward compatibility to JDK1.8 support to run in older IntelliJ IDEA version
+ - upload to pitest-gradle also, for pitest-gradle user, please uninstall pitest-gradle plugin and reinstall the new one manged in [testcraft](https://plugins.jetbrains.com/plugin/27221-testcraft-pro).
+
+ 1.0.8 - 2025-04-28
+
+ - Run pitest in the test file's source root as the process working directory
+ - Dump pitest context into report directory for issue debug
+ - Enhance output information for issue debug
+
+ 1.0.7 - 2025-04-16
+
+ - enhance the dump prompt to use compact prompt
+ - i18n enhancement
+ - bugfixes for no mutation can provide suggestions
+
+ 1.0.6 - 2025-04-09
+
+ - Add ollama access to evaulate the unit test and create new test
+
+
+ 1.0.5 - 2025-04-01
+
+ - Added assertion statement validation
+ - Enhanced test quality checks
+ - Added compatibility with IDE version 251
+
+
+ 1.0.4 - 2025-01-16
+
+ - Added compatibility to IDE version 251
+
+
+ 1.0.3 - 2024-11-14
+
+ - Added unit test annotation generation
+ - Added unit test annotation inspection
+
+
+ Previous Versions
+
+ - Initial PITest integration
+ - Bug fixes and stability improvements
+
+ ]]>
+
+ 1.0.10
Jason Lam
- com.github.jaksonlin.pitestintellij
- Pitest-Gradle
- jaksonlin
+ com.github.jaksonlin.testcraftpro
+ TestCraft Pro
+ Jakson Lin
com.intellij.modules.platform
com.intellij.modules.java
com.intellij.modules.lang
- com.intellij.modules.json
+ com.intellij.modules.json
Git4Idea
messages.MyBundle
-
+
+ factoryClass="com.github.jaksonlin.testcraft.presentation.toolWindow.LLMSuggestionsToolWindowFactory"/>
+ instance="com.github.jaksonlin.testcraft.application.settings.TestCraftSettingsConfigurable"/>
-
-
-
+
+
+
+ implementationClass="com.github.jaksonlin.testcraft.application.completions.AnnotationCompletionContributor"/>
-
+
@@ -104,23 +164,29 @@
-
diff --git a/src/main/resources/META-INF/withJson.xml b/src/main/resources/META-INF/withJson.xml
deleted file mode 100644
index c4b32869..00000000
--- a/src/main/resources/META-INF/withJson.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/src/main/resources/messages/MyBundle.properties b/src/main/resources/messages/MyBundle.properties
index 4e0dfc19..109ac78c 100644
--- a/src/main/resources/messages/MyBundle.properties
+++ b/src/main/resources/messages/MyBundle.properties
@@ -82,6 +82,7 @@ toolwindow.llm.title=TestCraft LLM Suggestions
action.RunPitestAction.text=Run Mutation Test
action.RunCaseAnnoationCheckAction.text=Run Current Method Annotation Check
action.GenerateAnnotationCommandAction.text=Generate Testcase Annotation On Method
+action.CheckInvalidTestCasesAction.text=Check Invalid Test Cases
action.UnittestHelperToolMenu.text=TestCraft Unittest Helpers
action.UnittestHelperSubMenu.text=TestCraft Unittest Helper Tools
@@ -141,4 +142,8 @@ test.annotation.exists.title=Annotation Already Exists
# Pitest Run Messages
pitest.run.canceled=Pitest run was canceled
pitest.run.canceled.title=Canceled
-pitest.run.error=Error executing Pitest command: %s
+pitest.run.error=Error executing Pitest command: %
+pitest.view.report=View HTML Report
+
+# Chat
+chat.send.button=Send
diff --git a/src/main/resources/messages/MyBundle_en_US.properties b/src/main/resources/messages/MyBundle_en_US.properties
index 4e0dfc19..ada35522 100644
--- a/src/main/resources/messages/MyBundle_en_US.properties
+++ b/src/main/resources/messages/MyBundle_en_US.properties
@@ -142,3 +142,6 @@ test.annotation.exists.title=Annotation Already Exists
pitest.run.canceled=Pitest run was canceled
pitest.run.canceled.title=Canceled
pitest.run.error=Error executing Pitest command: %s
+pitest.view.report=View HTML Report
+# Chat
+chat.send.button=Send
diff --git a/src/main/resources/messages/MyBundle_zh_CN.properties b/src/main/resources/messages/MyBundle_zh_CN.properties
index deb4166c..1fd1b8a4 100644
--- a/src/main/resources/messages/MyBundle_zh_CN.properties
+++ b/src/main/resources/messages/MyBundle_zh_CN.properties
@@ -75,6 +75,7 @@ toolwindow.llm.title=TestCraft LLM 建议
action.RunPitestAction.text=运行变异测试
action.RunCaseAnnoationCheckAction.text=运行当前方法注解检查
action.GenerateAnnotationCommandAction.text=在方法上生成测试用例注解
+action.CheckInvalidTestCasesAction.text=检查无效测试用例
action.UnittestHelperToolMenu.text=TestCraft 单元测试助手
action.UnittestHelperSubMenu.text=TestCraft 单元测试辅助工具
@@ -149,3 +150,6 @@ test.annotation.exists.title=注解已存在
pitest.run.canceled=Pitest 运行已取消
pitest.run.canceled.title=已取消
pitest.run.error=执行 Pitest 命令时出错：%s
+pitest.view.report=查看 HTML 报告
+# Chat
+chat.send.button=发送