Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REST client API (SPRNET-1345) :

Browse Source 
- Added UrlEncodedFormHttpMessageConverter
- Fixed Xml based message converters
- Minor fixes & polishing
This commit is contained in:
bbaia
2010-11-28 19:03:58 +00:00
parent b8a687b86a
commit 169d210b48
36 changed files with 390 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/Spring/Spring.Http.Tests/Http/Converters/ByteArrayHttpMessageConverterTests.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System;
using System.IO;
using System.Net;
@@ -50,17 +49,17 @@ namespace Spring.Http.Converters
{
Assert.IsTrue(converter.CanRead(typeof(byte[]), new MediaType("application", "octet-stream")));
Assert.IsTrue(converter.CanRead(typeof(byte[]), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(byte[]), MediaType.ALL));
Assert.IsTrue(converter.CanRead(typeof(byte[]), MediaType.ALL));
Assert.IsFalse(converter.CanRead(typeof(string), new MediaType("application", "octet-stream")));
}
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanRead(typeof(byte[]), new MediaType("application", "octet-stream")));
Assert.IsTrue(converter.CanRead(typeof(byte[]), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(byte[]), new MediaType("application", "octet-stream")));
Assert.IsTrue(converter.CanWrite(typeof(byte[]), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(byte[]), MediaType.ALL));
Assert.IsFalse(converter.CanRead(typeof(string), new MediaType("application", "octet-stream")));
Assert.IsFalse(converter.CanWrite(typeof(string), new MediaType("application", "octet-stream")));
}
[Test]

14
test/Spring/Spring.Http.Tests/Http/Converters/Feed/Atom10FeedHttpMessageConverterTests.cs
View File

@@ -62,11 +62,11 @@ namespace Spring.Http.Converters.Feed
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanRead(typeof(SyndicationFeed), new MediaType("application", "atom+xml")));
Assert.IsTrue(converter.CanRead(typeof(SyndicationItem), new MediaType("application", "atom+xml")));
Assert.IsTrue(converter.CanRead(typeof(SyndicationFeed), new MediaType("text", "xml")));
Assert.IsFalse(converter.CanRead(typeof(string), new MediaType("application", "atom+xml")));
Assert.IsFalse(converter.CanRead(typeof(SyndicationFeed), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationFeed), new MediaType("application", "atom+xml")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationItem), new MediaType("application", "atom+xml")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationFeed), new MediaType("text", "xml")));
Assert.IsFalse(converter.CanWrite(typeof(string), new MediaType("application", "atom+xml")));
Assert.IsFalse(converter.CanWrite(typeof(SyndicationFeed), new MediaType("text", "plain")));
}
[Test]
@@ -74,7 +74,7 @@ namespace Spring.Http.Converters.Feed
{
DateTime now = DateTime.Now;
string body = String.Format("<feed xmlns=\"http://www.w3.org/2005/Atom\"><title type=\"text\">Test Feed</title><subtitle type=\"text\">This is a test feed</subtitle><id>Atom10FeedHttpMessageConverterTests.Write</id><rights type=\"text\">Copyright 2010</rights><updated>{0}</updated><author><name>Bruno Baïa</name><uri>http://www.springframework.net/bbaia</uri><email>bruno.baia@springframework.net</email></author><link rel=\"alternate\" href=\"http://www.springframework.net/Feed\" /></feed>",
string body = String.Format("<feed xmlns=\"http://www.w3.org/2005/Atom\"><title type=\"text\">Test Feed</title><subtitle type=\"text\">This is a test feed</subtitle><id>Atom10FeedHttpMessageConverterTests.Write</id><rights type=\"text\">Copyright 2010</rights><updated>{0}</updated><author><name>Bruno Baïa</name><uri>http://www.springframework.net/bbaia</uri><email>bruno.baia@springframework.net</email></author><link rel=\"alternate\" href=\"http://www.springframework.net/Feed\" /></feed>",
now.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
HttpWebResponse webResponse = mocks.CreateMock<HttpWebResponse>();
@@ -105,7 +105,7 @@ namespace Spring.Http.Converters.Feed
DateTime now = DateTime.Now;
string expectedBody = String.Format("<feed xmlns=\"http://www.w3.org/2005/Atom\"><title type=\"text\">Test Feed</title><subtitle type=\"text\">This is a test feed</subtitle><id>Atom10FeedHttpMessageConverterTests.Write</id><rights type=\"text\">Copyright 2010</rights><updated>{0}</updated><author><name>Bruno Baïa</name><uri>http://www.springframework.net/bbaia</uri><email>bruno.baia@springframework.net</email></author><link rel=\"alternate\" href=\"http://www.springframework.net/Feed\" /></feed>",
string expectedBody = String.Format("<feed xmlns=\"http://www.w3.org/2005/Atom\"><title type=\"text\">Test Feed</title><subtitle type=\"text\">This is a test feed</subtitle><id>Atom10FeedHttpMessageConverterTests.Write</id><rights type=\"text\">Copyright 2010</rights><updated>{0}</updated><author><name>Bruno Baïa</name><uri>http://www.springframework.net/bbaia</uri><email>bruno.baia@springframework.net</email></author><link rel=\"alternate\" href=\"http://www.springframework.net/Feed\" /></feed>",
now.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
SyndicationFeed body = new SyndicationFeed("Test Feed", "This is a test feed", new Uri("http://www.springframework.net/Feed"), "Atom10FeedHttpMessageConverterTests.Write", now);

16
test/Spring/Spring.Http.Tests/Http/Converters/Feed/Rss20FeedHttpMessageConverterTests.cs
View File

@@ -62,12 +62,12 @@ namespace Spring.Http.Converters.Feed
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanRead(typeof(SyndicationFeed), new MediaType("application", "rss+xml")));
Assert.IsTrue(converter.CanRead(typeof(SyndicationItem), new MediaType("application", "rss+xml")));
Assert.IsTrue(converter.CanRead(typeof(SyndicationFeed), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanRead(typeof(SyndicationFeed), new MediaType("text", "xml")));
Assert.IsFalse(converter.CanRead(typeof(string), new MediaType("application", "rss+xml")));
Assert.IsFalse(converter.CanRead(typeof(SyndicationFeed), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationFeed), new MediaType("application", "rss+xml")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationItem), new MediaType("application", "rss+xml")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationFeed), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(SyndicationFeed), new MediaType("text", "xml")));
Assert.IsFalse(converter.CanWrite(typeof(string), new MediaType("application", "rss+xml")));
Assert.IsFalse(converter.CanWrite(typeof(SyndicationFeed), new MediaType("text", "plain")));
}
[Test]
@@ -75,7 +75,7 @@ namespace Spring.Http.Converters.Feed
{
DateTime now = DateTime.Now;
string body = String.Format("<rss xmlns:a10=\"http://www.w3.org/2005/Atom\" version=\"2.0\"><channel><title>Test Feed</title><link>http://www.springframework.net/Feed</link><description>This is a test feed</description><copyright>Copyright 2010</copyright><managingEditor>bruno.baia@springframework.net</managingEditor><lastBuildDate>{0}</lastBuildDate><a10:id>Atom10FeedHttpMessageConverterTests.Write</a10:id></channel></rss>",
string body = String.Format("<rss xmlns:a10=\"http://www.w3.org/2005/Atom\" version=\"2.0\"><channel><title>Test Feed</title><link>http://www.springframework.net/Feed</link><description>This is a test feed</description><copyright>Copyright 2010</copyright><managingEditor>bruno.baia@springframework.net</managingEditor><lastBuildDate>{0}</lastBuildDate><a10:id>Atom10FeedHttpMessageConverterTests.Write</a10:id></channel></rss>",
now.ToString("ddd, dd MMM yyyy HH:mm:ss zzz", CultureInfo.InvariantCulture).Remove(29, 1));
HttpWebResponse webResponse = mocks.CreateMock<HttpWebResponse>();
@@ -104,7 +104,7 @@ namespace Spring.Http.Converters.Feed
DateTime now = DateTime.Now;
string expectedBody = String.Format("<rss xmlns:a10=\"http://www.w3.org/2005/Atom\" version=\"2.0\"><channel><title>Test Feed</title><link>http://www.springframework.net/Feed</link><description>This is a test feed</description><copyright>Copyright 2010</copyright><managingEditor>bruno.baia@springframework.net</managingEditor><lastBuildDate>{0}</lastBuildDate><a10:id>Atom10FeedHttpMessageConverterTests.Write</a10:id></channel></rss>",
string expectedBody = String.Format("<rss xmlns:a10=\"http://www.w3.org/2005/Atom\" version=\"2.0\"><channel><title>Test Feed</title><link>http://www.springframework.net/Feed</link><description>This is a test feed</description><copyright>Copyright 2010</copyright><managingEditor>bruno.baia@springframework.net</managingEditor><lastBuildDate>{0}</lastBuildDate><a10:id>Atom10FeedHttpMessageConverterTests.Write</a10:id></channel></rss>",
now.ToString("ddd, dd MMM yyyy HH:mm:ss zzz", CultureInfo.InvariantCulture).Remove(29, 1));
SyndicationFeed body = new SyndicationFeed("Test Feed", "This is a test feed", new Uri("http://www.springframework.net/Feed"), "Atom10FeedHttpMessageConverterTests.Write", now);

4
test/Spring/Spring.Http.Tests/Http/Converters/Json/JsonHttpMessageConverterTests.cs
View File

@@ -55,8 +55,8 @@ namespace Spring.Http.Converters.Json
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanRead(typeof(CustomClass), new MediaType("application", "json")));
Assert.IsFalse(converter.CanRead(typeof(CustomClass), new MediaType("text", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(CustomClass), new MediaType("application", "json")));
Assert.IsFalse(converter.CanWrite(typeof(CustomClass), new MediaType("text", "xml")));
}
[Test]

17
test/Spring/Spring.Http.Tests/Http/Converters/StringHttpMessageConverterTests.cs
View File

@@ -18,7 +18,6 @@
#endregion
using System;
using System.IO;
using System.Net;
using System.Text;
@@ -50,7 +49,7 @@ namespace Spring.Http.Converters
public void CanRead()
{
Assert.IsTrue(converter.CanRead(typeof(string), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(string), MediaType.ALL));
Assert.IsTrue(converter.CanRead(typeof(string), MediaType.ALL));
Assert.IsTrue(converter.CanRead(typeof(string), new MediaType("application", "xml")));
Assert.IsFalse(converter.CanRead(typeof(int[]), new MediaType("text", "plain")));
}
@@ -58,20 +57,23 @@ namespace Spring.Http.Converters
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanRead(typeof(string), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(string), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(string), MediaType.ALL));
Assert.IsTrue(converter.CanRead(typeof(string), new MediaType("application", "xml")));
Assert.IsFalse(converter.CanRead(typeof(int[]), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(string), new MediaType("application", "xml")));
Assert.IsFalse(converter.CanWrite(typeof(int[]), new MediaType("text", "plain")));
}
[Test]
public void Read()
{
string body = "Hello Bruno Baïa";
string charSet = "utf-8";
Encoding charSetEncoding = Encoding.GetEncoding(charSet);
MediaType mediaType = new MediaType("text", "plain", charSet);
HttpWebResponse webResponse = mocks.CreateMock<HttpWebResponse>();
Expect.Call<Stream>(webResponse.GetResponseStream()).Return(new MemoryStream(Encoding.UTF8.GetBytes(body)));
Expect.Call<string>(webResponse.CharacterSet).Return("utf-8").Repeat.Twice();
Expect.Call<string>(webResponse.ContentType).Return(mediaType.ToString());
mocks.ReplayAll();
@@ -89,9 +91,10 @@ namespace Spring.Http.Converters
string body = "H\u00e9llo W\u00f6rld";
string charSet = "ISO-8859-1";
Encoding charSetEncoding = Encoding.GetEncoding(charSet);
MediaType mediaType = new MediaType("text", "plain", charSet);
HttpWebRequest webRequest = mocks.CreateMock<HttpWebRequest>();
Expect.Call(webRequest.ContentType = "text/plain;charset=ISO-8859-1").PropertyBehavior();
Expect.Call(webRequest.ContentType = mediaType.ToString()).PropertyBehavior();
Expect.Call(webRequest.ContentLength = 1337).PropertyBehavior();
Expect.Call<Stream>(webRequest.GetRequestStream()).Return(requestStream);

122
test/Spring/Spring.Http.Tests/Http/Converters/UrlEncodedFormHttpMessageConverterTests.cs Normal file
View File

@@ -0,0 +1,122 @@
#region License
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
using System;
using System.IO;
using System.Net;
using System.Text;
using System.Collections.Specialized;
using NUnit.Framework;
using Rhino.Mocks;
namespace Spring.Http.Converters
{
/// <summary>
/// Unit tests for the UrlEncodedFormHttpMessageConverter class.
/// </summary>
/// <author>Arjen Poutsma</author>
/// <author>Bruno Baia (.NET)</author>
[TestFixture]
public class UrlEncodedFormHttpMessageConverterTests
{
private UrlEncodedFormHttpMessageConverter converter;
private MockRepository mocks;
[SetUp]
public void SetUp()
{
mocks = new MockRepository();
converter = new UrlEncodedFormHttpMessageConverter();
}
[Test]
public void CanRead()
{
Assert.IsTrue(converter.CanRead(typeof(NameValueCollection), new MediaType("application", "x-www-form-urlencoded")));
Assert.IsFalse(converter.CanRead(typeof(NameValueCollection), new MediaType("application", "xml")));
Assert.IsFalse(converter.CanRead(typeof(string), new MediaType("application", "x-www-form-urlencoded")));
}
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanWrite(typeof(NameValueCollection), new MediaType("application", "x-www-form-urlencoded")));
Assert.IsFalse(converter.CanWrite(typeof(NameValueCollection), new MediaType("application", "xml")));
Assert.IsFalse(converter.CanWrite(typeof(string), new MediaType("application", "x-www-form-urlencoded")));
}
[Test]
public void Read()
{
String body = "name+1=value+1&name+2=value+2%2B1&name+2=value+2%2B2&name+3";
string charSet = "ISO-8859-1";
Encoding charSetEncoding = Encoding.GetEncoding(charSet);
MediaType mediaType = new MediaType("application", "x-www-form-urlencoded", charSet);
HttpWebResponse webResponse = mocks.CreateMock<HttpWebResponse>();
Expect.Call<Stream>(webResponse.GetResponseStream()).Return(new MemoryStream(Encoding.UTF8.GetBytes(body)));
Expect.Call<string>(webResponse.ContentType).Return(mediaType.ToString());
mocks.ReplayAll();
NameValueCollection result = converter.Read<NameValueCollection>(webResponse);
Assert.AreEqual(3, result.Count, "Invalid result");
Assert.AreEqual(1, result.GetValues(0).Length, "Invalid result");
Assert.AreEqual("value 1", result.GetValues(0)[0], "Invalid result");
Assert.AreEqual(2, result.GetValues("name 2").Length, "Invalid result");
Assert.AreEqual("value 2+1", result.GetValues("name 2")[0], "Invalid result");
Assert.AreEqual("value 2+2", result.GetValues("name 2")[1], "Invalid result");
Assert.IsNull(result["name 3"], "Invalid result");
mocks.VerifyAll();
}
[Test]
public void Write()
{
MemoryStream requestStream = new MemoryStream();
string expectedBody = "name+1=value+1&name+2=value+2%2b1&name+2=value+2%2b2&name+3";
NameValueCollection body = new NameValueCollection();
body.Add("name 1", "value 1");
body.Add("name 2", "value 2+1");
body.Add("name 2", "value 2+2");
body.Add("name 3", null);
string charSet = "ISO-8859-1";
Encoding charSetEncoding = Encoding.GetEncoding(charSet);
MediaType mediaType = new MediaType("application", "x-www-form-urlencoded", charSet);
HttpWebRequest webRequest = mocks.CreateMock<HttpWebRequest>();
Expect.Call(webRequest.ContentType = mediaType.ToString()).PropertyBehavior();
Expect.Call(webRequest.ContentLength = 1337).PropertyBehavior();
Expect.Call<Stream>(webRequest.GetRequestStream()).Return(requestStream);
mocks.ReplayAll();
converter.Write(body, null, webRequest);
byte[] result = requestStream.ToArray();
Assert.AreEqual(expectedBody, charSetEncoding.GetString(result), "Invalid result");
mocks.VerifyAll();
}
}
}

16
test/Spring/Spring.Http.Tests/Http/Converters/Xml/DataContractHttpMessageConverterTests.cs
View File

@@ -63,10 +63,10 @@ namespace Spring.Http.Converters.Xml
{
Assert.IsTrue(converter.CanWrite(typeof(DataContractClass), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(DataContractClass), new MediaType("text", "xml")));
Assert.IsTrue(converter.CanRead(typeof(DataContractClass), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanRead(typeof(DataContractClass), new MediaType("text", "plain")));
Assert.IsFalse(converter.CanRead(typeof(NonDataContractClass), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanRead(typeof(CollectionDataContractClass), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(DataContractClass), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanWrite(typeof(DataContractClass), new MediaType("text", "plain")));
Assert.IsFalse(converter.CanWrite(typeof(NonDataContractClass), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(CollectionDataContractClass), new MediaType("application", "xml")));
}
[Test]
@@ -107,12 +107,8 @@ namespace Spring.Http.Converters.Xml
converter.Write(body, null, webRequest);
requestStream.Position = 0;
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
{
string result = reader.ReadToEnd();
Assert.AreEqual(expectedBody, result, "Invalid result");
}
byte[] result = requestStream.ToArray();
Assert.AreEqual(expectedBody, Encoding.UTF8.GetString(result), "Invalid result");
mocks.VerifyAll();
}

14
test/Spring/Spring.Http.Tests/Http/Converters/Xml/XElementHttpMessageConverterTests.cs
View File

@@ -63,9 +63,9 @@ namespace Spring.Http.Converters.Xml
{
Assert.IsTrue(converter.CanWrite(typeof(XElement), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(XElement), new MediaType("text", "xml")));
Assert.IsTrue(converter.CanRead(typeof(XElement), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanRead(typeof(XElement), new MediaType("text", "plain")));
Assert.IsFalse(converter.CanRead(typeof(String), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(XElement), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanWrite(typeof(XElement), new MediaType("text", "plain")));
Assert.IsFalse(converter.CanWrite(typeof(String), new MediaType("application", "xml")));
}
[Test]
@@ -110,12 +110,8 @@ namespace Spring.Http.Converters.Xml
converter.Write(body, null, webRequest);
requestStream.Position = 0;
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
{
string result = reader.ReadToEnd();
Assert.AreEqual(body.ToString(SaveOptions.DisableFormatting), result, "Invalid result");
}
byte[] result = requestStream.ToArray();
Assert.AreEqual(body.ToString(SaveOptions.DisableFormatting), Encoding.UTF8.GetString(result), "Invalid result");
mocks.VerifyAll();
}

16
test/Spring/Spring.Http.Tests/Http/Converters/Xml/XmlDocumentHttpMessageConverterTests.cs
View File

@@ -61,9 +61,9 @@ namespace Spring.Http.Converters.Xml
{
Assert.IsTrue(converter.CanWrite(typeof(XmlDocument), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(XmlDocument), new MediaType("text", "xml")));
Assert.IsTrue(converter.CanRead(typeof(XmlDocument), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanRead(typeof(XmlDocument), new MediaType("text", "plain")));
Assert.IsFalse(converter.CanRead(typeof(String), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(XmlDocument), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanWrite(typeof(XmlDocument), new MediaType("text", "plain")));
Assert.IsFalse(converter.CanWrite(typeof(String), new MediaType("application", "xml")));
}
[Test]
@@ -102,14 +102,10 @@ namespace Spring.Http.Converters.Xml
mocks.ReplayAll();
converter.Write(body, null, webRequest);
converter.Write(body, null, webRequest);
requestStream.Position = 0;
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
{
string result = reader.ReadToEnd();
Assert.AreEqual(body.OuterXml, result, "Invalid result");
}
byte[] result = requestStream.ToArray();
Assert.AreEqual(body.OuterXml, Encoding.UTF8.GetString(result), "Invalid result");
mocks.VerifyAll();
}

16
test/Spring/Spring.Http.Tests/Http/Converters/Xml/XmlSerializableHttpMessageConverterTests.cs
View File

@@ -57,10 +57,10 @@ namespace Spring.Http.Converters.Xml
[Test]
public void CanWrite()
{
Assert.IsTrue(converter.CanRead(typeof(CustomClass), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanRead(typeof(CustomClass), new MediaType("text", "xml")));
Assert.IsTrue(converter.CanRead(typeof(CustomClass), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanRead(typeof(CustomClass), new MediaType("text", "plain")));
Assert.IsTrue(converter.CanWrite(typeof(CustomClass), new MediaType("application", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(CustomClass), new MediaType("text", "xml")));
Assert.IsTrue(converter.CanWrite(typeof(CustomClass), new MediaType("application", "soap+xml"))); // application/*+xml
Assert.IsFalse(converter.CanWrite(typeof(CustomClass), new MediaType("text", "plain")));
}
[Test]
@@ -102,12 +102,8 @@ namespace Spring.Http.Converters.Xml
converter.Write(body, null, webRequest);
requestStream.Position = 0;
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
{
string result = reader.ReadToEnd();
Assert.AreEqual(expectedBody, result, "Invalid result");
}
byte[] result = requestStream.ToArray();
Assert.AreEqual(expectedBody, Encoding.UTF8.GetString(result), "Invalid result");
mocks.VerifyAll();
}

95
test/Spring/Spring.Http.Tests/Http/Rest/RestTemplateIntegrationTests.cs
View File

@@ -28,9 +28,6 @@ using System.ServiceModel;
using System.ServiceModel.Web;
using System.ServiceModel.Channels;
using Spring.Http;
using Spring.Http.Rest.Support;
using NUnit.Framework;
namespace Spring.Http.Rest
@@ -243,98 +240,6 @@ namespace Spring.Http.Rest
template.Execute<object>("servererror", null, null);
}
//@BeforeClass
//public static void startJettyServer() throws Exception {
// jettyServer = new Server(8889);
// Context jettyContext = new Context(jettyServer, "/");
// byte[] bytes = helloWorld.getBytes("UTF-8");
// contentType = new MediaType("text", "plain", Collections.singletonMap("charset", "utf-8"));
// jettyContext.addServlet(new ServletHolder(new GetServlet(bytes, contentType)), "/get");
// jettyContext.addServlet(new ServletHolder(new GetServlet(new byte[0], contentType)), "/get/nothing");
// jettyContext.addServlet(
// new ServletHolder(new PostServlet(helloWorld, URI + "/post/1", bytes, contentType)),
// "/post");
// jettyContext.addServlet(new ServletHolder(new ErrorServlet(404)), "/errors/notfound");
// jettyContext.addServlet(new ServletHolder(new ErrorServlet(500)), "/errors/server");
// jettyContext.addServlet(new ServletHolder(new UriServlet()), "/uri/*");
// jettyContext.addServlet(new ServletHolder(new MultipartServlet()), "/multipart");
// jettyServer.start();
//}
//@Test
//public void uri() throws InterruptedException, URISyntaxException {
// String result = template.getForObject(URI + "/uri/{query}", String.class, "Z\u00fcrich");
// Assert.AreEqual("Invalid request URI", "/uri/Z%C3%BCrich", result);
// result = template.getForObject(URI + "/uri/query={query}", String.class, "foo@bar");
// Assert.AreEqual("Invalid request URI", "/uri/query=foo@bar", result);
// result = template.getForObject(URI + "/uri/query={query}", String.class, "T\u014dky\u014d");
// Assert.AreEqual("Invalid request URI", "/uri/query=T%C5%8Dky%C5%8D", result);
//}
//@Test
//public void multipart() throws UnsupportedEncodingException {
// MultiValueMap<String, Object> parts = new LinkedMultiValueMap<String, Object>();
// parts.add("name 1", "value 1");
// parts.add("name 2", "value 2+1");
// parts.add("name 2", "value 2+2");
// Resource logo = new ClassPathResource("/org/springframework/http/converter/logo.jpg");
// parts.add("logo", logo);
// template.postForLocation(URI + "/multipart", parts);
//}
//private static class UriServlet extends HttpServlet {
// @Override
// protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
// resp.setContentType("text/plain");
// resp.setCharacterEncoding("UTF-8");
// resp.getWriter().write(req.getRequestURI());
// }
//}
//private static class MultipartServlet extends HttpServlet {
// @Override
// protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
// assertTrue(ServletFileUpload.isMultipartContent(req));
// FileItemFactory factory = new DiskFileItemFactory();
// ServletFileUpload upload = new ServletFileUpload(factory);
// try {
// List items = upload.parseRequest(req);
// Assert.AreEqual(4, items.size());
// FileItem item = (FileItem) items.get(0);
// assertTrue(item.isFormField());
// Assert.AreEqual("name 1", item.getFieldName());
// Assert.AreEqual("value 1", item.getString());
// item = (FileItem) items.get(1);
// assertTrue(item.isFormField());
// Assert.AreEqual("name 2", item.getFieldName());
// Assert.AreEqual("value 2+1", item.getString());
// item = (FileItem) items.get(2);
// assertTrue(item.isFormField());
// Assert.AreEqual("name 2", item.getFieldName());
// Assert.AreEqual("value 2+2", item.getString());
// item = (FileItem) items.get(3);
// Assert.IsFalse(item.isFormField());
// Assert.AreEqual("logo", item.getFieldName());
// Assert.AreEqual("logo.jpg", item.getName());
// Assert.AreEqual("image/jpeg", item.getContentType());
// }
// catch (FileUploadException ex) {
// throw new ServletException(ex);
// }
// }
//}
#region REST test service
[ServiceContract]

1
test/Spring/Spring.Http.Tests/Http/Rest/RestTemplateTests.cs
View File

@@ -22,7 +22,6 @@ using System;
using System.Net;
using System.Collections.Generic;
using Spring.Http;
using Spring.Http.Converters;
using NUnit.Framework;

1
test/Spring/Spring.Http.Tests/Spring.Http.Tests.2008.csproj
View File

@@ -107,6 +107,7 @@
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="Http\Converters\ByteArrayHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\UrlEncodedFormHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\Feed\Atom10FeedHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\Feed\FeedHttpMessageConverterIntegrationTests.cs" />
<Compile Include="Http\Converters\Feed\Rss20FeedHttpMessageConverterTests.cs" />

1
test/Spring/Spring.Http.Tests/Spring.Http.Tests.2010.csproj
View File

@@ -128,6 +128,7 @@
<Compile Include="Http\Converters\Json\JsonHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\Json\JsonHttpMessageConverterIntegrationTests.cs" />
<Compile Include="Http\Converters\StringHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\UrlEncodedFormHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\Xml\XmlHttpMessageConverterIntegrationTests.cs" />
<Compile Include="Http\Converters\Xml\XElementHttpMessageConverterTests.cs" />
<Compile Include="Http\Converters\Xml\XmlSerializableHttpMessageConverterTests.cs" />