travis

sxci · sxci · commit a25c2bf7d2c3 · 2014-06-19T13:01:28.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -26,11 +26,13 @@ android {
 
     instrumentTest.setRoot('tests')
     instrumentTest {
+      manifest.srcFile 'AndroidManifest.xml'
       java.srcDirs = ['tests/src']
       res.srcDirs = ['res']
       assets.srcDirs = ['assets']
       resources.srcDirs = ['tests/src']
     }
+
   }
 
   dependencies {
diff --git a/tests/src/com/qiniu/test/UploadTest.java b/tests/src/com/qiniu/test/UploadTest.java
@@ -57,7 +57,7 @@ public void setUp() throws Exception {
 		jsonRet = new JSONObjectRet() {
 			@Override
 			public void onProcess(long current, long total) {
-				Log.d("UploadTest", current + "/" + total);
+				//Log.d("UploadTest", current + "/" + total);
 				// Assert.assertEquals(file.length(), total); // 内部实现原因，可能不相等
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,13 @@ android {`
`26`	`26`
`27`	`27`	`instrumentTest.setRoot('tests')`
`28`	`28`	`instrumentTest {`
	`29`	`+ manifest.srcFile 'AndroidManifest.xml'`
`29`	`30`	`java.srcDirs = ['tests/src']`
`30`	`31`	`res.srcDirs = ['res']`
`31`	`32`	`assets.srcDirs = ['assets']`
`32`	`33`	`resources.srcDirs = ['tests/src']`
`33`	`34`	`}`
	`35`	`+`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void setUp() throws Exception {`
`57`	`57`	`jsonRet = new JSONObjectRet() {`
`58`	`58`	`@Override`
`59`	`59`	`public void onProcess(long current, long total) {`
`60`		`- Log.d("UploadTest", current + "/" + total);`
	`60`	`+ //Log.d("UploadTest", current + "/" + total);`
`61`	`61`	`// Assert.assertEquals(file.length(), total); // 内部实现原因，可能不相等`
`62`	`62`	`}`
`63`	`63`