Merge pull request Azure#803 from jianghaolu/moredev

Fix credentials tests and add functionality to view diff in adxsnapshots
xingwu1 · Mar 5, 2016 · 1f13aa5 · 1f13aa5
2 parents 23b9424 + d44df63
commit 1f13aa5
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 8 deletions.
diff --git a/azure-android-client-authentication/build.gradle b/azure-android-client-authentication/build.gradle
@@ -86,6 +86,16 @@ uploadArchives {
     }
 }
 
+task versionInfo(type:Exec){
+    commandLine 'git rev-parse HEAD'.split()
+    ext.versionfile = new File("${projectDir}/.gitrevision")
+    standardOutput = new ByteArrayOutputStream()
+
+    doLast {
+        versionfile.text = "Azure/autorest#" + standardOutput.toString()
+    }
+}
+
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
     classifier = 'sources'
@@ -97,12 +107,13 @@ task javadoc(type: Javadoc) {
     options.encoding = 'UTF-8'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
 
 artifacts {
-    archives javadocJar
     archives sourcesJar
+    archives javadocJar
+    archives file: file("${projectDir}/.gitrevision")
 }
diff --git a/azure-client-authentication/build.gradle b/azure-client-authentication/build.gradle
@@ -70,6 +70,16 @@ test {
     }
 }
 
+task versionInfo(type:Exec){
+    commandLine 'git rev-parse HEAD'.split()
+    ext.versionfile = new File("${projectDir}/.gitrevision")
+    standardOutput = new ByteArrayOutputStream()
+
+    doLast {
+        versionfile.text = "Azure/autorest#" + standardOutput.toString()
+    }
+}
+
 javadoc {
     options.encoding = 'UTF-8'
 }
@@ -79,14 +89,15 @@ task sourcesJar(type: Jar, dependsOn:classes) {
     from sourceSets.main.allSource
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
 
 artifacts {
     archives sourcesJar
     archives javadocJar
+    archives file: file("${projectDir}/.gitrevision")
 }
 
 test {

diff --git a/...thentication/src/test/java/com/microsoft/azure/credentials/UserTokenCredentialsTests.java b/...thentication/src/test/java/com/microsoft/azure/credentials/UserTokenCredentialsTests.java
@@ -30,7 +30,7 @@ public class UserTokenCredentialsTests {
     public void testAcquireToken() throws Exception {
         credentials.refreshToken();
         Assert.assertEquals("token1", credentials.getToken());
-        Thread.sleep(1000);
+        Thread.sleep(1500);
         Assert.assertEquals("token2", credentials.getToken());
     }
 
@@ -62,7 +62,7 @@ private void acquireAccessToken() throws IOException {
                     null,
                     "token1",
                     "refresh",
-                    0,
+                    1,
                     null,
                     null,
                     false);
@@ -73,7 +73,7 @@ private void acquireAccessTokenFromRefreshToken() throws IOException {
                     null,
                     "token2",
                     "refresh",
-                    0,
+                    1,
                     null,
                     null,
                     false);

diff --git a/azure-client-runtime/build.gradle b/azure-client-runtime/build.gradle
@@ -70,6 +70,16 @@ test {
     }
 }
 
+task versionInfo(type:Exec){
+    commandLine 'git rev-parse HEAD'.split()
+    ext.versionfile = new File("${projectDir}/.gitrevision")
+    standardOutput = new ByteArrayOutputStream()
+
+    doLast {
+        versionfile.text = "Azure/autorest#" + standardOutput.toString()
+    }
+}
+
 javadoc {
     options.encoding = 'UTF-8'
 }
@@ -79,14 +89,15 @@ task sourcesJar(type: Jar, dependsOn:classes) {
     from sourceSets.main.allSource
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
 
 artifacts {
     archives sourcesJar
     archives javadocJar
+    archives file: file("${projectDir}/.gitrevision")
 }
 
 test {

diff --git a/client-runtime/build.gradle b/client-runtime/build.gradle
@@ -79,6 +79,16 @@ test {
     }
 }
 
+task versionInfo(type:Exec){
+    commandLine 'git rev-parse HEAD'.split()
+    ext.versionfile = new File("${projectDir}/.gitrevision")
+    standardOutput = new ByteArrayOutputStream()
+
+    doLast {
+        versionfile.text = "Azure/autorest#" + standardOutput.toString()
+    }
+}
+
 javadoc {
     options.encoding = 'UTF-8'
 }
@@ -88,14 +98,15 @@ task sourcesJar(type: Jar, dependsOn:classes) {
     from sourceSets.main.allSource
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
 
 artifacts {
     archives sourcesJar
     archives javadocJar
+    archives file: file("${projectDir}/.gitrevision")
 }
 
 test {