diff --git a/ktwebservice/nunit/document_contents.cs b/ktwebservice/nunit/document_contents.cs index fcbd7f5..c3ca25b 100644 --- a/ktwebservice/nunit/document_contents.cs +++ b/ktwebservice/nunit/document_contents.cs @@ -79,7 +79,7 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual("n/a", response.items[0].owned_by); Assert.AreEqual("n/a", response.items[0].version); Assert.AreEqual("n/a", response.items[0].is_immutable); - Assert.AreEqual("RW", response.items[0].permissions); + Assert.AreEqual("RWA", response.items[0].permissions); Assert.AreEqual("n/a", response.items[0].workflow); Assert.AreEqual("n/a", response.items[0].workflow_state); Assert.AreEqual("folder", response.items[0].mime_type); diff --git a/ktwebservice/nunit/document_detail.cs b/ktwebservice/nunit/document_detail.cs index e9dbe7b..aa5e5e7 100644 --- a/ktwebservice/nunit/document_detail.cs +++ b/ktwebservice/nunit/document_detail.cs @@ -88,7 +88,7 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual("text", response.mime_icon_path); Assert.AreEqual("Plain Text", response.mime_display); Assert.IsTrue("" != response.storage_path); - Assert.AreEqual(3, response.metadata.Length); + Assert.AreEqual(2, response.metadata.Length); Assert.AreEqual(null, response.links); Assert.AreEqual(1, response.transaction_history.Length); diff --git a/ktwebservice/nunit/document_metadata.cs b/ktwebservice/nunit/document_metadata.cs index fd3e58a..aeeb41c 100644 --- a/ktwebservice/nunit/document_metadata.cs +++ b/ktwebservice/nunit/document_metadata.cs @@ -96,11 +96,11 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual(0, update_resp.status_code); Assert.AreEqual("General information", update_resp.metadata[1].fieldset); - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name); - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value); + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name); + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value); - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name); - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value); + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name); + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value); Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name); Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value); @@ -131,12 +131,12 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual(0, update_resp.status_code); Assert.AreEqual("General information", update_resp.metadata[1].fieldset); - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name); - Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[0].value); + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name); + Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[1].value); - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name); - Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[1].value); + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name); + Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[0].value); Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name); diff --git a/ktwebservice/nunit/document_system_metadata.cs b/ktwebservice/nunit/document_system_metadata.cs index 9b4b7fb..1894917 100644 --- a/ktwebservice/nunit/document_system_metadata.cs +++ b/ktwebservice/nunit/document_system_metadata.cs @@ -66,11 +66,11 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual(0, update_resp.status_code); Assert.AreEqual("General information", update_resp.metadata[1].fieldset); - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name); - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value); + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name); + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value); - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name); - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value); + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name); + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value); Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name); Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value); @@ -112,11 +112,11 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual(0, update_resp.status_code); Assert.AreEqual("General information", update_resp.metadata[1].fieldset); - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name); - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value); + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name); + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value); - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name); - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value); + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name); + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value); Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name); Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value); @@ -167,11 +167,11 @@ namespace MonoTests.KnowledgeTree Assert.AreEqual(0, update_resp.status_code); Assert.AreEqual("General information", update_resp.metadata[1].fieldset); - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name); - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value); + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name); + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value); - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name); - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value); + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name); + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value); Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name); Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value); diff --git a/ktwebservice/nunit/helper.cs b/ktwebservice/nunit/helper.cs index dbe2832..57102d7 100755 --- a/ktwebservice/nunit/helper.cs +++ b/ktwebservice/nunit/helper.cs @@ -1,10 +1,10 @@ using System; using System.Text; using System.Net; -using System.IO; +using System.IO; using System.Collections; using System.Data; -using System.Data.Odbc; +using System.Data.Odbc; using System.Runtime.Remoting; using System.Runtime.Remoting.Channels; using System.Runtime.Remoting.Messaging; @@ -14,7 +14,6 @@ using System.Runtime.Serialization; using System.Text.RegularExpressions; using System.Web.Services.Protocols; using System.Reflection; -using Interception; using System.Web; using System.Xml; using System.Web.Services; @@ -30,24 +29,24 @@ using System.Web.Services.Protocols; namespace MonoTests.KnowledgeTree { - - [System.Web.Services.WebServiceBinding(Name="KnowledgeTreePort", Namespace="urn:KnowledgeTree")] + + [System.Web.Services.WebServiceBinding(Name="KnowledgeTreePort", Namespace="urn:KnowledgeTree")] public class KTWebService : KnowledgeTreeService { public KTWebService() : base() { this.Url = Environment.GetEnvironmentVariable("KT_ROOT_URL") + "/ktwebservice/webservice.php"; } - } - + } + public class MySoapHttpClientProtocol : SoapHttpClientProtocol { public MySoapHttpClientProtocol() : base() {} - + public object [] ReceiveResponse (WebResponse response, SoapClientMessage message, SoapExtension[] extensions) { - + StreamReader sr = new StreamReader(response.GetResponseStream()); String content = sr.ReadToEnd(); System.Console.WriteLine(content); @@ -55,39 +54,39 @@ namespace MonoTests.KnowledgeTree return null; } } - + public class KTTest { protected KTWebService _kt; protected String _session; - protected bool _verbose; + protected bool _verbose; + - public KTTest() { this._kt = new KTWebService(); kt_response response = this._kt.login("admin","admin","127.0.0.1"); this._session = response.message; - this._verbose = false; - this.setupDb(); - - //System.Web.Services.Protocols.SoapHttpClientProtocol.ReceiveResponse - } - + this._verbose = false; + this.setupDb(); + + //System.Web.Services.Protocols.SoapHttpClientProtocol.ReceiveResponse + } + void setupDb() { - + String connectionString = "DSN=ktdms;" + "UID=root;" + "PWD="; try { IDbConnection dbcon = new OdbcConnection(connectionString); - if (dbcon == null) + if (dbcon == null) { System.Console.WriteLine("Cannot create connection"); } dbcon.Open(); IDbCommand dbcmd = dbcon.CreateCommand(); - if (dbcmd == null) + if (dbcmd == null) { System.Console.WriteLine("Cannot create command"); } @@ -110,15 +109,15 @@ namespace MonoTests.KnowledgeTree { System.Console.WriteLine(ex.Message); } - } - + } + ~KTTest() { - this._kt.logout(this._session); + this._kt.logout(this._session); } } - + public class FileUploader { @@ -133,11 +132,11 @@ namespace MonoTests.KnowledgeTree System.Console.WriteLine("Using upload URL: " + uri); this.boundary = "----" + DateTime.Now.Ticks.ToString("x"); } - + public FileUploader() : this(Environment.GetEnvironmentVariable("KT_ROOT_URL") + "/ktwebservice/upload.php") { } - + public String getFilename() { @@ -246,8 +245,8 @@ namespace MonoTests.KnowledgeTree } } - - + + public class Document { diff --git a/ktwebservice/nunit/makefile b/ktwebservice/nunit/makefile index 65b3cf0..119cf2c 100644 --- a/ktwebservice/nunit/makefile +++ b/ktwebservice/nunit/makefile @@ -1,8 +1,8 @@ -RESULTS=folder.result document_metadata.result authentication.result document_contents.result document_detail.result document_history.result document_add.result document_checkout.result document_links.result document_owner.result document_rename.result document_copy.result document_move.result document_system_metadata.result query.result document_download.result document_type.result document_oem_no.result document_workflow.result +RESULTS=document_move.result document_copy.result folder.result document_metadata.result authentication.result document_contents.result document_detail.result document_history.result document_add.result document_checkout.result document_links.result document_owner.result document_rename.result document_system_metadata.result query.result document_download.result document_type.result document_oem_no.result document_workflow.result PROXY=KTproxy.cs WSDL=ktdms.wsdl ROOT_URL=http://ktdms.trunk -#ROOT_URL=http://192.168.1.111 +ROOT_URL=http://172.16.121.128 WSDL_URL=${ROOT_URL}/ktwebservice/index.php?wsdl all: ${RESULTS} @@ -10,7 +10,7 @@ all: ${RESULTS} results: clean-results ${RESULTS} KTproxy.dll: KTproxy.cs helper.cs - mcs -r:System.Web.Services -r:System.Data.dll /target:library KTproxy.cs intercept.cs helper.cs + mcs -r:System.Web.Services -r:System.Data.dll /target:library KTproxy.cs helper.cs KTproxy.cs: ktdms.wsdl wsdl -out:${PROXY} ${WSDL}