From ec767a4cc5f26d4747f75b2f8347983e05152c96 Mon Sep 17 00:00:00 2001 From: Sam Cao Date: Thu, 29 Jun 2023 11:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=84=20refactor:=20Add=20JaspilerMain.i?= =?UTF-8?q?nternalMain()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/caoccao/jaspiler/JaspilerMain.java | 8 ++++++-- src/test/java/com/caoccao/jaspiler/TestJaspilerMain.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/caoccao/jaspiler/JaspilerMain.java b/src/main/java/com/caoccao/jaspiler/JaspilerMain.java index 42d9d42..5a8dfbf 100644 --- a/src/main/java/com/caoccao/jaspiler/JaspilerMain.java +++ b/src/main/java/com/caoccao/jaspiler/JaspilerMain.java @@ -37,7 +37,7 @@ description = JaspilerContract.DESCRIPTION) public final class JaspilerMain extends BaseLoggingObject implements Callable { @CommandLine.Parameters(hidden = true) - private List argv; + private final List argv; @CommandLine.Parameters(index = "0", description = "The JavaScript file to be executed.") private File file; @@ -47,8 +47,12 @@ public JaspilerMain() { file = null; } + public static int internalMain(String[] args) { + return new CommandLine(new JaspilerMain()).execute(args); + } + public static void main(String[] args) { - System.exit(new CommandLine(new JaspilerMain()).execute(args)); + System.exit(internalMain(args)); } @Override diff --git a/src/test/java/com/caoccao/jaspiler/TestJaspilerMain.java b/src/test/java/com/caoccao/jaspiler/TestJaspilerMain.java index 7d3c9fb..8fc30a1 100644 --- a/src/test/java/com/caoccao/jaspiler/TestJaspilerMain.java +++ b/src/test/java/com/caoccao/jaspiler/TestJaspilerMain.java @@ -30,7 +30,7 @@ public void testArgv() throws Exception { String scriptPath = SystemUtils.INITIAL_WORKING_DIRECTORY.resolve("scripts/node/test/test_argv.js") .toAbsolutePath().toFile().getAbsolutePath(); List args = List.of(scriptPath, "a", "b", "c"); - assertEquals(0, new CommandLine(new JaspilerMain()).execute(args.toArray(String[]::new))); + assertEquals(0, JaspilerMain.internalMain(args.toArray(String[]::new))); } @Test