1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/gamma/tests/tests/Clipperz/PM/DataModel/EncryptedRemoteObject.test.js b/frontend/gamma/tests/tests/Clipperz/PM/DataModel/EncryptedRemoteObject.test.js
index 9c50c43..c5f0e00 100644
--- a/frontend/gamma/tests/tests/Clipperz/PM/DataModel/EncryptedRemoteObject.test.js
+++ b/frontend/gamma/tests/tests/Clipperz/PM/DataModel/EncryptedRemoteObject.test.js
@@ -1,118 +1,116 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Crypto.PRNG.defaultRandomGenerator().fastEntropyAccumulationForTestingPurpose();
 
 var tests = {
 
     //-------------------------------------------------------------------------
 
 	'simple_tests': function(someTestArgs) {
 		var	deferredResult;
 		var	encryptedRemoteObject;
 
 		var	key;
 		var version;
 		var rawData;
 		
 		key = "just a random key";
 		version = Clipperz.PM.Crypto.encryptingFunctions.currentVersion;
 		rawData = "just a random text to encrypt";
 		
 		encryptedRemoteObject = new Clipperz.PM.DataModel.EncryptedRemoteObject({
 			'retrieveKeyFunction':			MochiKit.Base.noop,
 			'retrieveRemoteDataFunction':	function () { return  "--"},
 			'encryptedDataKeypath':			'--',
 			'encryptedVersionKeypath':		'--'
 		});
 		SimpleTest.ok(encryptedRemoteObject != null, "create an encryptedRemoteObject");
 		
 		deferredResult = Clipperz.Async.callbacks("EncryptedRemoteObject.test - simple_tests", [
 			MochiKit.Base.method(encryptedRemoteObject, 'getRemoteData'),
 			function(aResult) {
 				SimpleTest.is(aResult, "--", "setting and getting serverData works");
 			}
 		], someTestArgs);
 
 		return deferredResult;
 	},
 
     //-------------------------------------------------------------------------
 
 	'decrypt_test': function (someTestArgs) {
 		var	deferredResult;
 		var	encryptedRemoteObject;
 		var	key;
 		var version;
 		var rawData;
 		
 		key = "just a random key";
 		version = Clipperz.PM.Crypto.encryptingFunctions.currentVersion;
 		rawData = "just a random text to encrypt";
 
 		encryptedRemoteObject = new Clipperz.PM.DataModel.EncryptedRemoteObject({
 			'retrieveKeyFunction':			MochiKit.Base.partial(MochiKit.Async.succeed, key),
 			'retrieveRemoteDataFunction':	MochiKit.Base.partial(Clipperz.Async.callbacks, "EncryptedRemoteObject.test - decrypt_test <encrypt data>", [
 				MochiKit.Base.partial(Clipperz.PM.Crypto.deferredEncrypt, {key:key, value:rawData, version:version}),
 				function (someEncryptedData) {
 					return {
 						'data': someEncryptedData,
 						'version': version
 					}
 				}
 			], someTestArgs)//,
 //			'encryptedDataKeypath':			'data',
 //			'encryptedVersionKeypath':		'version'
 		});
 
 		deferredResult = new Clipperz.Async.Deferred("decrypt_test", someTestArgs);
 		deferredResult.addMethod(encryptedRemoteObject, 'getDecryptedData');
 		deferredResult.addCallback(function (aResult) {
 			SimpleTest.is(aResult, rawData, "encrypt and decrypt works");
 		})
 		deferredResult.callback();
 		
 		return deferredResult;
 	},
 
     //-------------------------------------------------------------------------
 
 	'getValue_test': function (someTestArgs) {
 		var	deferredResult;
 		var	encryptedRemoteObject;
 		var	key;
 		var version;
 		var rawData;
 		
 		key = "just a random key";
 		version = Clipperz.PM.Crypto.encryptingFunctions.currentVersion;
 		rawData = {
 			key1: 'value1',
 			key2: 'value2'
 		};
 
 		encryptedRemoteObject = new Clipperz.PM.DataModel.EncryptedRemoteObject({
 			'reference':					"testReference",
 			'retrieveKeyFunction':			MochiKit.Base.partial(MochiKit.Async.succeed, key),