Peter M. Groen / knowledgetree

Commit 0299ef9dc6d28f774a7261f07e589ac6f8bda406

Authored by Conrad Vermeulen
1 parent 5fac51ad

KTS-3803 

"Fix broken 3.5.4 web service unit tests"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9529 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 8 changed files with 53 additions and 56 deletions
ktwebservice/nunit/document_contents.cs
  View file @0299ef9
... ... @@ -79,7 +79,7 @@ namespace MonoTests.KnowledgeTree
79 79 Assert.AreEqual("n/a", response.items[0].owned_by);
80 80 Assert.AreEqual("n/a", response.items[0].version);
81 81 Assert.AreEqual("n/a", response.items[0].is_immutable);
82   - Assert.AreEqual("RW", response.items[0].permissions);
  82 + Assert.AreEqual("RWA", response.items[0].permissions);
83 83 Assert.AreEqual("n/a", response.items[0].workflow);
84 84 Assert.AreEqual("n/a", response.items[0].workflow_state);
85 85 Assert.AreEqual("folder", response.items[0].mime_type);
... ...
ktwebservice/nunit/document_copy.cs
  View file @0299ef9
... ... @@ -57,7 +57,6 @@ namespace MonoTests.KnowledgeTree
57 57 Assert.AreEqual(0,response2.status_code);
58 58 int folderId = response2.id;
59 59  
60   -
61 60 kt_document_detail linkresp = this._kt.copy_document(this._session, this._doc1.docId, folderId, "copy", "");
62 61 Assert.AreEqual(0, linkresp.status_code);
63 62 Assert.AreEqual("kt_unit_test1.txt", linkresp.filename);
... ...
ktwebservice/nunit/document_detail.cs
  View file @0299ef9
... ... @@ -88,7 +88,7 @@ namespace MonoTests.KnowledgeTree
88 88 Assert.AreEqual("text", response.mime_icon_path);
89 89 Assert.AreEqual("Plain Text", response.mime_display);
90 90 Assert.IsTrue("" != response.storage_path);
91   - Assert.AreEqual(3, response.metadata.Length);
  91 + Assert.AreEqual(2, response.metadata.Length);
92 92 Assert.AreEqual(null, response.links);
93 93  
94 94 Assert.AreEqual(1, response.transaction_history.Length);
... ...
ktwebservice/nunit/document_metadata.cs
  View file @0299ef9
... ... @@ -96,11 +96,11 @@ namespace MonoTests.KnowledgeTree
96 96 Assert.AreEqual(0, update_resp.status_code);
97 97 Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
98 98  
99   - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
100   - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
  99 + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
  100 + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
101 101  
102   - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
103   - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
  102 + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
  103 + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
104 104  
105 105 Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
106 106 Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
... ... @@ -131,12 +131,12 @@ namespace MonoTests.KnowledgeTree
131 131 Assert.AreEqual(0, update_resp.status_code);
132 132 Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
133 133  
134   - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
135   - Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[0].value);
  134 + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
  135 + Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[1].value);
136 136  
137 137  
138   - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
139   - Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[1].value);
  138 + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
  139 + Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[0].value);
140 140  
141 141  
142 142 Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
... ...
ktwebservice/nunit/document_system_metadata.cs
  View file @0299ef9
... ... @@ -66,11 +66,11 @@ namespace MonoTests.KnowledgeTree
66 66 Assert.AreEqual(0, update_resp.status_code);
67 67 Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
68 68  
69   - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
70   - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
  69 + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
  70 + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
71 71  
72   - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
73   - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
  72 + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
  73 + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
74 74  
75 75 Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
76 76 Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
... ... @@ -112,11 +112,11 @@ namespace MonoTests.KnowledgeTree
112 112 Assert.AreEqual(0, update_resp.status_code);
113 113 Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
114 114  
115   - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
116   - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
  115 + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
  116 + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
117 117  
118   - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
119   - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
  118 + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
  119 + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
120 120  
121 121 Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
122 122 Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
... ... @@ -167,11 +167,11 @@ namespace MonoTests.KnowledgeTree
167 167 Assert.AreEqual(0, update_resp.status_code);
168 168 Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
169 169  
170   - Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
171   - Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
  170 + Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
  171 + Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
172 172  
173   - Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
174   - Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
  173 + Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
  174 + Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
175 175  
176 176 Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
177 177 Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
... ...
ktwebservice/nunit/folder.cs
  View file @0299ef9
... ... @@ -135,7 +135,6 @@ namespace MonoTests.KnowledgeTree
135 135 [Test]
136 136 public void CopyFolder()
137 137 {
138   -
139 138 kt_folder_detail response = this._kt.create_folder(this._session, 1, "kt_unit_test2");
140 139 Assert.AreEqual(0,response.status_code);
141 140  
... ...
ktwebservice/nunit/helper.cs
  View file @0299ef9
1 1 using System;
2 2 using System.Text;
3 3 using System.Net;
4   -using System.IO;
  4 +using System.IO;
5 5 using System.Collections;
6 6 using System.Data;
7   -using System.Data.Odbc;
  7 +using System.Data.Odbc;
8 8 using System.Runtime.Remoting;
9 9 using System.Runtime.Remoting.Channels;
10 10 using System.Runtime.Remoting.Messaging;
... ... @@ -14,7 +14,6 @@ using System.Runtime.Serialization;
14 14 using System.Text.RegularExpressions;
15 15 using System.Web.Services.Protocols;
16 16 using System.Reflection;
17   -using Interception;
18 17 using System.Web;
19 18 using System.Xml;
20 19 using System.Web.Services;
... ... @@ -30,24 +29,24 @@ using System.Web.Services.Protocols;
30 29 namespace MonoTests.KnowledgeTree
31 30 {
32 31  
33   -
34 32  
35   - [System.Web.Services.WebServiceBinding(Name="KnowledgeTreePort", Namespace="urn:KnowledgeTree")]
  33 +
  34 + [System.Web.Services.WebServiceBinding(Name="KnowledgeTreePort", Namespace="urn:KnowledgeTree")]
36 35 public class KTWebService : KnowledgeTreeService
37 36 {
38 37 public KTWebService() : base()
39 38 {
40 39 this.Url = Environment.GetEnvironmentVariable("KT_ROOT_URL") + "/ktwebservice/webservice.php";
41 40 }
42   - }
43   -
  41 + }
  42 +
44 43 public class MySoapHttpClientProtocol : SoapHttpClientProtocol
45 44 {
46 45 public MySoapHttpClientProtocol() : base() {}
47   -
  46 +
48 47 public object [] ReceiveResponse (WebResponse response, SoapClientMessage message, SoapExtension[] extensions)
49 48 {
50   -
  49 +
51 50 StreamReader sr = new StreamReader(response.GetResponseStream());
52 51 String content = sr.ReadToEnd();
53 52 System.Console.WriteLine(content);
... ... @@ -55,39 +54,39 @@ namespace MonoTests.KnowledgeTree
55 54 return null;
56 55 }
57 56 }
58   -
  57 +
59 58 public class KTTest
60 59 {
61 60 protected KTWebService _kt;
62 61 protected String _session;
63   - protected bool _verbose;
  62 + protected bool _verbose;
  63 +
64 64  
65   -
66 65 public KTTest()
67 66 {
68 67 this._kt = new KTWebService();
69 68 kt_response response = this._kt.login("admin","admin","127.0.0.1");
70 69 this._session = response.message;
71   - this._verbose = false;
72   - this.setupDb();
73   -
74   - //System.Web.Services.Protocols.SoapHttpClientProtocol.ReceiveResponse
75   - }
76   -
  70 + this._verbose = false;
  71 + this.setupDb();
  72 +
  73 + //System.Web.Services.Protocols.SoapHttpClientProtocol.ReceiveResponse
  74 + }
  75 +
77 76 void setupDb()
78 77 {
79   -
  78 +
80 79 String connectionString = "DSN=ktdms;" + "UID=root;" + "PWD=";
81 80 try
82 81 {
83 82 IDbConnection dbcon = new OdbcConnection(connectionString);
84   - if (dbcon == null)
  83 + if (dbcon == null)
85 84 {
86 85 System.Console.WriteLine("Cannot create connection");
87 86 }
88 87 dbcon.Open();
89 88 IDbCommand dbcmd = dbcon.CreateCommand();
90   - if (dbcmd == null)
  89 + if (dbcmd == null)
91 90 {
92 91 System.Console.WriteLine("Cannot create command");
93 92 }
... ... @@ -110,15 +109,15 @@ namespace MonoTests.KnowledgeTree
110 109 {
111 110 System.Console.WriteLine(ex.Message);
112 111 }
113   - }
114   -
  112 + }
  113 +
115 114 ~KTTest()
116 115 {
117   - this._kt.logout(this._session);
  116 + this._kt.logout(this._session);
118 117 }
119 118 }
120 119  
121   -
  120 +
122 121  
123 122 public class FileUploader
124 123 {
... ... @@ -133,11 +132,11 @@ namespace MonoTests.KnowledgeTree
133 132 System.Console.WriteLine("Using upload URL: " + uri);
134 133 this.boundary = "----" + DateTime.Now.Ticks.ToString("x");
135 134 }
136   -
  135 +
137 136 public FileUploader() : this(Environment.GetEnvironmentVariable("KT_ROOT_URL") + "/ktwebservice/upload.php")
138 137 {
139 138 }
140   -
  139 +
141 140  
142 141 public String getFilename()
143 142 {
... ... @@ -246,8 +245,8 @@ namespace MonoTests.KnowledgeTree
246 245 }
247 246  
248 247 }
249   -
250   -
  248 +
  249 +
251 250  
252 251 public class Document
253 252 {
... ...
ktwebservice/nunit/makefile
  View file @0299ef9
1   -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
  1 +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
2 2 PROXY=KTproxy.cs
3 3 WSDL=ktdms.wsdl
4 4 ROOT_URL=http://ktdms.trunk
5   -#ROOT_URL=http://192.168.1.111
  5 +ROOT_URL=http://172.16.121.128
6 6 WSDL_URL=${ROOT_URL}/ktwebservice/index.php?wsdl
7 7  
8 8 all: ${RESULTS}
... ... @@ -10,7 +10,7 @@ all: ${RESULTS}
10 10 results: clean-results ${RESULTS}
11 11  
12 12 KTproxy.dll: KTproxy.cs helper.cs
13   - mcs -r:System.Web.Services -r:System.Data.dll /target:library KTproxy.cs intercept.cs helper.cs
  13 + mcs -r:System.Web.Services -r:System.Data.dll /target:library KTproxy.cs helper.cs
14 14  
15 15 KTproxy.cs: ktdms.wsdl
16 16 wsdl -out:${PROXY} ${WSDL}
... ...