X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=WptscsTest%2FUtilities%2FAppConfigWebProxyTest.cs;h=ae704c5c9d6b7bf2c17b6808d3c01ccb8796872d;hb=1db23055b1f6bbba4c056ce39f6ea29d102805ba;hp=90ee216820523428b8d826cb8f368d94e6ba9cab;hpb=75c6c23b34fcffb166415978a1328bd727f98179;p=wptscs%2Fwpts.git
diff --git a/WptscsTest/Utilities/AppConfigWebProxyTest.cs b/WptscsTest/Utilities/AppConfigWebProxyTest.cs
index 90ee216..ae704c5 100644
--- a/WptscsTest/Utilities/AppConfigWebProxyTest.cs
+++ b/WptscsTest/Utilities/AppConfigWebProxyTest.cs
@@ -14,12 +14,12 @@ namespace Honememo.Wptscs.Utilities
using System.IO;
using Honememo.Wptscs.Properties;
using Honememo.Wptscs.Utilities;
- using NUnit.Framework;
+ using Microsoft.VisualStudio.TestTools.UnitTesting;
///
/// ã®ãã¹ãã¯ã©ã¹ã§ãã
///
- [TestFixture]
+ [TestClass]
internal class AppConfigWebProxyTest
{
#region å®æ°
@@ -27,7 +27,7 @@ namespace Honememo.Wptscs.Utilities
///
/// ãã¹ããã¼ã¿ãæ ¼ç´ããã¦ãããã©ã«ããã¹ã
///
- private static readonly string testFile = "Data\\config.xml";
+ private static readonly string TestFile = "Data\\config.xml";
#endregion
@@ -37,11 +37,11 @@ namespace Honememo.Wptscs.Utilities
/// ããããã£ãã¹ãã±ã¼ã¹ã
///
/// ã¢ããªè¨å®é¨åã¯ã¢ã¯ã»ã¹æ¨©ã®é¢ä¿ä¸è©¦é¨ã§ããã
- [Test]
+ [TestMethod]
public void TestUserAgent()
{
IWebProxy proxy = new AppConfigWebProxy();
- ////Settings.Default.UserAgent = String.Empty;
+ ////Settings.Default.UserAgent = string.Empty;
// åæç¶æ
ã§ã¯ã¢ããªåãå
ã«çæããå¤
Version ver = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
@@ -49,7 +49,7 @@ namespace Honememo.Wptscs.Utilities
//// String.Format(Settings.Default.DefaultUserAgent, ver.Major, ver.Minor),
//// proxy.UserAgent);
Assert.AreEqual(
- String.Format("Translation Support for Wikipedia/{0}.{1:D2}", ver.Major, ver.Minor),
+ string.Format("Translation Support for Wikipedia/{0}.{1:D2}", ver.Major, ver.Minor),
proxy.UserAgent);
// ããããã£è¨å®æã¯ãã®å¤ãè¿ã
@@ -57,12 +57,12 @@ namespace Honememo.Wptscs.Utilities
Assert.AreEqual("test property useragent", proxy.UserAgent);
// 空ã§ãæå¹
- proxy.UserAgent = String.Empty;
- Assert.IsEmpty(proxy.UserAgent);
+ proxy.UserAgent = string.Empty;
+ Assert.AreEqual(string.Empty, proxy.UserAgent);
// nullãªãç¡å¹
proxy.UserAgent = null;
- Assert.IsNotEmpty(proxy.UserAgent);
+ Assert.IsTrue(proxy.UserAgent.Length > 0);
// ã¢ããªè¨å®æã¯ã¢ããªã«æ ¼ç´ãããè¨å®å¤ãæåªå
////Settings.Default.UserAgent = "test setting useragent";
@@ -73,14 +73,14 @@ namespace Honememo.Wptscs.Utilities
/// ããããã£ãã¹ãã±ã¼ã¹ã
///
/// ã¢ããªè¨å®é¨åã¯ã¢ã¯ã»ã¹æ¨©ã®é¢ä¿ä¸è©¦é¨ã§ããã
- [Test]
+ [TestMethod]
public void TestReferer()
{
IWebProxy proxy = new AppConfigWebProxy();
- ////Settings.Default.Referer = String.Empty;
+ ////Settings.Default.Referer = string.Empty;
// åæç¶æ
ã§ã¯ç©º
- Assert.IsEmpty(proxy.Referer);
+ Assert.AreEqual(string.Empty, proxy.Referer);
// ããããã£è¨å®æã¯ãã®å¤ãè¿ã
proxy.Referer = "test property referer";
@@ -99,14 +99,14 @@ namespace Honememo.Wptscs.Utilities
/// ã¡ã½ãããã¹ãã±ã¼ã¹ã
///
/// å
容çã«é£ãããããfileãããã³ã«ã®ã¿ç¢ºèªã
- [Test]
+ [TestMethod]
public void TestGetStream()
{
IWebProxy proxy = new AppConfigWebProxy();
// ãã¹ããã¡ã¤ã«ãèªãã§ä¾å¤ãçºçããªããã°OKã¨ãã
- UriBuilder b = new UriBuilder("file", String.Empty);
- b.Path = Path.GetFullPath(testFile);
+ UriBuilder b = new UriBuilder("file", string.Empty);
+ b.Path = Path.GetFullPath(TestFile);
using (proxy.GetStream(b.Uri))
{
}