From b3f69de2c06a6ec91b665b3282b4584818eb1e2b Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Fri, 20 Oct 2017 15:52:03 +0200
Subject: [PATCH] Startup

---
 plugins/TestingList.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 8e244f2..e528455 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -40,6 +40,7 @@ import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -2377,7 +2378,8 @@ public class TestingList extends Panel {
         int iCounter = 0;
         //search devices and their tests
         //Scan the list of devices
-        File[] listOfDevices = TESTS_DEVICES_DEFAULT_DIR.toFile().listFiles();
+        List<File> listOfDevices = new ArrayList<File>();
+        Collections.addAll(listOfDevices, TESTS_DEVICES_DEFAULT_DIR.toFile().listFiles());
         for (File deviceInList : listOfDevices) {
             propDevice.clear();
             if (deviceInList.isFile()) {
@@ -2411,9 +2413,12 @@ public class TestingList extends Panel {
                             }
                         }
                     }
+                } else { // if nothing found in this directory, see if there is a subdireactory
+                    Collections.addAll(listOfDevices, deviceInList.listFiles());
+                }
                 }
             }
-        }          
+        }       
         //showEnabledTestsOnly(jCheckBoxMenuShowSelectedTests1.getState());
         logger.log(Level.INFO, iCounter + " tests loaded.");
     }