Permalink
Browse files

updated to include Couchbase Mobile version number in test report

  • Loading branch information...
1 parent 0916984 commit c4c31d688e5019737e287dc64e9804ef6febd354 @mschoch mschoch committed Dec 6, 2011
@@ -195,6 +195,9 @@ protected void onDestroy() {
protected void startCouch() {
CouchbaseMobile couch = new CouchbaseMobile(getBaseContext(), mDelegate);
+ String couchbaseVersion = couch.getVersion();
+ Log.v(TAG, "Couchbase Mobile version: " + couchbaseVersion);
+ TestReport.setCouchbaseVersion(couchbaseVersion);
couchStartTime = System.currentTimeMillis();
couchServiceConnection = couch.startCouchbase();
}
@@ -205,7 +208,7 @@ public void couchbaseStarted(String host, int port) {
final long couchStartFinishTime = System.currentTimeMillis();
Log.v(TAG, "Couchbase has started");
- HttpClient httpClient = new AndroidHttpClient.Builder().host(host).port(port).build();
+ HttpClient httpClient = new AndroidHttpClient.Builder().host(host).port(port).socketTimeout(0).build();
couchDbInstance = new StdCouchDbInstance(httpClient);
//now create a default database for workloads to use
@@ -9,6 +9,12 @@
public class TestReport {
+ private static String couchbaseVersion = "unknown";
+
+ public static void setCouchbaseVersion(String couchbaseVersion) {
+ TestReport.couchbaseVersion = couchbaseVersion;
+ }
+
public static Map<String, Object> newTestReport(Context context) {
Map<String, Object> result = new HashMap<String, Object>();
@@ -35,6 +41,7 @@
Map<String, Object> result = new HashMap<String, Object>();
result.put("debug", android.os.Debug.isDebuggerConnected());
+ result.put("couchbase", couchbaseVersion);
return result;
}
@@ -47,7 +54,9 @@
result.put("device", android.os.Build.DEVICE);
result.put("model", android.os.Build.MODEL);
result.put("product", android.os.Build.PRODUCT);
+ result.put("manufacturer", android.os.Build.MANUFACTURER);
result.put("tags", android.os.Build.TAGS);
+ result.put("cpu_abi", android.os.Build.CPU_ABI);
return result;
}
@@ -70,6 +79,7 @@
public static Map<String, Object> getTestReport(String name, String systemName, long start, long end) {
Map<String, Object> result = new HashMap<String, Object>();
result.put("name", name);
+ result.put("systemName", systemName);
result.put("start", start);
result.put("end", end);
result.put("duration", end - start);

0 comments on commit c4c31d6

Please sign in to comment.