[commons-net] branch master updated: Trying to find Windows examples issue

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git


The following commit(s) were added to refs/heads/master by this push:
     new 18e52f30 Trying to find Windows examples issue
18e52f30 is described below

commit 18e52f3079d7190d78b98642578d060db8af0ebc
Author: Sebb <s...@apache.org>
AuthorDate: Tue Aug 23 00:42:57 2022 +0100

    Trying to find Windows examples issue
    
    [skip actions]
---
 src/test/java/org/apache/commons/net/examples/MainTest.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/commons/net/examples/MainTest.java 
b/src/test/java/org/apache/commons/net/examples/MainTest.java
index d442e190..f2e95343 100644
--- a/src/test/java/org/apache/commons/net/examples/MainTest.java
+++ b/src/test/java/org/apache/commons/net/examples/MainTest.java
@@ -34,10 +34,8 @@ import org.junit.Test;
 public class MainTest {
 
     private static boolean hasMainMethod(String name) {
-        System.out.println("Initial name " + name);
         name = name.replace(".class", "");
-        name = name.replace("/", ".");
-        name = name.replace("\\", "."); // Allow for Windows
+        name = name.replace(File.separatorChar, '.');
         try {
             final Class<?> clazz = Class.forName(name, false, 
MainTest.class.getClassLoader());
             clazz.getMethod("main", String[].class);
@@ -56,7 +54,7 @@ public class MainTest {
     private static void processFileName(String name, final Properties p) {
         if (!name.endsWith(".class")
                 || name.contains("$") // subclasses
-                || name.endsWith("examples/Main.class")  // the initial class, 
don't want to add that
+                || name.endsWith("examples"+ File.separator + "Main.class")  
// the initial class, don't want to add that
                 || !hasMainMethod(name)
                 ) {
             return;
@@ -72,7 +70,6 @@ public class MainTest {
     }
 
     private static void scanForClasses(final int rootLength, final File 
current, final Properties p) {
-        System.out.println("len=" + rootLength + " " + current);
         final File[] files = current.listFiles();
         if (files != null) {
             for (final File file : files) {
@@ -109,6 +106,7 @@ public class MainTest {
     private Properties scanClasses() throws IOException {
         final CodeSource codeSource = 
Main.class.getProtectionDomain().getCodeSource();
         // ensure special characters are decoded OK by uing the charset
+        // Use canonical path to ensure consistency with Windows
         final String sourceFile = new 
File(URLDecoder.decode(codeSource.getLocation().getFile(),"UTF-8")).getCanonicalPath();
         final Properties p = new Properties();
         if (sourceFile.endsWith(".jar")) {
@@ -123,7 +121,7 @@ public class MainTest {
         } else {
             final File examples = new File(sourceFile, 
"org/apache/commons/net/examples"); // must match top level examples package 
name
             if (examples.exists()) {
-                System.out.println("sf="+sourceFile);
+                // need to add 1 to allow for path separator between root and 
file
                 scanForClasses(sourceFile.length() + 1, examples, p);
             } else {
                 fail("Could not find examples classes: " + 
examples.getCanonicalPath());