groovysh additional tests

Author: paulk-asert

subprojects/groovy-groovysh/build.gradle

@@ -34,6 +34,8 @@ dependencies {
     implementation projects.groovyJson
     implementation projects.groovyNio
     testImplementation projects.groovyTest
+    testImplementation projects.groovyCsv         // for /slurp .csv default coverage
+    testImplementation projects.groovyTestJunit6  // for @ForkedJvm in CSV fallback tests
     implementation "net.java.dev.jna:jna:${versions.jna}"
     implementation "org.jline:jansi:${versions.jline}"
     implementation "org.jline:jline-builtins:${versions.jline}"
@@ -51,6 +53,16 @@ plugins.withId('eclipse') {
     }
 }
 
+// Forward -Djunit.network from the Gradle invocation to the test JVM so that
+// @EnabledIfSystemProperty in network-gated tests (e.g. SlurpCsvFallbackTest)
+// can see it.
+tasks.named('test') {
+    def network = System.getProperty('junit.network')
+    if (network) {
+        systemProperty 'junit.network', network
+    }
+}
+
 tasks.named('rat') {
     excludes << '**/jline/GroovyEngine.java' // BSD license as per NOTICE/LICENSE files
     excludes << '**/jline/ObjectInspector.groovy' // BSD license as per NOTICE/LICENSE files

subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy

@@ -393,7 +393,7 @@ class Main {
                 }
                 name('groovysh')
             }.build()
-            if (terminal.width == 0 || terminal.height == 0) {
+            if (terminal.columns == 0 || terminal.rows == 0) {
                 terminal.size = new Size(120, 40) // hard-coded terminal size when redirecting
             }
             Thread executeThread = Thread.currentThread()
@@ -502,7 +502,7 @@ class Main {
                 println render(messages['startup_banner.1'])
                 println render(messages['startup_banner.2'])
             }
-            println '-' * (terminal.width - 1)
+            println '-' * (terminal.columns - 1)
 // for debugging
 //            def index = 0
 //            def lines = ['/slurp /Users/paulk/Projects/groovy/subprojects/groovy-json/src/test/resources/groovy9802.json',

subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ClassLoaderTest.groovy

@@ -0,0 +1,46 @@
+/*
+ *  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.
+ */
+package org.apache.groovy.groovysh.commands
+
+import org.junit.jupiter.api.Test
+
+/**
+ * Tests for the {@code /classloader} command.
+ *
+ * The command renders the engine's class loader using the {@code COLUMNS}
+ * option of {@code Printer.println(options, object)}; the support class's
+ * {@code DummyPrinter} extracts each column as a {@code name=value} entry
+ * so substring assertions remain straightforward.
+ */
+class ClassLoaderTest extends SystemTestSupport {
+
+    @Test
+    void viewExposesColumnDataForLoadedClassLoader() {
+        // Define a type so the class loader has at least one entry to render.
+        engine.execute('class ClassLoaderProbe {}')
+        system.execute('/classloader')
+        def out = printer.output.join()
+        // Each column name from the /classloader command appears as a
+        // `name=...` entry. Don't assert on values' exact shape (lists vary
+        // by JDK and previous test state); just confirm the columns rendered.
+        assert out.contains('loadedClasses=')
+        assert out.contains('definedPackages=')
+        assert out.contains('classPath=')
+    }
+}

subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ConsoleTestSupport.groovy

@@ -22,6 +22,7 @@ import org.apache.groovy.groovysh.Main
 import org.apache.groovy.groovysh.jline.GroovyCommands
 import org.apache.groovy.groovysh.jline.GroovyConsoleEngine
 import org.apache.groovy.groovysh.jline.GroovyEngine
+import org.jline.console.Printer
 import org.jline.builtins.ClasspathResourceUtil
 import org.jline.builtins.ConfigurationPath
 import org.jline.builtins.SyntaxHighlighter
@@ -34,6 +35,7 @@ import org.jline.reader.impl.DefaultParser
 import org.junit.jupiter.api.BeforeEach
 
 import java.nio.file.Path
+import java.util.function.Supplier
 
 /**
  * Support for testing {@link ConsoleEngine} instances.
@@ -44,9 +46,10 @@ abstract class ConsoleTestSupport {
     private Path root = ClasspathResourceUtil.getResourcePath(rootURL)
     private Path temp = File.createTempDir().toPath()
     protected ConfigurationPath configPath = new ConfigurationPath(root, temp)
+    protected Supplier<Path> workDir = { -> temp } as Supplier<Path>
     protected DummyPrinter printer = new DummyPrinter(configPath)
     private highlighter = SyntaxHighlighter.build(root, "DUMMY")
-    protected CommandRegistry groovy = new GroovyCommands(engine, null, printer, highlighter)
+    protected CommandRegistry groovy = new GroovyCommands(engine, workDir, printer, highlighter)
     protected ConsoleEngine console
     protected CommandRegistry.CommandSession session = new CommandRegistry.CommandSession()
     protected LineReader reader
@@ -70,7 +73,19 @@ abstract class ConsoleTestSupport {
 
         @Override
         void println(Map<String, Object> options, Object object) {
-            output << object.toString()
+            // /classloader --view passes the EngineClassLoader as `object`
+            // with COLUMNS option naming the fields to render. DefaultPrinter
+            // would format those as a table; in tests we capture each
+            // column as `name=value` so substring assertions still work.
+            if (object instanceof GroovyEngine.EngineClassLoader) {
+                options?[Printer.COLUMNS]?.each { col ->
+                    output << "$col=" + object."$col"
+                }
+            } else {
+                // .toString() (not String.valueOf) preserves Groovy MetaClass
+                // extensions — Map renders as [k:v] not {k=v}.
+                output << object.toString()
+            }
         }
 
         @Override

subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/DelTest.groovy

@@ -0,0 +1,56 @@
+/*
+ *  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.
+ */
+package org.apache.groovy.groovysh.commands
+
+import org.junit.jupiter.api.Test
+
+/**
+ * Tests for the {@code /del} command. Uses the full {@link SystemTestSupport}
+ * stack so each invocation passes through registry parsing, pipe handling,
+ * and console dispatch — exercising the same path as a real REPL session.
+ */
+class DelTest extends SystemTestSupport {
+
+    @Test
+    void testDelVariable() {
+        console.execute('dummyName', "x = 42")
+        assert console.hasVariable('x')
+        system.execute('/del x')
+        assert !console.hasVariable('x')
+    }
+
+    @Test
+    void testDelMultipleVariables() {
+        console.execute('dummyName', "a = 1; b = 2; c = 3")
+        ['a', 'b', 'c'].each { assert console.hasVariable(it) }
+        system.execute('/del a c')
+        assert !console.hasVariable('a')
+        assert console.hasVariable('b')
+        assert !console.hasVariable('c')
+    }
+
+    @Test
+    void testDelNonexistentIsHarmless() {
+        // /del on an unknown variable should be a no-op, not a hard failure
+        // that aborts the REPL session.
+        system.execute('/del thisVariableDoesNotExist')
+        // No exception — pre-existing variables (none) are unaffected.
+        assert !console.hasVariable('thisVariableDoesNotExist')
+    }
+}

subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/GrabCommandTest.groovy

@@ -0,0 +1,53 @@
+/*
+ *  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.
+ */
+package org.apache.groovy.groovysh.commands
+
+import groovy.junit6.plugin.ForkedJvm
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty
+
+/**
+ * Tests for the {@code /grab} command — Maven-coordinate dependency
+ * resolution via Grape. The actual artifact-fetching test is forked and
+ * network-gated; the no-arg test runs always to lock in the documented
+ * "no args is a no-op" behaviour that {@code GroovyCommands.grab} relies
+ * on for {@code grab(input)} when no xargs are supplied.
+ */
+class GrabTest extends SystemTestSupport {
+
+    @Test
+    void grabWithNoArgsIsNoOp() {
+        // grab() returns null when input.xargs() is empty; this should
+        // succeed silently rather than throw.
+        system.execute('/grab')
+    }
+
+    @Test
+    @ForkedJvm
+    @EnabledIfSystemProperty(named = 'junit.network', matches = 'true')
+    void grabFetchesArtifactAndMakesItLoadable() {
+        // commons-lang3 is small, stable, and uses well-known coordinates.
+        // After the grab, the artifact's classes should resolve through
+        // the engine's classloader.
+        system.execute('/grab org.apache.commons:commons-lang3:3.14.0')
+        def cls = engine.execute("Class.forName('org.apache.commons.lang3.StringUtils')")
+        assert cls != null
+        assert cls.name == 'org.apache.commons.lang3.StringUtils'
+    }
+}