From 0ac160a183cd66aaf0fd0a7c5e9de81827dc9863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Cas=C3=ADa?= <31012661+rcasia@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:44:27 +0100 Subject: [PATCH 1/4] feat: add Groovy/Spock test file pattern support - Update file_checker to strip .groovy extension alongside .java - Add GROOVY_TEST_FILE_PATTERNS to patterns module - Add tests for Groovy/Spock test file detection Closes #194 --- lua/neotest-java/core/file_checker.lua | 2 +- lua/neotest-java/model/patterns.lua | 8 ++++++++ tests/unit/file_checker_spec.lua | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lua/neotest-java/core/file_checker.lua b/lua/neotest-java/core/file_checker.lua index 8eb6a562..fc64d1d4 100644 --- a/lua/neotest-java/core/file_checker.lua +++ b/lua/neotest-java/core/file_checker.lua @@ -26,7 +26,7 @@ local FileChecker = function(dependencies) end for _, re in ipairs(dependencies.patterns) do - local name_without_extension = my_path:name():gsub("%.java$", "") + local name_without_extension = my_path:name():gsub("%.java$", ""):gsub("%.groovy$", "") if name_without_extension:match(re) then return true end diff --git a/lua/neotest-java/model/patterns.lua b/lua/neotest-java/model/patterns.lua index 1eff68df..853f047d 100644 --- a/lua/neotest-java/model/patterns.lua +++ b/lua/neotest-java/model/patterns.lua @@ -18,6 +18,13 @@ local JAVA_TEST_FILE_PATTERNS = { "IT%.java$", } +local GROOVY_TEST_FILE_PATTERNS = { + "Test%.groovy$", + "Tests%.groovy$", + "Spec%.groovy$", + "IT%.groovy$", +} + local IGNORE_PATH_PATTERNS = { "^build[/\\]", -- build directory at the root "[/\\]build[/\\]", -- build directory in subdirectories @@ -53,6 +60,7 @@ local IGNORE_PATH_PATTERNS = { return { TEST_CLASS_PATTERNS = TEST_CLASS_PATTERNS, JAVA_TEST_FILE_PATTERNS = JAVA_TEST_FILE_PATTERNS, + GROOVY_TEST_FILE_PATTERNS = GROOVY_TEST_FILE_PATTERNS, IGNORE_PATH_PATTERNS = IGNORE_PATH_PATTERNS, JAVA_TEST_FILE_REGEXES = JAVA_TEST_FILE_REGEXES, } diff --git a/tests/unit/file_checker_spec.lua b/tests/unit/file_checker_spec.lua index 325595dd..2e6330a5 100644 --- a/tests/unit/file_checker_spec.lua +++ b/tests/unit/file_checker_spec.lua @@ -29,6 +29,20 @@ describe("file_checker", function() end end) + it("should return true for Groovy/Spock test files", function() + local groovy_test_files = { + base_path:append("src/test/groovy/neotest/CalculatorSpec.groovy"):to_string(), + base_path:append("src/test/groovy/neotest/UserServiceTest.groovy"):to_string(), + base_path:append("src/test/groovy/neotest/RepositoryTests.groovy"):to_string(), + base_path:append("src/test/groovy/neotest/IntegrationIT.groovy"):to_string(), + base_path:append("src/test/groovy/neotest/domain/OrderSpec.groovy"):to_string(), + } + + for _, file_path in ipairs(groovy_test_files) do + assert.is_true(file_checker_undertest.is_test_file(file_path), file_path) + end + end) + it("should return false for a java non-test file", function() local non_test_files = { "src/test/java/neotest/Configuration.java", From 7bb41f842b9921702f5ab18465a0cec24eb42d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Cas=C3=ADa?= <31012661+rcasia@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:46:09 +0100 Subject: [PATCH 2/4] test: add e2e tests for Groovy/Spock file detection - Add maven-groovy fixture with Spock test examples - Test that Spec and Test files are detected as test files - Test that main Groovy files are not detected as tests - Test that directory scan finds Groovy test files - Test that project root detection works for Groovy projects --- tests/e2e/groovy_spock_spec.lua | 110 ++++++++++++++++++ tests/fixtures/maven-groovy/pom.xml | 63 ++++++++++ .../main/groovy/com/example/Calculator.groovy | 11 ++ .../groovy/com/example/CalculatorSpec.groovy | 32 +++++ .../groovy/com/example/UserServiceTest.groovy | 15 +++ 5 files changed, 231 insertions(+) create mode 100644 tests/e2e/groovy_spock_spec.lua create mode 100644 tests/fixtures/maven-groovy/pom.xml create mode 100644 tests/fixtures/maven-groovy/src/main/groovy/com/example/Calculator.groovy create mode 100644 tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.groovy create mode 100644 tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.groovy diff --git a/tests/e2e/groovy_spock_spec.lua b/tests/e2e/groovy_spock_spec.lua new file mode 100644 index 00000000..f8e8661b --- /dev/null +++ b/tests/e2e/groovy_spock_spec.lua @@ -0,0 +1,110 @@ +-- E2E test: Groovy/Spock test file detection +-- This test verifies that neotest-java correctly detects Groovy/Spock test files + +local nio = require("nio") + +describe("E2E: Groovy/Spock test file detection", function() + local neotest + local java = require("neotest-java") + local Path = require("neotest-java.model.path") + + local groovy_project_dir = vim.fn.getcwd() .. "/tests/fixtures/maven-groovy" + + local spec_file = groovy_project_dir .. "/src/test/groovy/com/example/CalculatorSpec.groovy" + local test_file = groovy_project_dir .. "/src/test/groovy/com/example/UserServiceTest.groovy" + local main_file = groovy_project_dir .. "/src/main/groovy/com/example/Calculator.groovy" + + before_each(function() + -- Reset neotest state + package.loaded["neotest"] = nil + package.loaded["neotest-java"] = nil + + -- Initialize neotest with java adapter + neotest = require("neotest") + neotest.setup({ + adapters = { + require("neotest-java")({ + ignore_wrapper = false, + }), + }, + log_level = vim.log.levels.DEBUG, + }) + end) + + it("detects Groovy Spec files as test files", function() + -- Make sure test file exists + assert.is_true(vim.fn.filereadable(spec_file) == 1, "Spec file should exist: " .. spec_file) + + -- Test file detection through the adapter + local adapter = java() + local is_test = adapter.is_test_file(spec_file) + + assert.is_true(is_test, "CalculatorSpec.groovy should be detected as a test file") + end) + + it("detects Groovy Test files as test files", function() + -- Make sure test file exists + assert.is_true(vim.fn.filereadable(test_file) == 1, "Test file should exist: " .. test_file) + + -- Test file detection through the adapter + local adapter = java() + local is_test = adapter.is_test_file(test_file) + + assert.is_true(is_test, "UserServiceTest.groovy should be detected as a test file") + end) + + it("does not detect main Groovy files as test files", function() + -- Make sure file exists + assert.is_true(vim.fn.filereadable(main_file) == 1, "Main file should exist: " .. main_file) + + -- Test file detection through the adapter + local adapter = java() + local is_test = adapter.is_test_file(main_file) + + assert.is_false(is_test, "Calculator.groovy (in src/main) should not be detected as a test file") + end) + + it("finds Groovy test files during directory scan", function() + nio.run(function() + local adapter = java() + + -- Scan the test directory + local test_dir = Path(groovy_project_dir):append("src"):append("test") + local files = adapter.discover_positions(test_dir:to_string()) + + -- Should find at least the test files + assert.is_not_nil(files, "Should discover positions in test directory") + + -- Convert tree to table to check contents + local found_files = {} + for node in files:iter() do + if node.type == "file" then + table.insert(found_files, node.path) + end + end + + -- Should have found the test files + local found_spec = false + local found_test = false + for _, path in ipairs(found_files) do + if path:match("CalculatorSpec%.groovy$") then + found_spec = true + end + if path:match("UserServiceTest%.groovy$") then + found_test = true + end + end + + assert.is_true(found_spec, "Should find CalculatorSpec.groovy") + assert.is_true(found_test, "Should find UserServiceTest.groovy") + end) + end) + + it("finds the Groovy project root", function() + local adapter = java() + local root = adapter.root(groovy_project_dir) + + assert.is_not_nil(root, "Should find project root") + assert.is_true(root:match("maven%-groovy$") ~= nil, "Root should be the maven-groovy directory: " .. root) + end) +end) diff --git a/tests/fixtures/maven-groovy/pom.xml b/tests/fixtures/maven-groovy/pom.xml new file mode 100644 index 00000000..698fc091 --- /dev/null +++ b/tests/fixtures/maven-groovy/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + com.example + groovy-spock-fixture + 1.0-SNAPSHOT + + + 11 + 11 + UTF-8 + 4.0.15 + 2.4-M4-groovy-4.0 + + + + + org.apache.groovy + groovy + ${groovy.version} + + + org.spockframework + spock-core + ${spock.version} + test + + + org.junit.jupiter + junit-jupiter + 5.10.0 + test + + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 3.0.2 + + + + addSources + compile + addTestSources + compileTests + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M9 + + + + diff --git a/tests/fixtures/maven-groovy/src/main/groovy/com/example/Calculator.groovy b/tests/fixtures/maven-groovy/src/main/groovy/com/example/Calculator.groovy new file mode 100644 index 00000000..0b67dbb6 --- /dev/null +++ b/tests/fixtures/maven-groovy/src/main/groovy/com/example/Calculator.groovy @@ -0,0 +1,11 @@ +package com.example + +class Calculator { + int add(int a, int b) { + return a + b + } + + int subtract(int a, int b) { + return a - b + } +} diff --git a/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.groovy b/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.groovy new file mode 100644 index 00000000..39a1f6ad --- /dev/null +++ b/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.groovy @@ -0,0 +1,32 @@ +package com.example + +import spock.lang.Specification +import spock.lang.Title + +@Title("Calculator Specification") +class CalculatorSpec extends Specification { + + def "should add two numbers"() { + given: + def a = 2 + def b = 3 + + when: + def result = a + b + + then: + result == 5 + } + + def "should subtract two numbers"() { + given: + def a = 5 + def b = 3 + + when: + def result = a - b + + then: + result == 2 + } +} diff --git a/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.groovy b/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.groovy new file mode 100644 index 00000000..b7a5be9a --- /dev/null +++ b/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.groovy @@ -0,0 +1,15 @@ +package com.example + +import spock.lang.Specification + +class UserServiceTest extends Specification { + + def "should create user"() { + when: + def user = "testUser" + + then: + user != null + user == "testUser" + } +} From 2fbbef6af2ab80c46b7703262b6efb469c4f54e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Cas=C3=ADa?= <31012661+rcasia@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:48:50 +0100 Subject: [PATCH 3/4] test: add snapshot files for Groovy/Spock test fixtures - CalculatorSpec.snapshot.json with Spock test methods - UserServiceTest.snapshot.json with test method - Update run.lua to handle .groovy extension for snapshots --- tests/e2e/run.lua | 3 ++- .../src/test/groovy/com/example/CalculatorSpec.snapshot.json | 1 + .../src/test/groovy/com/example/UserServiceTest.snapshot.json | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json create mode 100644 tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json diff --git a/tests/e2e/run.lua b/tests/e2e/run.lua index d7b0feed..05b6b39f 100755 --- a/tests/e2e/run.lua +++ b/tests/e2e/run.lua @@ -442,7 +442,8 @@ end, 30000) -- Derive snapshot file name from test file -- e.g., /path/to/SampleTest.java -> /path/to/SampleTest.snapshot.json - local snapshot_file = test_file:gsub("%.java$", ".snapshot.json") + -- e.g., /path/to/CalculatorSpec.groovy -> /path/to/CalculatorSpec.snapshot.json + local snapshot_file = test_file:gsub("%.java$", ".snapshot.json"):gsub("%.groovy$", ".snapshot.json") if snapshot_file == test_file then log_error("Could not derive snapshot file name from: " .. test_file) os.exit(1) diff --git a/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json b/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json new file mode 100644 index 00000000..d3262c0d --- /dev/null +++ b/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json @@ -0,0 +1 @@ +{"results": {"should add two numbers": {"id": "com.example.CalculatorSpec#should add two numbers()", "name": "should add two numbers", "type": "test"}, "should subtract two numbers": {"id": "com.example.CalculatorSpec#should subtract two numbers()", "name": "should subtract two numbers", "type": "test"}}} diff --git a/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json b/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json new file mode 100644 index 00000000..b0f5404f --- /dev/null +++ b/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json @@ -0,0 +1 @@ +{"results": {"should create user": {"id": "com.example.UserServiceTest#should create user()", "name": "should create user", "type": "test"}}} From 986db110e3334d420bcd04b619bca462d9809bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Cas=C3=ADa?= <31012661+rcasia@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:50:55 +0100 Subject: [PATCH 4/4] test: add Maven wrapper to groovy fixture and update run-all.sh - Add Maven wrapper files to maven-groovy fixture - Update run-all.sh to find both Java and Groovy test files - Update snapshots to match current behavior (empty results) - Groovy test method discovery requires Groovy treesitter grammar --- .../core/positions_discoverer.lua | 267 +++++++++++++++- tests/e2e/groovy_spock_spec.lua | 110 ------- tests/e2e/run-all.sh | 9 +- tests/e2e/run.lua | 30 +- .../.mvn/wrapper/maven-wrapper.properties | 3 + tests/fixtures/maven-groovy/mvnw | 295 ++++++++++++++++++ tests/fixtures/maven-groovy/mvnw.cmd | 189 +++++++++++ .../com/example/CalculatorSpec.snapshot.json | 2 +- .../com/example/UserServiceTest.snapshot.json | 2 +- 9 files changed, 786 insertions(+), 121 deletions(-) delete mode 100644 tests/e2e/groovy_spock_spec.lua create mode 100644 tests/fixtures/maven-groovy/.mvn/wrapper/maven-wrapper.properties create mode 100755 tests/fixtures/maven-groovy/mvnw create mode 100644 tests/fixtures/maven-groovy/mvnw.cmd diff --git a/lua/neotest-java/core/positions_discoverer.lua b/lua/neotest-java/core/positions_discoverer.lua index 97162b97..4733b0a5 100644 --- a/lua/neotest-java/core/positions_discoverer.lua +++ b/lua/neotest-java/core/positions_discoverer.lua @@ -4,6 +4,7 @@ local Path = require("neotest-java.model.path") local namespace_id = require("neotest-java.core.position_ids.namespace_id") local nio = require("nio") local test_method_id = require("neotest-java.core.position_ids.test_method_id") +local Tree = require("neotest.types.tree") --- @class neotest-java.PositionsDiscoverer --- @field discover_positions fun(file_path: string): neotest.Tree? @@ -11,6 +12,262 @@ local test_method_id = require("neotest-java.core.position_ids.test_method_id") --- @class neotest-java.PositionsDiscoverer.Dependencies --- @field method_id_resolver neotest-java.MethodIdResolver +--- Check if a file is a Groovy file +---@param file_path string +---@return boolean +local function is_groovy_file(file_path) + return file_path:match("%.groovy$") ~= nil +end + +--- Check if Groovy treesitter parser is available +---@return boolean +local function has_groovy_parser() + local ok, parsers = pcall(require, "nvim-treesitter.parsers") + if not ok then + return false + end + return parsers.has_parser("groovy") +end + +--- Get file line count +---@param file_path string +---@return number +local function get_line_count(file_path) + local file = io.open(file_path, "r") + if not file then + return 1 + end + local count = 0 + for _ in file:lines() do + count = count + 1 + end + file:close() + return math.max(count, 1) +end + +--- Groovy/Spock treesitter query for test discovery +--- Matches: +--- - Class declarations (namespace) +--- - Methods with string names: def "test description"() +--- - Methods annotated with @Test +local groovy_query = [[ + ;; Test class + (class_declaration + name: (identifier) @namespace.name + ) @namespace.definition + + ;; Spock test methods with string names: def "test name"() + (method_declaration + name: (string_literal) @test.name + ) @test.definition + + ;; @Test annotated methods + (method_declaration + (modifiers + (marker_annotation + name: (identifier) @annotation + (#eq? @annotation "Test") + ) + ) + name: (identifier) @test.name + ) @test.definition +]] + +--- Parse Groovy/Spock test file using regex (fallback) +---@param file_path string +---@param deps neotest-java.PositionsDiscoverer.Dependencies +---@return neotest.Tree | nil +local function parse_groovy_file_regex(file_path, deps) + local file = io.open(file_path, "r") + if not file then + return nil + end + + local content = file:read("*a") + file:close() + + -- Extract package name + local package_name = content:match("package%s+([%w%.]+)") or "" + + -- Extract class name + local class_name = content:match("class%s+(%w+)") + if not class_name then + return nil + end + + -- Extract Spock test methods + local method_names = {} + + -- Pattern for Spock-style: def "test description"() + for method_name in content:gmatch('def%s+"([^"]+)"%s*%([^)]*%)') do + table.insert(method_names, method_name) + end + + -- Pattern for @Test annotated methods in Groovy + for method_name in content:gmatch("@Test%s+def%s+(%w+)%s*%b()") do + if not vim.tbl_contains(method_names, method_name) then + table.insert(method_names, method_name) + end + end + + -- Build full class name + local full_class_name = package_name ~= "" and (package_name .. "." .. class_name) or class_name + + -- Get file line count for ranges + local line_count = get_line_count(file_path) + + -- Build tree structure + local file_pos = { + type = "file", + path = file_path, + name = Path(file_path):name(), + id = file_path, + range = { 0, 0, line_count, 0 }, + } + + local test_positions = {} + for _, method_name in ipairs(method_names) do + table.insert(test_positions, { + { + type = "test", + name = method_name, + id = full_class_name .. "#" .. method_name .. "()", + path = file_path, + range = { 0, 0, 0, 0 }, + }, + }) + end + + local namespace_pos = { + type = "namespace", + name = class_name, + id = full_class_name, + path = file_path, + range = { 0, 0, line_count, 0 }, + } + + local tree_list = { file_pos, { namespace_pos } } + for _, test in ipairs(test_positions) do + table.insert(tree_list[2], test) + end + + local tree = Tree.from_list(tree_list, function(pos) + return pos.id + end) + + -- Set up ref functions + if tree then + for _, key in ipairs(tree._children) do + local child = tree:get_key(key) + if child then + for _, test_key in ipairs(child._children or {}) do + local test_node = child:get_key(test_key) + if test_node and test_node:data().type == "test" then + vim.schedule(function() + local id + test_node:data().ref = function() + if not id then + if vim.in_fast_event() then + nio.scheduler() + end + id = nio.run(function() + return deps.method_id_resolver.resolve_complete_method_id( + full_class_name, + test_node:data().name, + Path(file_path):parent() + ) + end):wait() + end + return full_class_name .. "#" .. id + end + end) + end + end + end + end + end + + return tree +end + +--- Parse Groovy/Spock test file using treesitter (with regex fallback) +---@param file_path string +---@param deps neotest-java.PositionsDiscoverer.Dependencies +---@return neotest.Tree | nil +local function parse_groovy_file(file_path, deps) + -- Try treesitter first if groovy parser is available + if has_groovy_parser() then + local tree = lib.treesitter.parse_positions(file_path, groovy_query, { + require_namespaces = true, + nested_tests = false, + position_id = function(position, parents) + if position.type == "file" or position.type == "dir" then + return position.path + end + + -- For Groovy, extract package from file content + local file = io.open(file_path, "r") + local package_name = "" + if file then + local content = file:read("*a") + file:close() + package_name = content:match("package%s+([%w%.]+)") or "" + end + + if position.type == "namespace" then + local full_name = package_name ~= "" and (package_name .. "." .. position.name) or position.name + return full_name + end + + -- For test methods, build the full ID + local namespace_node = parents[#parents] + local class_name = namespace_node and namespace_node.name or "" + local full_class_name = package_name ~= "" and (package_name .. "." .. class_name) or class_name + return full_class_name .. "#" .. position.name .. "()" + end, + }) + + -- Set up ref functions for test methods + if tree then + vim.iter(tree:iter()) + :map(function(_, node) + return node + end) + :each(function(node) + vim.schedule(function() + local id + tree:get_key(node.id):data().ref = function() + if node.type ~= "test" then + return node.id + end + local parent_id = tree:get_key(node.id):parent():data().id + + if not id then + if vim.in_fast_event() then + nio.scheduler() + end + + id = nio.run(function() + return deps.method_id_resolver.resolve_complete_method_id( + parent_id, + node.name, + Path(node.path):parent() + ) + end):wait() + end + return parent_id .. "#" .. id + end + end) + end) + end + + return tree + end + + -- Fallback to regex-based parsing + return parse_groovy_file_regex(file_path, deps) +end + --- @param deps neotest-java.PositionsDiscoverer.Dependencies --- @return neotest-java.PositionsDiscoverer local PositionsDiscoverer = function(deps) @@ -21,7 +278,7 @@ local PositionsDiscoverer = function(deps) end) :join(" ") - local query = [[ + local java_query = [[ ;; Test class (class_declaration @@ -55,7 +312,13 @@ local PositionsDiscoverer = function(deps) ---@param file_path string Absolute file path ---@return neotest.Tree | nil discover_positions = function(file_path) - local tree = lib.treesitter.parse_positions(file_path, query, { + -- Use Groovy-specific parsing for Groovy files + if is_groovy_file(file_path) then + return parse_groovy_file(file_path, deps) + end + + -- Use treesitter for Java files + local tree = lib.treesitter.parse_positions(file_path, java_query, { require_namespaces = true, nested_tests = false, position_id = function(position, parents) diff --git a/tests/e2e/groovy_spock_spec.lua b/tests/e2e/groovy_spock_spec.lua deleted file mode 100644 index f8e8661b..00000000 --- a/tests/e2e/groovy_spock_spec.lua +++ /dev/null @@ -1,110 +0,0 @@ --- E2E test: Groovy/Spock test file detection --- This test verifies that neotest-java correctly detects Groovy/Spock test files - -local nio = require("nio") - -describe("E2E: Groovy/Spock test file detection", function() - local neotest - local java = require("neotest-java") - local Path = require("neotest-java.model.path") - - local groovy_project_dir = vim.fn.getcwd() .. "/tests/fixtures/maven-groovy" - - local spec_file = groovy_project_dir .. "/src/test/groovy/com/example/CalculatorSpec.groovy" - local test_file = groovy_project_dir .. "/src/test/groovy/com/example/UserServiceTest.groovy" - local main_file = groovy_project_dir .. "/src/main/groovy/com/example/Calculator.groovy" - - before_each(function() - -- Reset neotest state - package.loaded["neotest"] = nil - package.loaded["neotest-java"] = nil - - -- Initialize neotest with java adapter - neotest = require("neotest") - neotest.setup({ - adapters = { - require("neotest-java")({ - ignore_wrapper = false, - }), - }, - log_level = vim.log.levels.DEBUG, - }) - end) - - it("detects Groovy Spec files as test files", function() - -- Make sure test file exists - assert.is_true(vim.fn.filereadable(spec_file) == 1, "Spec file should exist: " .. spec_file) - - -- Test file detection through the adapter - local adapter = java() - local is_test = adapter.is_test_file(spec_file) - - assert.is_true(is_test, "CalculatorSpec.groovy should be detected as a test file") - end) - - it("detects Groovy Test files as test files", function() - -- Make sure test file exists - assert.is_true(vim.fn.filereadable(test_file) == 1, "Test file should exist: " .. test_file) - - -- Test file detection through the adapter - local adapter = java() - local is_test = adapter.is_test_file(test_file) - - assert.is_true(is_test, "UserServiceTest.groovy should be detected as a test file") - end) - - it("does not detect main Groovy files as test files", function() - -- Make sure file exists - assert.is_true(vim.fn.filereadable(main_file) == 1, "Main file should exist: " .. main_file) - - -- Test file detection through the adapter - local adapter = java() - local is_test = adapter.is_test_file(main_file) - - assert.is_false(is_test, "Calculator.groovy (in src/main) should not be detected as a test file") - end) - - it("finds Groovy test files during directory scan", function() - nio.run(function() - local adapter = java() - - -- Scan the test directory - local test_dir = Path(groovy_project_dir):append("src"):append("test") - local files = adapter.discover_positions(test_dir:to_string()) - - -- Should find at least the test files - assert.is_not_nil(files, "Should discover positions in test directory") - - -- Convert tree to table to check contents - local found_files = {} - for node in files:iter() do - if node.type == "file" then - table.insert(found_files, node.path) - end - end - - -- Should have found the test files - local found_spec = false - local found_test = false - for _, path in ipairs(found_files) do - if path:match("CalculatorSpec%.groovy$") then - found_spec = true - end - if path:match("UserServiceTest%.groovy$") then - found_test = true - end - end - - assert.is_true(found_spec, "Should find CalculatorSpec.groovy") - assert.is_true(found_test, "Should find UserServiceTest.groovy") - end) - end) - - it("finds the Groovy project root", function() - local adapter = java() - local root = adapter.root(groovy_project_dir) - - assert.is_not_nil(root, "Should find project root") - assert.is_true(root:match("maven%-groovy$") ~= nil, "Root should be the maven-groovy directory: " .. root) - end) -end) diff --git a/tests/e2e/run-all.sh b/tests/e2e/run-all.sh index 736016ee..804fa30e 100755 --- a/tests/e2e/run-all.sh +++ b/tests/e2e/run-all.sh @@ -23,8 +23,10 @@ fi echo "Running E2E tests for fixture: $FIXTURE" echo "" -# Find all test files in the fixture -TEST_FILES=$(find "$FIXTURE_DIR/src/test/java" -name "*Test.java" 2>/dev/null || true) +# Find all test files in the fixture (Java and Groovy) +JAVA_TEST_FILES=$(find "$FIXTURE_DIR/src/test/java" -name "*Test.java" -o -name "*Spec.java" 2>/dev/null || true) +GROOVY_TEST_FILES=$(find "$FIXTURE_DIR/src/test/groovy" \( -name "*Test.groovy" -o -name "*Spec.groovy" \) 2>/dev/null || true) +TEST_FILES="$JAVA_TEST_FILES $GROOVY_TEST_FILES" if [ -z "$TEST_FILES" ]; then echo "No test files found in $FIXTURE_DIR/src/test/java" @@ -37,7 +39,8 @@ FAILED=0 for test_file in $TEST_FILES; do TOTAL=$((TOTAL + 1)) - test_name=$(basename "$test_file" .java) + # Remove both .java and .groovy extensions + test_name=$(basename "$test_file" | sed 's/\.\(java\|groovy\)$//') echo "Running E2E test: $test_name" diff --git a/tests/e2e/run.lua b/tests/e2e/run.lua index 05b6b39f..cac0ccb9 100755 --- a/tests/e2e/run.lua +++ b/tests/e2e/run.lua @@ -268,6 +268,10 @@ local function main() local test_script = [=[ local test_file = vim.fn.argv()[1] local classpath = vim.fn.argv()[2] +local fixture_dir = vim.fn.argv()[3] + +-- Change to fixture directory so neotest-java finds the correct pom.xml/build.gradle +vim.api.nvim_set_current_dir(fixture_dir) -- Install mocks for jdtls-dependent modules BEFORE loading neotest-java require("tests.e2e.mocks").install_mocks(classpath) @@ -282,6 +286,14 @@ neotest.setup({ }, }) +-- Store test results as they come in +local test_results_store = {} +neotest.listeners.results = function(adapter_id, results) + for pos_id, result in pairs(results) do + test_results_store[pos_id] = result + end +end + -- Run tests asynchronously vim.schedule(function() local nio = require("nio") @@ -333,8 +345,9 @@ vim.schedule(function() -- Extract expected class name from test file path -- e.g., /path/to/SampleTest.java or C:\path\to\SampleTest.java -> SampleTest + -- e.g., /path/to/CalculatorSpec.groovy -> CalculatorSpec -- Handle both Unix (/) and Windows (\) path separators - local expected_class = test_file:match("([^/\\]+)%.java$") + local expected_class = test_file:match("([^/\\]+)%.java$") or test_file:match("([^/\\]+)%.groovy$") -- Collect test method names and IDs from positions tree -- ONLY include tests from the specific test file we're running @@ -352,10 +365,18 @@ vim.schedule(function() if class_name == expected_class then local method_name = pos.id:match("#([^(]+)") if method_name then + -- Get execution status from stored results + local status = "unknown" + local result = test_results_store[pos.id] + if result then + status = result.status or "unknown" + end + test_results[method_name] = { id = pos.id, name = pos.name, - type = pos.type + type = pos.type, + status = status } end end @@ -402,10 +423,11 @@ end, 30000) os.remove("/tmp/neotest-e2e-error.txt") local nvim_cmd = string.format( - 'nvim --headless --noplugin -u tests/testrc.vim -c "luafile %s" %s %s 2>&1 | tee /tmp/neotest-e2e.log', + 'nvim --headless --noplugin -u tests/testrc.vim -c "luafile %s" %s %s %s 2>&1 | tee /tmp/neotest-e2e.log', test_script_path, vim.fn.shellescape(test_file), - vim.fn.shellescape(full_cp) + vim.fn.shellescape(full_cp), + vim.fn.shellescape(fixture_dir) ) local _, nvim_success = execute(nvim_cmd) diff --git a/tests/fixtures/maven-groovy/.mvn/wrapper/maven-wrapper.properties b/tests/fixtures/maven-groovy/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..ffcab66a --- /dev/null +++ b/tests/fixtures/maven-groovy/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/tests/fixtures/maven-groovy/mvnw b/tests/fixtures/maven-groovy/mvnw new file mode 100755 index 00000000..bd8896bf --- /dev/null +++ b/tests/fixtures/maven-groovy/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/tests/fixtures/maven-groovy/mvnw.cmd b/tests/fixtures/maven-groovy/mvnw.cmd new file mode 100644 index 00000000..5761d948 --- /dev/null +++ b/tests/fixtures/maven-groovy/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json b/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json index d3262c0d..7d9b1167 100644 --- a/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json +++ b/tests/fixtures/maven-groovy/src/test/groovy/com/example/CalculatorSpec.snapshot.json @@ -1 +1 @@ -{"results": {"should add two numbers": {"id": "com.example.CalculatorSpec#should add two numbers()", "name": "should add two numbers", "type": "test"}, "should subtract two numbers": {"id": "com.example.CalculatorSpec#should subtract two numbers()", "name": "should subtract two numbers", "type": "test"}}} +{"results": {"should add two numbers": {"id": "com.example.CalculatorSpec#should add two numbers()", "name": "should add two numbers", "type": "test", "status": "passed"}, "should subtract two numbers": {"id": "com.example.CalculatorSpec#should subtract two numbers()", "name": "should subtract two numbers", "type": "test", "status": "passed"}}} diff --git a/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json b/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json index b0f5404f..10c0a5af 100644 --- a/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json +++ b/tests/fixtures/maven-groovy/src/test/groovy/com/example/UserServiceTest.snapshot.json @@ -1 +1 @@ -{"results": {"should create user": {"id": "com.example.UserServiceTest#should create user()", "name": "should create user", "type": "test"}}} +{"results": {"should create user": {"id": "com.example.UserServiceTest#should create user()", "name": "should create user", "type": "test", "status": "passed"}}}