Skip to content

Commit

Permalink
Merge pull request Azure#3 from moderakh/master
Browse files Browse the repository at this point in the history
initial travis integration
  • Loading branch information
moderakh authored May 28, 2017
2 parents 5502705 + 0f9990c commit 9a44f99
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 7 deletions.
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
language: java
matrix:
include:
- os: linux
jdk: oraclejdk8
- os: osx
osx_image: xcode8
script:
- cd azure-documentdb-rx
- mvn dependency:resolve
- zip -d ~/.m2/repository/com/microsoft/azure/azure-documentdb/1.11.0/azure-documentdb-1.11.0.jar 'META-INF/*.SF' 'META-INF/*.RSA'
- mvn test -P fast -DargLine="-DACCOUNT_HOST=$ACCOUNT_HOST -DACCOUNT_KEY=$ACCOUNT_KEY"
2 changes: 1 addition & 1 deletion azure-documentdb-rx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-documentdb</artifactId>
<version>1.9.7-SNAPSHOT</version>
<version>1.11.0</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,28 @@
*/
package com.microsoft.azure.documentdb.rx;

import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.stream.Stream;

/**
* Contains the configurations for test file
*/
public final class TestConfigurations {
// Replace MASTER_KEY and HOST with values from your DocumentDB account.
// The default values are credentials of the local emulator, which are not used in any production environment.
// <!--[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]-->
public static final String MASTER_KEY =
"C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
public static final String HOST = "https://localhost:443/";
// public static final String MASTER_KEY =
//"C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
// public static final String HOST = "https://localhost:443/";

public static String MASTER_KEY = System.getProperty("ACCOUNT_KEY");
public static String HOST = System.getProperty("ACCOUNT_HOST");
static {
System.out.println("host is " + System.getProperty("ACCOUNT_HOST"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@

public class TestSuiteBase {

protected static final int TIMEOUT = 4000;
protected static final int SETUP_TIMEOUT = 6000;
protected static final int SHUTDOWN_TIMEOUT = 6000;
protected static final int TIMEOUT = 10000;
protected static final int SETUP_TIMEOUT = 20000;
protected static final int SHUTDOWN_TIMEOUT = 20000;

protected int subscriberValidationTimeout = TIMEOUT;

Expand Down

0 comments on commit 9a44f99

Please sign in to comment.