diff --git a/src/main/java/com/launchableinc/ingest/commits/CommitIngester.java b/src/main/java/com/launchableinc/ingest/commits/Main.java similarity index 97% rename from src/main/java/com/launchableinc/ingest/commits/CommitIngester.java rename to src/main/java/com/launchableinc/ingest/commits/Main.java index 2efff19c0..463e2cac4 100644 --- a/src/main/java/com/launchableinc/ingest/commits/CommitIngester.java +++ b/src/main/java/com/launchableinc/ingest/commits/Main.java @@ -17,7 +17,7 @@ import org.kohsuke.args4j.Option; /** Driver for {@link CommitGraphCollector}. */ -public class CommitIngester { +public class Main { @Argument(required = true, metaVar = "NAME", usage = "Uniquely identifies this repository within the workspace", index = 0) public String name; @@ -60,10 +60,10 @@ public class CommitIngester { @VisibleForTesting String launchableToken = null; - public CommitIngester() throws CmdLineException, MalformedURLException {} + public Main() throws CmdLineException, MalformedURLException {} public static void main(String[] args) throws Exception { - CommitIngester ingester = new CommitIngester(); + Main ingester = new Main(); CmdLineParser parser = new CmdLineParser(ingester); try { parser.parseArgument(args); diff --git a/src/test/java/com/launchableinc/ingest/commits/AllTests.java b/src/test/java/com/launchableinc/ingest/commits/AllTests.java index ab9b02858..dc1315cab 100644 --- a/src/test/java/com/launchableinc/ingest/commits/AllTests.java +++ b/src/test/java/com/launchableinc/ingest/commits/AllTests.java @@ -7,7 +7,7 @@ @RunWith(Suite.class) @SuiteClasses({ CommitGraphCollectorTest.class, - CommitIngesterTest.class, + MainTest.class, FileChunkStreamerTest.class, SSLBypassTest.class, ProgressReportingConsumerTest.class diff --git a/src/test/java/com/launchableinc/ingest/commits/CommitIngesterTest.java b/src/test/java/com/launchableinc/ingest/commits/MainTest.java similarity index 91% rename from src/test/java/com/launchableinc/ingest/commits/CommitIngesterTest.java rename to src/test/java/com/launchableinc/ingest/commits/MainTest.java index fccd4fe2f..b0702bdb1 100644 --- a/src/test/java/com/launchableinc/ingest/commits/CommitIngesterTest.java +++ b/src/test/java/com/launchableinc/ingest/commits/MainTest.java @@ -19,7 +19,7 @@ import org.mockserver.junit.MockServerRule; @RunWith(JUnit4.class) -public class CommitIngesterTest { +public class MainTest { @Rule public TemporaryFolder tmp = new TemporaryFolder(); @Rule public MockServerRule mockServerRule = new MockServerRule(this); private MockServerClient mockServerClient; @@ -63,14 +63,14 @@ public void specifySubmodule() throws Exception { return response().withBody("OK"); }); - CommitIngester commitIngester = new CommitIngester(); + Main main = new Main(); InetSocketAddress addr = mockServerClient.remoteAddress(); // Specify submodule as the repository. JGit cannot open this directly, so the code should open // the main repository first, then open the submodule. - commitIngester.repo = new File(mainrepoDir, "sub"); - commitIngester.url = + main.repo = new File(mainrepoDir, "sub"); + main.url = new URL(String.format("http://%s:%s/intake/", addr.getHostString(), addr.getPort())); - commitIngester.launchableToken = "v1:testorg/testws:dummy-token"; - commitIngester.run(); + main.launchableToken = "v1:testorg/testws:dummy-token"; + main.run(); } }