Skip to content

Commit 265fd11

Browse files
committed
ScriptFinderTest: avoid emitting warnings
The default scripts directory is not actually present, so let's exclude it from our search. This avoids warnings about nonexistent scripts directories.
1 parent ff9eeac commit 265fd11

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/test/java/org/scijava/script/ScriptFinderTest.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.scijava.MenuPath;
5050
import org.scijava.plugin.Plugin;
5151
import org.scijava.test.TestUtils;
52+
import org.scijava.util.AppUtils;
5253
import org.scijava.util.FileUtils;
5354

5455
/**
@@ -88,8 +89,7 @@ public static void tearDown() {
8889

8990
@Test
9091
public void testFindScripts() {
91-
final Context context = new Context(ScriptService.class);
92-
final ScriptService scriptService = context.service(ScriptService.class);
92+
final ScriptService scriptService = createScriptService();
9393
scriptService.addScriptDirectory(scriptsDir);
9494

9595
final ArrayList<ScriptInfo> scripts = findScripts(scriptService);
@@ -115,8 +115,7 @@ public void testFindScripts() {
115115
*/
116116
@Test
117117
public void testMenuPrefixes() {
118-
final Context context = new Context(ScriptService.class);
119-
final ScriptService scriptService = context.service(ScriptService.class);
118+
final ScriptService scriptService = createScriptService();
120119

121120
final MenuPath menuPrefix = new MenuPath("Foo > Bar");
122121
assertEquals(2, menuPrefix.size());
@@ -146,8 +145,7 @@ public void testMenuPrefixes() {
146145
*/
147146
@Test
148147
public void testOverlappingDirectories() {
149-
final Context context = new Context(ScriptService.class);
150-
final ScriptService scriptService = context.service(ScriptService.class);
148+
final ScriptService scriptService = createScriptService();
151149

152150
// Scripts -> Plugins
153151
scriptService.addScriptDirectory(new File(scriptsDir, "Scripts"),
@@ -173,6 +171,15 @@ public void testOverlappingDirectories() {
173171

174172
// -- Helper methods --
175173

174+
private ScriptService createScriptService() {
175+
final Context context = new Context(ScriptService.class);
176+
final ScriptService scriptService = context.service(ScriptService.class);
177+
final File defaultScriptsDir =
178+
new File(AppUtils.getBaseDirectory(ScriptFinder.class), "scripts");
179+
scriptService.removeScriptDirectory(defaultScriptsDir);
180+
return scriptService;
181+
}
182+
176183
private ArrayList<ScriptInfo> findScripts(final ScriptService scriptService) {
177184
final ScriptFinder scriptFinder = new ScriptFinder(scriptService);
178185
final ArrayList<ScriptInfo> scripts = new ArrayList<ScriptInfo>();

0 commit comments

Comments
 (0)