test(all): use a single instance of IpfsClient

richardschneider · richardschneider · commit 177986919f74 · 2017-01-17T16:00:04.000+13:00
diff --git a/test/AddTest.cs b/test/AddTest.cs
@@ -14,7 +14,7 @@ public partial class IpfsClientTest
         [TestMethod]
         public void AddText()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var result = ipfs.AddTextAsync("hello world").Result;
             Assert.AreEqual("Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD", result.Hash);
         }
@@ -26,7 +26,7 @@ public void AddFile()
             File.WriteAllText(path, "hello world");
             try
             {
-                var ipfs = new IpfsClient();
+                var ipfs = TestFixture.Ipfs;
                 var result = ipfs.AddFileAsync(path).Result;
                 Assert.AreEqual("Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD", result.Hash);
                 Assert.AreEqual(0, result.Links.Count());
@@ -40,7 +40,7 @@ public void AddFile()
         [TestMethod]
         public void AddDirectory()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var temp = MakeTemp();
             try
             {
@@ -69,7 +69,7 @@ public void AddDirectory()
         [TestMethod]
         public void AddDirectoryRecursive()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var temp = MakeTemp();
             try
             {
diff --git a/test/Commands/BlockTest.cs b/test/Commands/BlockTest.cs
@@ -9,7 +9,7 @@ namespace Ipfs.Api
     [TestClass]
     public class BlockTest
     {
-        IpfsClient ipfs = new IpfsClient();
+        IpfsClient ipfs = TestFixture.Ipfs;
         string hash = "QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ";
         byte[] blob = Encoding.UTF8.GetBytes("blorb");
 
diff --git a/test/Commands/ConfigTest.cs b/test/Commands/ConfigTest.cs
@@ -16,23 +16,23 @@ public class ConfigTest
         [TestMethod]
         public void Get_Entire_Config()
         {
-            IpfsClient ipfs = new IpfsClient();
+            IpfsClient ipfs = TestFixture.Ipfs;
             var config = ipfs.Config.GetAsync().Result;
             Assert.AreEqual(apiAddress, config["Addresses"]["API"]);
         }
 
         [TestMethod]
         public void Get_Scalar_Key_Value()
         {
-            IpfsClient ipfs = new IpfsClient();
+            IpfsClient ipfs = TestFixture.Ipfs;
             var api = ipfs.Config.GetAsync("Addresses.API").Result;
             Assert.AreEqual(apiAddress, api);
         }
 
         [TestMethod]
         public void Get_Object_Key_Value()
         {
-            IpfsClient ipfs = new IpfsClient();
+            IpfsClient ipfs = TestFixture.Ipfs;
             var addresses = ipfs.Config.GetAsync("Addresses").Result;
             Assert.AreEqual(apiAddress, addresses["API"]);
             Assert.AreEqual(gatewayAddress, addresses["Gateway"]);
@@ -41,7 +41,7 @@ public void Get_Object_Key_Value()
         [TestMethod]
         public void Keys_are_Case_Sensitive()
         {
-            IpfsClient ipfs = new IpfsClient();
+            IpfsClient ipfs = TestFixture.Ipfs;
             var api = ipfs.Config.GetAsync("Addresses.API").Result;
             Assert.AreEqual(apiAddress, api);
 
@@ -53,7 +53,7 @@ public void Set_String_Value()
         {
             const string key = "foo";
             const string value = "foobar";
-            IpfsClient ipfs = new IpfsClient();
+            IpfsClient ipfs = TestFixture.Ipfs;
             ipfs.Config.SetAsync(key, value).Wait();
             Assert.AreEqual(value, ipfs.Config.GetAsync(key).Result);
         }
@@ -63,7 +63,7 @@ public void Set_JSON_Value()
         {
             const string key = "API.HTTPHeaders.Access-Control-Allow-Origin";
             JToken value = JToken.Parse("['http://example.io']");
-            IpfsClient ipfs = new IpfsClient();
+            IpfsClient ipfs = TestFixture.Ipfs;
             ipfs.Config.SetAsync(key, value).Wait();
             Assert.AreEqual("http://example.io", ipfs.Config.GetAsync(key).Result[0]);
         }
diff --git a/test/Commands/DhtTest.cs b/test/Commands/DhtTest.cs
@@ -18,7 +18,7 @@ public class DhtTest
         [TestMethod]
         public async Task FindPeer()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var mars = await ipfs.Dht.FindPeerAsync(marsId);
             Assert.AreEqual(marsId, mars.Id);
 
@@ -30,7 +30,7 @@ public async Task FindPeer()
         [TestMethod]
         public async Task FindProviders()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var providers = await ipfs.Dht.FindProvidersAsync(helloWorldID);
             Assert.IsFalse(providers.Take(3).Contains(""));
         }
diff --git a/test/Commands/GenericTest.cs b/test/Commands/GenericTest.cs
@@ -13,23 +13,23 @@ public class GenericTest
         [TestMethod]
         public void Local_Node_Info()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var node = ipfs.IdAsync().Result;
             Assert.IsInstanceOfType(node, typeof(PeerNode));
         }
 
         [TestMethod]
         public void Mars_Node_Info()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var node = ipfs.IdAsync(marsId).Result;
             Assert.IsInstanceOfType(node, typeof(PeerNode));
         }
 
         [TestMethod]
         public void Version_Info()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var versions = ipfs.VersionAsync().Result;
             Assert.IsNotNull(versions);
             Assert.IsTrue(versions.ContainsKey("Version"));
diff --git a/test/Commands/ObjectTest.cs b/test/Commands/ObjectTest.cs
@@ -12,7 +12,7 @@ namespace Ipfs.Api
     [TestClass]
     public class ObjectTest
     {
-        IpfsClient ipfs = new IpfsClient();
+        IpfsClient ipfs = TestFixture.Ipfs;
 
         [TestMethod]
         public async Task New_Template_Null()
diff --git a/test/Commands/PinTest.cs b/test/Commands/PinTest.cs
@@ -15,7 +15,7 @@ public class PinTest
         [TestMethod]
         public void List()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var pins = ipfs.Pin.ListAsync().Result;
             Assert.IsNotNull(pins);
             Assert.IsTrue(pins.Length > 0);
@@ -24,7 +24,7 @@ public void List()
         [TestMethod]
         public async Task List_Filtered()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var all = await ipfs.Pin.ListAsync();
             var some = await ipfs.Pin.ListAsync(PinMode.Direct);
             Assert.AreNotEqual(all.Length, some.Length);
@@ -33,7 +33,7 @@ public async Task List_Filtered()
         [TestMethod]
         public async Task Add_Remove()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var result = await ipfs.AddTextAsync("I am pinned");
             var id = result.Hash;
 
diff --git a/test/Commands/SwarmTest.cs b/test/Commands/SwarmTest.cs
@@ -15,7 +15,7 @@ public class SwarmTest
         [TestMethod]
         public async Task Addresses()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var swarm = await ipfs.Swarm.AddressesAsync();
             foreach (var peer in swarm)
             {
@@ -28,7 +28,7 @@ public async Task Addresses()
         [TestMethod]
         public async Task Peers()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var peers = await ipfs.Swarm.PeersAsync();
             Assert.AreNotEqual(0, peers.Count());
             foreach (var peer in peers)
@@ -42,7 +42,7 @@ public async Task Peers()
         [TestMethod]
         public async Task Peers_Info()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var peers = await ipfs.Swarm.PeersAsync();
             await Task.WhenAll(peers
                 .Take(10)
@@ -56,7 +56,7 @@ await Task.WhenAll(peers
         [TestMethod]
         public async Task Connection()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var peers = await ipfs.Swarm.PeersAsync();
 
             // Sometimes we cannot connect to a specific peer.  This
diff --git a/test/IpfsApiTests.csproj b/test/IpfsApiTests.csproj
@@ -97,6 +97,7 @@
     <Compile Include="ExceptionAssert.cs" />
     <Compile Include="PinnedObjectsTest.cs" />
     <Compile Include="PinnedObjectTest.cs" />
+    <Compile Include="TestFixture.cs" />
     <Compile Include="TrustedPeersTest.cs" />
     <Compile Include="IpfsClientTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/test/IpfsClientTest.cs b/test/IpfsClientTest.cs
@@ -5,39 +5,27 @@
 namespace Ipfs.Api
 {
     
-    
     /// <summary>
     ///This is a test class for IpfsClientTest and is intended
     ///to contain all IpfsClientTest Unit Tests
     ///</summary>
     [TestClass]
     public partial class IpfsClientTest
     {
-        /// <summary>
-        ///   Fiddler cannot see localhost traffic because .Net bypasses the network stack for localhost/127.0.0.1. 
-        ///   By using "127.0.0.1." (note trailing dot) fiddler will receive the traffic and if its not running
-        ///   the localhost will get it!
-        /// </summary>
-        [AssemblyInitialize]
-        public static void AssemblyInit(TestContext context)
-        {
-            //IpfsClient.DefaultApiUri = new Uri("http://127.0.0.1.:5001");
-        }
-
         /// <summary>
         ///   A test for IpfsClient Constructor
         ///</summary>
         [TestMethod]
         public void Can_Create()
         {
-            IpfsClient target = new IpfsClient();
+            IpfsClient target = TestFixture.Ipfs;
             Assert.IsNotNull(target);
         }
 
         [TestMethod]
         public void Do_Command_Throws_Exception_On_Invalid_Command()
         {
-            IpfsClient target = new IpfsClient();
+            IpfsClient target = TestFixture.Ipfs;
             object unknown;
             ExceptionAssert.Throws<Exception>(() => unknown = target.DoCommandAsync("foobar").Result, "Invalid IPFS command");
         }
diff --git a/test/PinnedObjectsTest.cs b/test/PinnedObjectsTest.cs
@@ -12,15 +12,15 @@ public partial class IpfsClientTest
         [TestMethod]
         public void Pin_List()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             Assert.IsNotNull(ipfs.PinnedObjects);
             Assert.IsTrue(ipfs.PinnedObjects.Count > 0);
         }
 
         [TestMethod]
         public void Pin_Add_Remove()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var result = ipfs.AddTextAsync("I am pinned").Result;
             var id = result.Hash;
 
diff --git a/test/TestFixture.cs b/test/TestFixture.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ipfs.Api
+{
+    public static class TestFixture
+    {
+        /// <summary>
+        ///   Fiddler cannot see localhost traffic because .Net bypasses the network stack for localhost/127.0.0.1. 
+        ///   By using "127.0.0.1." (note trailing dot) fiddler will receive the traffic and if its not running
+        ///   the localhost will get it!
+        /// </summary>
+        //IpfsClient.DefaultApiUri = new Uri("http://127.0.0.1.:5001");
+
+        public static IpfsClient Ipfs = new IpfsClient();
+    }
+}
diff --git a/test/TrustedPeersTest.cs b/test/TrustedPeersTest.cs
@@ -13,15 +13,15 @@ public partial class IpfsClientTest
         [TestMethod]
         public void Trusted_Peers_List()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             Assert.IsNotNull(ipfs.TrustedPeers);
             Assert.IsTrue(ipfs.TrustedPeers.Count > 0);
         }
 
         [TestMethod]
         public void Trusted_Peers_Add_Remove()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             Assert.IsFalse(ipfs.TrustedPeers.Contains(newTrustedPeer));
 
             ipfs.TrustedPeers.Add(newTrustedPeer);
@@ -35,14 +35,14 @@ public void Trusted_Peers_Add_Remove()
         public void Trusted_Peers_Add_Missing_Peer_ID()
         {
             var missingPeerId = new MultiAddress("/ip4/25.196.147.100/tcp/4001");
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             ExceptionAssert.Throws<Exception>(() => ipfs.TrustedPeers.Add(missingPeerId), "invalid ipfs address");
         }
 
         [TestMethod]
         public void Trusted_Peers_Clear()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var original = ipfs.TrustedPeers.ToArray();
 
             ipfs.TrustedPeers.Clear();
@@ -55,7 +55,7 @@ public void Trusted_Peers_Clear()
         [TestMethod]
         public void Trusted_Peers_Add_Default_Nodes()
         {
-            var ipfs = new IpfsClient();
+            var ipfs = TestFixture.Ipfs;
             var original = ipfs.TrustedPeers.ToArray();
 
             ipfs.TrustedPeers.Clear();

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public partial class IpfsClientTest`
`14`	`14`	`[TestMethod]`
`15`	`15`	`public void AddText()`
`16`	`16`	`{`
`17`		`- var ipfs = new IpfsClient();`
	`17`	`+ var ipfs = TestFixture.Ipfs;`
`18`	`18`	`var result = ipfs.AddTextAsync("hello world").Result;`
`19`	`19`	`Assert.AreEqual("Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD", result.Hash);`
`20`	`20`	`}`
`@@ -26,7 +26,7 @@ public void AddFile()`
`26`	`26`	`File.WriteAllText(path, "hello world");`
`27`	`27`	`try`
`28`	`28`	`{`
`29`		`- var ipfs = new IpfsClient();`
	`29`	`+ var ipfs = TestFixture.Ipfs;`
`30`	`30`	`var result = ipfs.AddFileAsync(path).Result;`
`31`	`31`	`Assert.AreEqual("Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD", result.Hash);`
`32`	`32`	`Assert.AreEqual(0, result.Links.Count());`
`@@ -40,7 +40,7 @@ public void AddFile()`
`40`	`40`	`[TestMethod]`
`41`	`41`	`public void AddDirectory()`
`42`	`42`	`{`
`43`		`- var ipfs = new IpfsClient();`
	`43`	`+ var ipfs = TestFixture.Ipfs;`
`44`	`44`	`var temp = MakeTemp();`
`45`	`45`	`try`
`46`	`46`	`{`
`@@ -69,7 +69,7 @@ public void AddDirectory()`
`69`	`69`	`[TestMethod]`
`70`	`70`	`public void AddDirectoryRecursive()`
`71`	`71`	`{`
`72`		`- var ipfs = new IpfsClient();`
	`72`	`+ var ipfs = TestFixture.Ipfs;`
`73`	`73`	`var temp = MakeTemp();`
`74`	`74`	`try`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Ipfs.Api`
`9`	`9`	`[TestClass]`
`10`	`10`	`public class BlockTest`
`11`	`11`	`{`
`12`		`- IpfsClient ipfs = new IpfsClient();`
	`12`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`13`	`13`	`string hash = "QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ";`
`14`	`14`	`byte[] blob = Encoding.UTF8.GetBytes("blorb");`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -16,23 +16,23 @@ public class ConfigTest`
`16`	`16`	`[TestMethod]`
`17`	`17`	`public void Get_Entire_Config()`
`18`	`18`	`{`
`19`		`- IpfsClient ipfs = new IpfsClient();`
	`19`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`20`	`20`	`var config = ipfs.Config.GetAsync().Result;`
`21`	`21`	`Assert.AreEqual(apiAddress, config["Addresses"]["API"]);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[TestMethod]`
`25`	`25`	`public void Get_Scalar_Key_Value()`
`26`	`26`	`{`
`27`		`- IpfsClient ipfs = new IpfsClient();`
	`27`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`28`	`28`	`var api = ipfs.Config.GetAsync("Addresses.API").Result;`
`29`	`29`	`Assert.AreEqual(apiAddress, api);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[TestMethod]`
`33`	`33`	`public void Get_Object_Key_Value()`
`34`	`34`	`{`
`35`		`- IpfsClient ipfs = new IpfsClient();`
	`35`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`36`	`36`	`var addresses = ipfs.Config.GetAsync("Addresses").Result;`
`37`	`37`	`Assert.AreEqual(apiAddress, addresses["API"]);`
`38`	`38`	`Assert.AreEqual(gatewayAddress, addresses["Gateway"]);`
`@@ -41,7 +41,7 @@ public void Get_Object_Key_Value()`
`41`	`41`	`[TestMethod]`
`42`	`42`	`public void Keys_are_Case_Sensitive()`
`43`	`43`	`{`
`44`		`- IpfsClient ipfs = new IpfsClient();`
	`44`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`45`	`45`	`var api = ipfs.Config.GetAsync("Addresses.API").Result;`
`46`	`46`	`Assert.AreEqual(apiAddress, api);`
`47`	`47`
`@@ -53,7 +53,7 @@ public void Set_String_Value()`
`53`	`53`	`{`
`54`	`54`	`const string key = "foo";`
`55`	`55`	`const string value = "foobar";`
`56`		`- IpfsClient ipfs = new IpfsClient();`
	`56`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`57`	`57`	`ipfs.Config.SetAsync(key, value).Wait();`
`58`	`58`	`Assert.AreEqual(value, ipfs.Config.GetAsync(key).Result);`
`59`	`59`	`}`
`@@ -63,7 +63,7 @@ public void Set_JSON_Value()`
`63`	`63`	`{`
`64`	`64`	`const string key = "API.HTTPHeaders.Access-Control-Allow-Origin";`
`65`	`65`	`JToken value = JToken.Parse("['http://example.io']");`
`66`		`- IpfsClient ipfs = new IpfsClient();`
	`66`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`67`	`67`	`ipfs.Config.SetAsync(key, value).Wait();`
`68`	`68`	`Assert.AreEqual("http://example.io", ipfs.Config.GetAsync(key).Result[0]);`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class DhtTest`
`18`	`18`	`[TestMethod]`
`19`	`19`	`public async Task FindPeer()`
`20`	`20`	`{`
`21`		`- var ipfs = new IpfsClient();`
	`21`	`+ var ipfs = TestFixture.Ipfs;`
`22`	`22`	`var mars = await ipfs.Dht.FindPeerAsync(marsId);`
`23`	`23`	`Assert.AreEqual(marsId, mars.Id);`
`24`	`24`
`@@ -30,7 +30,7 @@ public async Task FindPeer()`
`30`	`30`	`[TestMethod]`
`31`	`31`	`public async Task FindProviders()`
`32`	`32`	`{`
`33`		`- var ipfs = new IpfsClient();`
	`33`	`+ var ipfs = TestFixture.Ipfs;`
`34`	`34`	`var providers = await ipfs.Dht.FindProvidersAsync(helloWorldID);`
`35`	`35`	`Assert.IsFalse(providers.Take(3).Contains(""));`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,23 +13,23 @@ public class GenericTest`
`13`	`13`	`[TestMethod]`
`14`	`14`	`public void Local_Node_Info()`
`15`	`15`	`{`
`16`		`- var ipfs = new IpfsClient();`
	`16`	`+ var ipfs = TestFixture.Ipfs;`
`17`	`17`	`var node = ipfs.IdAsync().Result;`
`18`	`18`	`Assert.IsInstanceOfType(node, typeof(PeerNode));`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`[TestMethod]`
`22`	`22`	`public void Mars_Node_Info()`
`23`	`23`	`{`
`24`		`- var ipfs = new IpfsClient();`
	`24`	`+ var ipfs = TestFixture.Ipfs;`
`25`	`25`	`var node = ipfs.IdAsync(marsId).Result;`
`26`	`26`	`Assert.IsInstanceOfType(node, typeof(PeerNode));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`[TestMethod]`
`30`	`30`	`public void Version_Info()`
`31`	`31`	`{`
`32`		`- var ipfs = new IpfsClient();`
	`32`	`+ var ipfs = TestFixture.Ipfs;`
`33`	`33`	`var versions = ipfs.VersionAsync().Result;`
`34`	`34`	`Assert.IsNotNull(versions);`
`35`	`35`	`Assert.IsTrue(versions.ContainsKey("Version"));`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Ipfs.Api`
`12`	`12`	`[TestClass]`
`13`	`13`	`public class ObjectTest`
`14`	`14`	`{`
`15`		`- IpfsClient ipfs = new IpfsClient();`
	`15`	`+ IpfsClient ipfs = TestFixture.Ipfs;`
`16`	`16`
`17`	`17`	`[TestMethod]`
`18`	`18`	`public async Task New_Template_Null()`