Merge pull request #114 from SyndARn/TestingSimpleActor

Add test
SyndARn · Apr 27, 2020 · 1e97aa0 · 1e97aa0
2 parents 8511e72 + 897de62
commit 1e97aa0
Show file tree

Hide file tree

Showing 29 changed files with 16,674 additions and 16,502 deletions.
diff --git a/ARnActorSolution/Application/Actor.TestApplication/DynamicActor.cs b/ARnActorSolution/Application/Actor.TestApplication/DynamicActor.cs
@@ -14,7 +14,7 @@ public class DynamicActor : DynamicObject, IActor
     {
         private class InternalDynamicActor : BaseActor
         {
-            private dynamic fDynamic;
+            private readonly dynamic fDynamic;
 
             public InternalDynamicActor(dynamic dyn) : base()
             {
@@ -31,7 +31,7 @@ public void DoDynamic(Tuple<InvokeMemberBinder, object[]> msg)
             }
         }
 
-        private IActor fActor;
+        private readonly IActor fActor;
         private readonly dynamic fDynamic;
 
         public DynamicActor(dynamic dynamic)

diff --git a/ARnActorSolution/Application/Actor.TestApplication/TestLauncherActor.cs b/ARnActorSolution/Application/Actor.TestApplication/TestLauncherActor.cs
@@ -1,15 +1,10 @@
 using Actor.Base;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Actor.TestApplication
 {
     public class TestLauncherActor : ActionActor
     {
-        private Future<bool> future = new Future<bool>();
+        private readonly Future<bool> future = new Future<bool>();
         public TestLauncherActor()
             : base()
         {

diff --git a/ARnActorSolution/Application/ActorWeather/MainWindow.xaml.cs b/ARnActorSolution/Application/ActorWeather/MainWindow.xaml.cs
@@ -1,20 +1,6 @@
-using Actor.Base;
-using Actor.Server;
-using Actor.Util;
+using Actor.Server;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace ActorWeather
 {

diff --git a/ARnActorSolution/Application/Amoeba/Amoeba.cs b/ARnActorSolution/Application/Amoeba/Amoeba.cs
@@ -1,17 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Actor.MonteCarlo;
 using Actor.Base;
-using System.Windows.Forms;
 
 namespace Amoeba
 {
     public class ResultActor : BaseActor
     {
-        private List<long> results = new List<long>();
+        private readonly List<long> _results = new List<long>();
         public ResultActor()
         {
             Become(new Behavior<long>(ResultMessage));
@@ -20,13 +17,13 @@ public ResultActor()
 
         private void ResultMessage(long s)
         {
-            results.Add(s);
+            _results.Add(s);
         }
 
         private void FutureMessage(IActor aFuture)
         {
-            long total = results.Count(r => r <= 0);
-            long qtt = results.Count();
+            long total = _results.Count(r => r <= 0);
+            long qtt = _results.Count();
             aFuture.SendMessage(total, qtt);
         }
 

diff --git a/ARnActorSolution/Application/BrokerDemoApplication/DemoWorker.cs b/ARnActorSolution/Application/BrokerDemoApplication/DemoWorker.cs
@@ -13,7 +13,7 @@ namespace BrokerDemoApplication
 {
     public class DemoWorker : WorkerActor<string>
     {
-        CollectionActor<string> fMemLogger;
+        readonly CollectionActor<string> fMemLogger;
         public DemoWorker(CollectionActor<string> memLogger) : base()
         {
             fMemLogger = memLogger;

diff --git a/ARnActorSolution/TestActor/ActorBase/FutureTest.cs b/ARnActorSolution/TestActor/ActorBase/FutureTest.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Text;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Actor.Base;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TestActor;
 using System.Threading.Tasks;
 
-namespace TestActor
+namespace Actor.Base.Test
 {
     internal class FutureAsyncActorTest : BaseActor
     {

diff --git a/ARnActorSolution/TestActor/ActorBase/IActorExtensionTest.cs b/ARnActorSolution/TestActor/ActorBase/IActorExtensionTest.cs
@@ -1,23 +1,21 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Actor.Util;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Actor.Base;
 using System.Collections.Generic;
 using System.Linq;
+using TestActor;
 
-namespace TestActor
+namespace Actor.Util.Test
 {
-
-    class ExtensionTestActor : BaseActor
+        internal class ExtensionTestActor : BaseActor
     {
-        private List<string> fList = new List<string>();
+        private readonly List<string> _list = new List<string>();
         public ExtensionTestActor() : base()
         {
-            Become(new Behavior<string>(s => fList.Add(s)));
-            AddBehavior(new Behavior<string,string>((s1,s2) => fList.Add(s2)));
-            AddBehavior(new Behavior<string, string,string>((s1, s2, s3) => fList.Add(s3)));
-            AddBehavior(new Behavior<string, string, string, string>((s1, s2, s3, s4) => fList.Add(s4)));
-            AddBehavior(new Behavior<IActor>(a => a.SendMessage(fList.AsEnumerable())));
+            Become(new Behavior<string>(s => _list.Add(s)));
+            AddBehavior(new Behavior<string,string>((s1,s2) => _list.Add(s2)));
+            AddBehavior(new Behavior<string, string,string>((s1, s2, s3) => _list.Add(s3)));
+            AddBehavior(new Behavior<string, string, string, string>((s1, s2, s3, s4) => _list.Add(s4)));
+            AddBehavior(new Behavior<IActor>(a => a.SendMessage(_list.AsEnumerable())));
         }
     }
 

diff --git a/ARnActorSolution/TestActor/ActorServer/ShardDirectoryTest.cs b/ARnActorSolution/TestActor/ActorServer/ShardDirectoryTest.cs
@@ -1,11 +1,9 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Actor.Base;
 using System.Linq;
-using Actor.Util;
-using Actor.Server;
+using TestActor;
 
-namespace TestActor
+namespace Actor.Server.Tests
 {
     [TestClass]
     public class ShardDirectoryTest

diff --git a/ARnActorSolution/TestActor/Behavior/BasicBehaviorsTest.cs b/ARnActorSolution/TestActor/Behavior/BasicBehaviorsTest.cs
@@ -1,10 +1,8 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Actor.Base;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Linq;
 using System.Collections.Generic;
 
-namespace TestActor
+namespace Actor.Base.Test
 {
     [TestClass]
     public class BasicBehaviorsTest

diff --git a/ARnActorSolution/TestActor/Broker/WorkerActorTestString.cs b/ARnActorSolution/TestActor/Broker/WorkerActorTestString.cs
@@ -10,7 +10,7 @@ namespace Actor.Server.Tests
 {
     class WorkerActorTestString : WorkerActor<string>
     {
-        EnumerableActor<string> fActorReport;
+        readonly EnumerableActor<string> fActorReport;
         public WorkerActorTestString(EnumerableActor<string> actor)
         {
             fActorReport = actor;

diff --git a/ARnActorSolution/TestActor/ClientServer/EchoServerActorTest.cs b/ARnActorSolution/TestActor/ClientServer/EchoServerActorTest.cs
@@ -27,12 +27,14 @@ public void EchoClient100Test()
                 {
                     EchoClientActor aClient = new EchoClientActor();
                     aClient.Connect("EchoServer");
-                    aClient.SendMessage("client-" + i.ToString());
+                    aClient.SendMessage($"client-{i}");
                 }
                 Task.Delay(10000).Wait();
             },15000);
             var mess = GlobalContext.MessageTracerService.CopyAllMessages();
-            Assert.IsTrue(mess.Count(t => t.StartsWith("client receive")) >= 1);
+#pragma warning disable CA1827 // Do not use Count() or LongCount() when Any() can be used
+            Assert.IsTrue(mess.Count(t => t.StartsWith("client receive", StringComparison.InvariantCulture)) >= 1);
+#pragma warning restore CA1827 // Do not use Count() or LongCount() when Any() can be used
         }
     }
 }
diff --git a/ARnActorSolution/TestActor/Collection/ActorQueueTest.cs b/ARnActorSolution/TestActor/Collection/ActorQueueTest.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Actor.Util;
+using TestActor;
 
-namespace TestActor
+namespace Actor.Util.Test
 {
     [TestClass]
     public class ActorQueueTest

diff --git a/ARnActorSolution/TestActor/Directory/DirectoryActorTests.cs b/ARnActorSolution/TestActor/Directory/DirectoryActorTests.cs
@@ -87,7 +87,7 @@ public void GetDirectoryTest()
         [TestMethod()]
         public void StatTest()
         {
-            Assert.IsTrue(DirectoryActor.GetDirectory().Stat().StartsWith("Directory entries "));
+            Assert.IsTrue(DirectoryActor.GetDirectory().Stat().StartsWith("Directory entries ",System.StringComparison.InvariantCulture));
         }
 
         [TestMethod()]

diff --git a/ARnActorSolution/TestActor/Directory/HostDirectoryActorTests.cs b/ARnActorSolution/TestActor/Directory/HostDirectoryActorTests.cs
@@ -37,7 +37,9 @@ public void RegisterUnregisterTestV2()
                 HostDirectoryActor.Unregister(actor);
                 Task.Delay(5000).Wait();
                 var stat2 = HostDirectoryActor.GetInstance().GetEntries();
-                Assert.IsTrue(stat2.Count(t => t == actor.Tag.Key())== 0);
+#pragma warning disable CA1827 // Do not use Count() or LongCount() when Any() can be used
+                Assert.IsTrue(stat2.Count(t => t == actor.Tag.Key())== 0); // don't touch
+#pragma warning restore CA1827 // Do not use Count() or LongCount() when Any() can be used
             });
         }
 

diff --git a/ARnActorSolution/TestActor/DistributedDictionary/DistributedDictionaryTest.cs b/ARnActorSolution/TestActor/DistributedDictionary/DistributedDictionaryTest.cs
@@ -18,7 +18,7 @@ public void TestDistributedDictionary()
                     var dic = new DistributedDictionaryActor<int, string>();
                     foreach(var i in Enumerable.Range(1,1000))
                     {
-                        dic.AddKeyValue(i, i.ToString() + " Test");
+                        dic.AddKeyValue(i, $"{i} Test");
                     }
                     // find key 3
                     var future = dic.GetKeyValue(3);

diff --git a/ARnActorSolution/TestActor/Exception/CheckArgTest.cs b/ARnActorSolution/TestActor/Exception/CheckArgTest.cs
@@ -1,9 +1,7 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Actor.Base;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.IO;
 
-namespace TestActor
+namespace Actor.Base.Test
 {
     [TestClass]
     public class CheckArgTest

diff --git a/ARnActorSolution/TestActor/MapReduce/MapReduceTesting.cs b/ARnActorSolution/TestActor/MapReduce/MapReduceTesting.cs
@@ -22,7 +22,7 @@ public void Go(string aFilename, IActor actor)
                 (a, d) =>
                 {
                     for (int i = 0; i < 10; i++)
-                        a.SendMessage(d,i.ToString()+" "+i.ToString());
+                        a.SendMessage(d,$"{i} {i}");
                 },
                 // map
                 (a, k, v) =>

diff --git a/ARnActorSolution/TestActor/Report/badge_branchcoverage.svg b/ARnActorSolution/TestActor/Report/badge_branchcoverage.svg
diff --git a/ARnActorSolution/TestActor/Report/badge_combined.svg b/ARnActorSolution/TestActor/Report/badge_combined.svg
diff --git a/ARnActorSolution/TestActor/Report/badge_linecoverage.svg b/ARnActorSolution/TestActor/Report/badge_linecoverage.svg
diff --git a/ARnActorSolution/TestActor/Service/StringParserActorTests.cs b/ARnActorSolution/TestActor/Service/StringParserActorTests.cs
@@ -11,16 +11,16 @@ namespace Actor.Service.Tests
 
     class TestParserActor : BaseActor
     {
-        List<string> fList = new List<string>();
+        private readonly List<string> _list = new List<string>();
         public TestParserActor()
         {
             Become(new Behavior<IActor, string>((a, s) =>
              {
-                 fList.Add(s);
+                 _list.Add(s);
              }));
             AddBehavior(new Behavior<IActor>(a =>
             {
-                IEnumerable<string> enumerable = fList.AsEnumerable();
+                IEnumerable<string> enumerable = _list.AsEnumerable();
                 a.SendMessage(enumerable);
             }
             ));

diff --git a/ARnActorSolution/TestActor/SimpleActor/SimpleActorTest.cs b/ARnActorSolution/TestActor/SimpleActor/SimpleActorTest.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TestActor;
+
+namespace Actor.Base.Test
+{
+    [TestClass()]
+    public class SimpleActorTest
+    {
+        [TestMethod()]
+        public void SimpleAndReceiveTest()
+        {
+            TestLauncherActor.Test(() =>
+            {
+                List<string> list = new List<string>();
+                var bhv = new Behavior<IActor, string>((i, s1) => i.SendMessage(i,s1));
+                var simple = new SimpleActor(bhv);
+                var bhv2 = new Behavior<IActor, string>((i, s2) => list.Add(s2));
+                var receiver = new SimpleActor(bhv2);
+                simple.SendMessage(receiver,"Simple works");
+                Task.Delay(5000).Wait();
+                var s = list.FirstOrDefault();
+                Assert.AreEqual("Simple works", s);
+            });
+        }
+    }
+}
diff --git a/ARnActorSolution/TestActor/TestActor.csproj b/ARnActorSolution/TestActor/TestActor.csproj
@@ -105,6 +105,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Data.Linq" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
@@ -172,6 +173,7 @@
     <Compile Include="Serializer\NetDataContract\NetDataContractSerializeServiceTests.cs" />
     <Compile Include="Service\RingActorTests.cs" />
     <Compile Include="Service\StringParserActorTests.cs" />
+    <Compile Include="SimpleActor\SimpleActorTest.cs" />
     <Compile Include="Trait\TraitTest.cs" />
     <Compile Include="Composition\InjectionActorTest.cs" />
     <Compile Include="Util\TextWriterActorTest.cs" />