Data layer fixes

- Fixes some saving and erasing issues with collections and searches
- Adds Zotero.DataObject::eraseTx() to automatically start transaction,
  and have .erase() log a warning like .save()
- Adds createUnsavedDataObject() and createDataObject() helper functions
  for tests

test/content/support.js

@@ -145,6 +145,37 @@ function waitForCallback(cb, interval, timeout) {
 	return deferred.promise;
 }
 
+//
+// Data objects
+//
+function createUnsavedDataObject(objectType, params) {
+	params = params || {};
+	if (objectType == 'item') {
+		var param = 'book';
+	}
+	var obj = new Zotero[Zotero.Utilities.capitalize(objectType)](param);
+	switch (objectType) {
+	case 'collection':
+	case 'search':
+		obj.name = params.name !== undefined ? params.name : "Test";
+		break;
+	}
+	if (params.version !== undefined) {
+		obj.version = params.version
+	}
+	if (params.synced !== undefined) {
+		obj.synced = params.synced
+	}
+	return obj;
+}
+
+var createDataObject = Zotero.Promise.coroutine(function* (objectType, params, saveOptions) {
+	var obj = createUnsavedDataObject(objectType, params);
+	var id = yield obj.saveTx(saveOptions);
+	var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType);
+	return objectsClass.getAsync(id);
+});
+
 /**
  * Return a promise for the error thrown by a promise, or false if none
  */

test/tests/dataObjectTest.js

@@ -29,13 +29,32 @@ describe("Zotero.DataObject", function() {
 		})
 	})
 	
+	describe("#version", function () {
+		it("should be set to 0 after creating object", function* () {
+			for (let type of types) {
+				let obj = yield createDataObject(type);
+				assert.equal(obj.version, 0);
+				yield obj.eraseTx();
+			}
+		})
+		
+		it("should be set after creating object", function* () {
+			for (let type of types) {
+				Zotero.logError(type);
+				let obj = yield createDataObject(type, { version: 1234 });
+				assert.equal(obj.version, 1234, type + " version mismatch");
+				yield obj.eraseTx();
+			}
+		})
+	})
+	
 	describe("#synced", function () {
 		it("should be set to false after creating item", function* () {
 			var item = new Zotero.Item("book");
 			var id = yield item.saveTx();
 			item = yield Zotero.Items.getAsync(id);
 			assert.isFalse(item.synced);
-			yield Zotero.Items.erase(id);
+			item.eraseTx();
 		});
 		
 		it("should be set to true when changed", function* () {
@@ -44,10 +63,10 @@ describe("Zotero.DataObject", function() {
 			item = yield Zotero.Items.getAsync(id);
 			
 			item.synced = 1;
-			yield item.save();
+			yield item.saveTx();
 			assert.ok(item.synced);
 			
-			yield Zotero.Items.erase(id);
+			item.eraseTx();
 		});
 		
 		it("should be set to false after modifying item", function* () {
@@ -56,14 +75,14 @@ describe("Zotero.DataObject", function() {
 			item = yield Zotero.Items.getAsync(id);
 			
 			item.synced = 1;
-			yield item.save();
+			yield item.saveTx();
 			
 			yield item.loadItemData();
 			item.setField('title', 'test');
-			yield item.save();
+			yield item.saveTx();
 			assert.isFalse(item.synced);
 			
-			yield Zotero.Items.erase(id);
+			item.eraseTx();
 		});
 		
 		it("should be unchanged if skipSyncedUpdate passed", function* () {
@@ -72,16 +91,16 @@ describe("Zotero.DataObject", function() {
 			item = yield Zotero.Items.getAsync(id);
 			
 			item.synced = 1;
-			yield item.save();
+			yield item.saveTx();
 			
 			yield item.loadItemData();
 			item.setField('title', 'test');
-			yield item.save({
+			yield item.saveTx({
 				skipSyncedUpdate: true
 			});
 			assert.ok(item.synced);
 			
-			yield Zotero.Items.erase(id);
+			item.eraseTx();
 		});
 	})