Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

4 files changed, 34 insertions, 0 deletions

diff --git a/src/test/resources/NewServerPredefStepTest.js b/src/test/resources/NewServerPredefStepTest.js
new file mode 100644
index 0000000..64d3d29
--- /dev/null
+++ b/src/test/resources/NewServerPredefStepTest.js
@@ -0,0 +1,12 @@
+var serverPath=new com.c2kernel.lookup.DomainPath("/servers/pcuwe04.cern.ch");

+var serverItem=proxy.getProxy(serverPath);

+

+var predef = "AddDomainContext"; var params = new Array(1); params[0] = "/test/context"; agent.execute(serverItem, predef, params);

+var predef = "RemoveDomainContext"; agent.execute(serverItem, predef, params);

+params[0] = "/test"; agent.execute(serverItem, predef, params);

+var predef = "SetAgentPassword"; params = Array(2); params[0] = "dev"; params[1] = "hunter2"; agent.execute(serverItem, predef, params); 

+com.c2kernel.process.Gateway.login("dev", "hunter2");

+var predef = "SetAgentRoles"; agent.execute(serverItem, predef, params); //Role shouldn't exist

+params = Array(3); params[0] = "dev"; params[1] = "Admin"; params[2] = "UserCode"; agent.execute(serverItem, predef, params);

+params = Array(2); params[0] = "dev"; params[1] = "Admin"; agent.execute(serverItem, predef, params);

+var predef = "RemoveAgent"; var params = new Array(1); params[0] = "dev"; agent.execute(serverItem, predef, params);

diff --git a/src/test/resources/outcomeTest.xml b/src/test/resources/outcomeTest.xml
new file mode 100644
index 0000000..563c72c
--- /dev/null
+++ b/src/test/resources/outcomeTest.xml
@@ -0,0 +1,6 @@
+<TestOutcome>

+	<Field1>Field1contents</Field1>

+	<Field2 attr="attribute"></Field2>

+	<Field3>repeating</Field3>

+	<Field3>element</Field3>

+</TestOutcome>
\ No newline at end of file
diff --git a/src/test/resources/properties.conf b/src/test/resources/server.conf
index 476aeb0..476aeb0 100644
--- a/src/test/resources/properties.conf
+++ b/src/test/resources/server.conf
diff --git a/src/test/resources/test.clc b/src/test/resources/test.clc
new file mode 100644
index 0000000..be1d5d0
--- /dev/null
+++ b/src/test/resources/test.clc
@@ -0,0 +1,16 @@
+

+Name=Test Cristal Server

+

+// TCP server ports

+ItemServer.name=localhost

+ItemServer.iiop=1500

+ItemServer.Proxy.port=1553

+

+// LDAP Lookup config

+LDAP.GlobalPath=o=cern,c=ch

+LDAP.RootPath=cn=cristal

+LDAP.LocalPath=cn=test

+LDAP.port=389

+LDAP.host=localhost

+LDAP.user=cn=Manager,o=cern,c=ch

+LDAP.password=test