Skip to content

Commit

Permalink
[hotfix] Rename TestJvmProcess#getJvmArgs to `TestJvmProcess#getMai…
Browse files Browse the repository at this point in the history
…nMethodArgs`
  • Loading branch information
snuyanzin authored and zentol committed Nov 22, 2023
1 parent 905d599 commit 7f2818b
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return new String[0];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return new String[] {Boolean.toString(callerHasHook), tmpDirectories, signalFilePath};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return jvmArgs;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ public void run() {
*
* <p>These can be parsed by the main method of the entry point class.
*/
public abstract String[] getJvmArgs();
public abstract String[] getMainMethodArgs();

/**
* Returns the name of the class to run.
*
* <p>Arguments to the main method can be specified via {@link #getJvmArgs()}.
* <p>Arguments to the main method can be specified via {@link #getMainMethodArgs()}.
*/
public abstract String getEntryPointClassName();

Expand Down Expand Up @@ -151,10 +151,10 @@ public void startProcess() throws IOException {

cmd = ArrayUtils.add(cmd, getEntryPointClassName());

String[] jvmArgs = getJvmArgs();
String[] mainMethodArgs = getMainMethodArgs();

if (jvmArgs != null && jvmArgs.length > 0) {
cmd = ArrayUtils.addAll(cmd, jvmArgs);
if (mainMethodArgs != null && mainMethodArgs.length > 0) {
cmd = ArrayUtils.addAll(cmd, mainMethodArgs);
}

synchronized (createDestroyLock) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return new String[] {markerFile.getAbsolutePath()};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return new String[] {
tempFilePath, String.valueOf(installSignalHandler), String.valueOf(selfKillDelay)
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return new String[0];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public String getName() {
}

@Override
public String[] getJvmArgs() {
public String[] getMainMethodArgs() {
return new String[] {temporaryFolder.getAbsolutePath()};
}

Expand Down

0 comments on commit 7f2818b

Please sign in to comment.