Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -25,6 +25,7 @@ import java.util.Map;
import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.preference.PreferenceService;
import org.alfresco.service.transaction.TransactionService;
import org.mozilla.javascript.NativeObject;
/**
@@ -38,6 +39,13 @@ public class ScriptPreferenceService extends BaseScopableProcessorExtension
/** Preference Service */
private PreferenceService preferenceService;
private TransactionService transactionService;
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
public void setServiceRegistry(ServiceRegistry services)
{
this.services = services;
@@ -48,6 +56,11 @@ public class ScriptPreferenceService extends BaseScopableProcessorExtension
this.preferenceService = preferenceService;
}
public boolean getAllowWrite()
{
return transactionService.getAllowWrite();
}
public NativeObject getPreferences(String userName)
{
return getPreferences(userName, null);

View File

@@ -1,56 +0,0 @@
function testPreferences()
{
var preferences = new Object();
preferences.myValue = "myValue";
preferences.comp1 = new Object();
preferences.comp1.value1 = "value1";
preferences.comp1.value2 = 12;
preferenceService.setPreferences("userOne", preferences);
var result = preferenceService.getPreferences("userOne");
test.assertNotNull(result);
test.assertEquals("myValue", result.myValue);
test.assertEquals("value1", result.comp1.value1);
test.assertEquals(12, result.comp1.value2);
preferences = new Object();
preferences.comp2 = new Object();
preferences.comp2.value1 = "value1";
preferences.comp2.value2 = 3.142;
preferences.comp1 = new Object();
preferences.comp1.value1 = "changed";
preferences.comp1.value2 = 1001;
preferenceService.setPreferences("userOne", preferences);
result = preferenceService.getPreferences("userOne");
test.assertNotNull(result);
test.assertEquals("myValue", result.myValue);
test.assertEquals("changed", result.comp1.value1);
test.assertEquals(1001, result.comp1.value2);
test.assertEquals("value1", result.comp2.value1);
test.assertEquals(3.142, result.comp2.value2);
preferenceService.clearPreferences("userOne", "comp1");
result = preferenceService.getPreferences("userOne");
test.assertNotNull(result);
test.assertEquals("myValue", result.myValue);
test.assertEquals("undefined", result.comp1);
test.assertEquals("value1", result.comp2.value1);
test.assertEquals(3.142, result.comp2.value2);
preferenceService.clearPreferences("userOne");
result = preferenceService.getPreferences("userOne");
test.assertNotNull(result);
test.assertEquals("undefined", result.myValue);
test.assertEquals("undefined", result.comp1);
test.assertEquals("undefined", result.comp2);
}
// Execute test's
testPreferences();