Add windows Kokoro test config (#181)

chingor13 · web-flow · commit 3101a0242394 · 2018-09-11T09:07:08.000-07:00
* Add windows Kokoro test config

* Fix location of build.bat

* Fix windows working directory

* Fix bath to build script

* Use a tempfile for test files to avoid windows path issues

* empty commit to trigger travis

* Skip creating the temporary test json files.

The actual file is not necessary for the tests - we only need a valid
path for the OS.

* Fix joining of paths

* Fix osx script
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
@@ -0,0 +1,3 @@
+:: See documentation in type-shell-output.bat
+
+"C:\Program Files\Git\bin\bash.exe" github/google-auth-library-java/.kokoro/build.sh
diff --git a/.kokoro/presubmit/java8-osx.cfg b/.kokoro/presubmit/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-auth-library-java/.kokoro/build.sh"
diff --git a/.kokoro/presubmit/java8-win.cfg b/.kokoro/presubmit/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-auth-library-java/.kokoro/build.bat"
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java b/oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java
@@ -53,6 +53,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.file.Paths;
 import java.security.AccessControlException;
 import java.util.Collection;
 import java.util.Collections;
@@ -136,7 +137,7 @@ public void getDefaultCredentials_envValidSandbox_throwsNonSecurity() throws Exc
         UserCredentialsTest.writeUserStream(USER_CLIENT_ID, USER_CLIENT_SECRET, REFRESH_TOKEN);
     TestDefaultCredentialsProvider testProvider = new TestDefaultCredentialsProvider();
     testProvider.setFileSandbox(true);
-    String userPath = "/user.json";
+    String userPath = tempFilePath("user.json");
     testProvider.addFile(userPath, userStream);
     testProvider.setEnv(DefaultCredentialsProvider.CREDENTIAL_ENV_VAR, userPath);
 
@@ -300,7 +301,7 @@ public void getDefaultCredentials_envServiceAccount_providesToken() throws IOExc
         .writeServiceAccountStream(
             SA_CLIENT_ID, SA_CLIENT_EMAIL, SA_PRIVATE_KEY_PKCS8, SA_PRIVATE_KEY_ID);
     TestDefaultCredentialsProvider testProvider = new TestDefaultCredentialsProvider();
-    String serviceAccountPath = "/service_account.json";
+    String serviceAccountPath = tempFilePath("service_account.json");
     testProvider.addFile(serviceAccountPath, serviceAccountStream);
     testProvider.setEnv(
         DefaultCredentialsProvider.CREDENTIAL_ENV_VAR, serviceAccountPath);
@@ -318,7 +319,7 @@ public void getDefaultCredentials_envUser_providesToken() throws IOException {
     InputStream userStream =
         UserCredentialsTest.writeUserStream(USER_CLIENT_ID, USER_CLIENT_SECRET, REFRESH_TOKEN);
     TestDefaultCredentialsProvider testProvider = new TestDefaultCredentialsProvider();
-    String userPath = "/user.json";
+    String userPath = tempFilePath("user.json");
     testProvider.addFile(userPath, userStream);
     testProvider.setEnv(DefaultCredentialsProvider.CREDENTIAL_ENV_VAR, userPath);
 
@@ -420,7 +421,7 @@ public void getDefaultCredentials_envAndWellKnownFile_envPrecedence() throws IOE
 
     InputStream envStream =
         UserCredentialsTest.writeUserStream(USER_CLIENT_ID, USER_CLIENT_SECRET, refreshTokenEnv);
-    String envPath = "/env.json";
+    String envPath = tempFilePath("env.json");
     testProvider.setEnv(DefaultCredentialsProvider.CREDENTIAL_ENV_VAR, envPath);
     testProvider.addFile(envPath, envStream);
 
@@ -443,6 +444,10 @@ public void getDefaultCredentials_envAndWellKnownFile_envPrecedence() throws IOE
     testUserProvidesToken(testProvider, transportFactory, accessTokenEnv);
   }
 
+  private String tempFilePath(String filename) {
+    return Paths.get(System.getProperty("java.io.tmpdir"), filename).toString();
+  }
+
   private class LogHandler extends Handler {
     LogRecord lastRecord;
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+:: See documentation in type-shell-output.bat`
	`2`	`+`
	`3`	`+"C:\Program Files\Git\bin\bash.exe" github/google-auth-library-java/.kokoro/build.sh`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Format: //devtools/kokoro/config/proto/build.proto`
	`2`	`+`
	`3`	`+build_file: "google-auth-library-java/.kokoro/build.sh"`