Skip to content

Commit ed5aff1

Browse files
committed
fixing a legit bug that was breaking travis
1 parent a89b03b commit ed5aff1

File tree

11 files changed

+23
-12
lines changed

11 files changed

+23
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ install:
1414
- ./shared/dev-tasks/install-dependencies.sh
1515
script:
1616
- nvm use $NODE_VERSION
17-
- '[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] && ./gradlew test --info || ./gradlew jshint'
17+
- '[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] && ./gradlew test || ./gradlew jshint'

marklogic-data-hub/src/main/java/com/marklogic/spring/batch/hub/StagingConfig.java

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public TaskExecutor taskExecutor() {
2323
return new SimpleAsyncTaskExecutor();
2424
}
2525

26-
private DatabaseClientConfig getConfig() {
26+
private DatabaseClientConfig getStagingConfig() {
2727
DatabaseClientConfig config = new DatabaseClientConfig(
2828
hubConfig.host,
2929
hubConfig.stagingPort,
@@ -37,17 +37,31 @@ private DatabaseClientConfig getConfig() {
3737
return config;
3838
}
3939

40+
private DatabaseClientConfig getJobConfig() {
41+
DatabaseClientConfig config = new DatabaseClientConfig(
42+
hubConfig.host,
43+
hubConfig.jobPort,
44+
hubConfig.username,
45+
hubConfig.password
46+
);
47+
48+
config.setDatabase(hubConfig.jobDbName);
49+
config.setAuthentication(DatabaseClientFactory.Authentication.valueOfUncased(hubConfig.jobAuthMethod.toLowerCase()));
50+
51+
return config;
52+
}
53+
4054

4155
@Bean
4256
public DatabaseClientProvider databaseClientProvider() {
43-
DatabaseClientConfig config = getConfig();
57+
DatabaseClientConfig config = getStagingConfig();
4458
logger.info("Connecting to MarkLogic via: " + config);
4559
return new BatchDatabaseClientProvider(config);
4660
}
4761

4862
@Bean
4963
public DatabaseClientProvider jobRepositoryDatabaseClientProvider() {
50-
DatabaseClientConfig config = getConfig();
64+
DatabaseClientConfig config = getJobConfig();
5165
logger.info("Connecting to MarkLogic JobRepository via: " + config);
5266
return new BatchDatabaseClientProvider(config);
5367
}

marklogic-data-hub/src/test/java/com/marklogic/hub/DataHubInstallTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ public class DataHubInstallTest extends HubTestBase {
2727
public static void setup() throws IOException {
2828
XMLUnit.setIgnoreWhitespace(true);
2929
dataHub = new DataHub(getHubConfig(projectPath.toString()));
30+
31+
InstallInfo installInfo = dataHub.isInstalled();
32+
if (installInfo.isInstalled()) {
33+
dataHub.uninstall();
34+
}
3035
dataHub.initProject();
3136
dataHub.install();
3237
}

marklogic-data-hub/src/test/java/com/marklogic/hub/EndToEndTestSjsJson.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public static void setup() throws IOException {
5555

5656
@AfterClass
5757
public static void teardown() throws IOException {
58-
uninstallHub();
5958
FileUtils.deleteDirectory(projectDir.toFile());
6059
}
6160

marklogic-data-hub/src/test/java/com/marklogic/hub/EndToEndTestSjsXml.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public static void setup() throws IOException {
5959

6060
@AfterClass
6161
public static void teardown() throws IOException {
62-
uninstallHub();
6362
FileUtils.deleteDirectory(projectDir.toFile());
6463
}
6564

marklogic-data-hub/src/test/java/com/marklogic/hub/EndToEndTestXqyJson.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public static void setup() throws IOException {
5454

5555
@AfterClass
5656
public static void teardown() throws IOException {
57-
uninstallHub();
5857
FileUtils.deleteDirectory(projectDir.toFile());
5958
}
6059

marklogic-data-hub/src/test/java/com/marklogic/hub/EndToEndTestXqyXml.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public static void setup() throws IOException {
5454

5555
@AfterClass
5656
public static void teardown() throws IOException {
57-
uninstallHub();
5857
FileUtils.deleteDirectory(projectDir);
5958
}
6059

marklogic-data-hub/src/test/java/com/marklogic/hub/EntityManagerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public static void setup() throws IOException {
5454

5555
@AfterClass
5656
public static void teardown() throws IOException {
57-
uninstallHub();
5857
}
5958

6059
@Test

marklogic-data-hub/src/test/java/com/marklogic/hub/FlowManagerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public static void setup() throws IOException {
7272

7373
@AfterClass
7474
public static void teardown() throws IOException {
75-
uninstallHub();
7675
}
7776

7877
@After

marklogic-data-hub/src/test/java/com/marklogic/hub/TracingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public static void setup() throws IOException, URISyntaxException {
2929

3030
@AfterClass
3131
public static void teardown() throws IOException {
32-
uninstallHub();
3332
}
3433

3534
@Before

0 commit comments

Comments
 (0)