IServiceOriented.ServiceBus.UnitTests/Create.cs IServiceOriented.ServiceBus.UnitTests/TestMessageFilters.cs IServiceOriented.ServiceBus.UnitTests/TestMsmqMessageDeliveryQueue.cs IServiceOriented.ServiceBus.UnitTests/TestRequestResponse.cs IServiceOriented.ServiceBus.UnitTests/TestServiceBusManagement.cs IServiceOriented.ServiceBus.UnitTests/TestServiceBusRuntime.cs IServiceOriented.ServiceBus.UnitTests/TestSqlSubscriptionDb.cs IServiceOriented.ServiceBus.UnitTests/TestWcfDispatcher.cs License.txt Readme.txt @@ -46,7 +46,7 @@ namespace IServiceOriented.ServiceBus.Samples.Chat } [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConfigurationName = "ChatServerOut")] - [AutoSubscribe("Autosubscribed", "ChatClientOut", typeof(IChatService))] + [AutoSubscribe("Autosubscribed", "ChatClientOut", typeof(IChatService), DispatcherType=typeof(WcfDispatcherWithUsernameCredentials))] public class IncomingHandler : IChatService { #region IChatService Members IServiceOriented.ServiceBus.Samples.Chat/ChatClient.cs @@ -2,7 +2,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{B1B626F7-8C3E-4274-9A46-F4950BC6688A}</ProjectGuid> <OutputType>Library</OutputType> @@ -51,15 +51,21 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> + <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\..\..\Code\Microsoft\CommonServiceLocator\1.0\lib\Microsoft.Practices.ServiceLocation.dll</HintPath> + </Reference> <Reference Include="Microsoft.Scripting, Version=1.0.0.4000, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\..\..\..\Code\IronPython\2.0B4\Microsoft.Scripting.dll</HintPath> + <Private>True</Private> </Reference> <Reference Include="Microsoft.Scripting.Core, Version=1.0.0.4000, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\..\..\..\Code\IronPython\2.0B4\Microsoft.Scripting.Core.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> + <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> @@ -85,6 +91,9 @@ <Name>IServiceOriented.ServiceBus</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. IServiceOriented.ServiceBus.Scripting.UnitTests/IServiceOriented.ServiceBus.Scripting.UnitTests.csproj @@ -1,65 +1,16 @@ using System; using System.Text; using System.Collections.Generic; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using NUnit.Framework; +using Microsoft.Scripting.Hosting; namespace IServiceOriented.ServiceBus.Scripting.UnitTests { - /// <summary> - /// Summary description for UnitTest1 - /// </summary> - [TestClass] + [TestFixture] public class ScriptMessageFilterTest - { - public ScriptMessageFilterTest() - { - // - // TODO: Add constructor logic here - // - } - - private TestContext testContextInstance; - - /// <summary> - ///Gets or sets the test context which provides - ///information about and functionality for the current test run. - ///</summary> - public TestContext TestContext - { - get - { - return testContextInstance; - } - set - { - testContextInstance = value; - } - } - - #region Additional test attributes - // - // You can use the following additional attributes as you write your tests: - // - // Use ClassInitialize to run code before running the first test in the class - // [ClassInitialize()] - // public static void MyClassInitialize(TestContext testContext) { } - // - // Use ClassCleanup to run code after all tests in a class have run - // [ClassCleanup()] - // public static void MyClassCleanup() { } - // - // Use TestInitialize to run code before running each test - // [TestInitialize()] - // public void MyTestInitialize() { } - // - // Use TestCleanup to run code after each test has run - // [TestCleanup()] - // public void MyTestCleanup() { } - // - #endregion + { - [TestMethod] + [Test] public void TestPython() { ScriptMessageFilter filterTrue = new ScriptMessageFilter("py", IServiceOriented.ServiceBus.Scripting.UnitTests/ScriptMessageFilterTest.cs @@ -2,72 +2,21 @@ using System.Threading; using System.Text; using System.Collections.Generic; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; + +using NUnit.Framework; using IServiceOriented.ServiceBus.UnitTests; namespace IServiceOriented.ServiceBus.Scripting.UnitTests { - /// <summary> - /// Summary description for ScriptTransformationDispatcherTest - /// </summary> - [TestClass] + [TestFixture] public class ScriptTransformationDispatcherTest - { - public ScriptTransformationDispatcherTest() - { - // - // TODO: Add constructor logic here - // - } - - private TestContext testContextInstance; - - /// <summary> - ///Gets or sets the test context which provides - ///information about and functionality for the current test run. - ///</summary> - public TestContext TestContext - { - get - { - return testContextInstance; - } - set - { - testContextInstance = value; - } - } - - #region Additional test attributes - // - // You can use the following additional attributes as you write your tests: - // - // Use ClassInitialize to run code before running the first test in the class - // [ClassInitialize()] - // public static void MyClassInitialize(TestContext testContext) { } - // - // Use ClassCleanup to run code after all tests in a class have run - // [ClassCleanup()] - // public static void MyClassCleanup() { } - // - // Use TestInitialize to run code before running each test - // [TestInitialize()] - // public void MyTestInitialize() { } - // - // Use TestCleanup to run code after each test has run - // [TestCleanup()] - // public void MyTestCleanup() { } - // - #endregion - - [TestMethod] + { + [Test] public void TestPythonTransformation() { ScriptTransformationDispatcher dispatcher = new ScriptTransformationDispatcher("py", - -@"import clr + @"import clr clr.AddReference(""IServiceOriented.ServiceBus"") clr.AddReference(""IServiceOriented.ServiceBus.Scripting.UnitTests"") @@ -79,9 +28,7 @@ def Execute(): outgoing = AfterTransformation(int(request.Message.Value)); return PublishRequest(request.ContractType, request.Action, outgoing) " - - -, System.Scripting.SourceCodeKind.Statements); + , Microsoft.Scripting.SourceCodeKind.Statements); dispatcher.Script.Check(); @@ -91,7 +38,7 @@ def Execute(): bool success = false; - ServiceBusRuntime runtime = new ServiceBusRuntime(new NonTransactionalMemoryQueue(), new NonTransactionalMemoryQueue(), new NonTransactionalMemoryQueue()); + ServiceBusRuntime runtime = new ServiceBusRuntime(SimpleServiceLocator.With(new QueuedDeliveryCore( new NonTransactionalMemoryQueue(), new NonTransactionalMemoryQueue(), new NonTransactionalMemoryQueue() ))); runtime.Subscribe(new SubscriptionEndpoint(Guid.NewGuid(), "Tranformation", null, null, typeof(void), dispatcher, new TypedMessageFilter(typeof(BeforeTransformation)))); runtime.Subscribe(new SubscriptionEndpoint(Guid.NewGuid(), "AfterTransformation", null, null, typeof(void), new ActionDispatcher( (subscription, md) => { IServiceOriented.ServiceBus.Scripting.UnitTests/ScriptTransformationDispatcherTest.cs @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{D57132AD-3E5C-4504-B7C5-3AD9D30FCA3C}</ProjectGuid> <OutputType>Library</OutputType> @@ -51,13 +51,13 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Scripting, Version=1.0.0.4000, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <Reference Include="Microsoft.Scripting, Version=1.0.0.5000, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\Code\IronPython\2.0B4\Microsoft.Scripting.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\Program Files (x86)\IronPython 2.0 Beta 5\Microsoft.Scripting.dll</HintPath> </Reference> - <Reference Include="Microsoft.Scripting.Core, Version=1.0.0.4000, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <Reference Include="Microsoft.Scripting.Core, Version=1.0.0.5000, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\Code\IronPython\2.0B4\Microsoft.Scripting.Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\Program Files (x86)\IronPython 2.0 Beta 5\Microsoft.Scripting.Core.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Runtime.Serialization"> IServiceOriented.ServiceBus.Scripting/IServiceOriented.ServiceBus.Scripting.csproj @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Scripting; using System.Runtime.Serialization; +using Microsoft.Scripting; using Microsoft.Scripting.Hosting; +using Microsoft; namespace IServiceOriented.ServiceBus.Scripting { @@ -103,6 +103,8 @@ namespace IServiceOriented.ServiceBus.Scripting public object ExecuteWithVariables(IDictionary<string, object> variables) { ScriptScope scope = ScriptContext.Current.ScriptRuntime.CreateScope(); + ScriptEngine engine = ScriptContext.Current.ScriptRuntime.GetEngine(LanguageId); + foreach (string key in variables.Keys) { scope.SetVariable(key, variables[key]); @@ -114,7 +116,10 @@ namespace IServiceOriented.ServiceBus.Scripting else { ScriptSource.Execute(scope); - return (scope.GetVariable <Func<object>>("Execute")).Invoke(); + var handle = scope.GetVariableHandle("Execute"); + if (handle == null) throw new InvalidOperationException("Script does not define an Execute method"); + Func<Object> func = engine.Operations.Unwrap<Microsoft.Func<object>>(handle); + return func.Invoke(); } } } IServiceOriented.ServiceBus.Scripting/Script.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using Microsoft.Scripting.Hosting; @@ -11,7 +10,7 @@ namespace IServiceOriented.ServiceBus.Scripting { public ScriptContext() { - ScriptRuntime = ScriptRuntime.Create(); + ScriptRuntime = ScriptRuntime.CreateFromConfiguration(); } static ScriptContext() IServiceOriented.ServiceBus.Scripting/ScriptContext.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Scripting; - using System.Runtime.Serialization; +using Microsoft.Scripting; namespace IServiceOriented.ServiceBus.Scripting { @@ -31,7 +29,7 @@ namespace IServiceOriented.ServiceBus.Scripting } public override bool Include(PublishRequest request) - { + { return (bool)Script.ExecuteWithVariables(new Dictionary<string, object>() { { "request", request } }); } } IServiceOriented.ServiceBus.Scripting/ScriptMessageFilter.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Scripting; - using System.Runtime.Serialization; +using Microsoft.Scripting; namespace IServiceOriented.ServiceBus.Scripting { IServiceOriented.ServiceBus.Scripting/ScriptTransformationDispatcher.cs @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="utf-8" ?> <configuration> + <configSections> + <sectionGroup name="NUnit"> + <section name="TestCaseBuilder" + type="System.Configuration.NameValueSectionHandler"/> + <section name="TestRunner" + type="System.Configuration.NameValueSectionHandler"/> + </sectionGroup> + </configSections> + + <NUnit> + <TestCaseBuilder> + <add key="OldStyleTestCases" value="false" /> + </TestCaseBuilder> + <TestRunner> + <add key="ApartmentState" value="MTA" /> + <add key="ThreadPriority" value="Normal" /> + <add key="DefaultLogThreshold" value="Error" /> + </TestRunner> + </NUnit> + <system.serviceModel> <bindings> <netNamedPipeBinding> IServiceOriented.ServiceBus.UnitTests/App.config @@ -55,7 +55,7 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\..\..\..\..\Code\Microsoft\CommonServiceLocator\1.0\lib\Microsoft.Practices.ServiceLocation.dll</HintPath> </Reference> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> + <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> @@ -74,17 +74,18 @@ <ItemGroup> <Compile Include="BooleanMessageFilter.cs" /> <Compile Include="IContract.cs" /> - <Compile Include="MessageFiltersTest.cs" /> - <Compile Include="MsmqMessageDeliveryQueueTest.cs" /> + <Compile Include="TestMessageFilters.cs" /> + <Compile Include="TestMsmqMessageDeliveryQueue.cs" /> <Compile Include="NonTransactionalMemoryQueue.cs" /> <Compile Include="NullMessageDeliveryQueue.cs" /> <Compile Include="PassThroughMessageFilter.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="RequestResponseTest.cs" /> - <Compile Include="ServiceBusManagementTest.cs" /> - <Compile Include="ServiceBusRuntimeTest.cs" /> - <Compile Include="SqlSubscriptionDbUnitTest.cs" /> - <Compile Include="WcfDispatcher.cs" /> + <Compile Include="TestRequestResponse.cs" /> + <Compile Include="TestServiceBusManagement.cs" /> + <Compile Include="TestServiceBusRuntime.cs" /> + <Compile Include="TestSqlSubscriptionDb.cs" /> + <Compile Include="Create.cs" /> + <Compile Include="TestWcfDispatcher.cs" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\IServiceOriented.ServiceBus\IServiceOriented.ServiceBus.csproj"> IServiceOriented.ServiceBus.UnitTests/IServiceOriented.ServiceBus.UnitTests.csproj @@ -13,7 +13,7 @@ namespace IServiceOriented.ServiceBus { public SubscriptionExtension(SubscriptionEndpoint subscription) { - Subscription = subscription; + Subscription = subscription; } #region IExtension<ServiceHostBase> Members @@ -28,7 +28,7 @@ namespace IServiceOriented.ServiceBus public void Detach(ServiceHostBase owner) { owner.Opened -= owner_Opened; - owner.Closing += owner_Closed; + owner.Closing -= owner_Closed; ServiceHost = null; } @@ -118,7 +118,7 @@ namespace IServiceOriented.ServiceBus dispatcher = new WcfDispatcher(); } - SubscriptionEndpoint subscription = new SubscriptionEndpoint(SubscriptionId ?? Guid.NewGuid(), Name, ConfigurationName, Address ?? serviceDescription.Endpoints[0].Address.Uri.ToString(), ContractType, dispatcher, WcfDispatcher.CreateMessageFilter(ContractType)); + SubscriptionEndpoint subscription = new SubscriptionEndpoint(SubscriptionId ?? Guid.NewGuid(), Name, ConfigurationName, Address ?? serviceDescription.Endpoints[0].Address.Uri.ToString(), ContractType, dispatcher, WcfDispatcher.CreateMessageFilter(ContractType), Transient); SubscriptionExtension extension = new SubscriptionExtension(subscription); extension.UnsubscribeOnClosing = UnsubscribeOnClosing; serviceHostBase.Extensions.Add(extension); @@ -183,9 +183,9 @@ namespace IServiceOriented.ServiceBus } /// <summary> - /// Gets or sets whether the subscription should be persisted + /// Gets or sets whether the subscription should be transient /// </summary> - public bool Persistent + public bool Transient { get; set; IServiceOriented.ServiceBus/AutoSubscribeBehavior.cs @@ -70,6 +70,16 @@ namespace IServiceOriented.ServiceBus MessageQueue.Delete(path); } + /// <summary> + /// Determines if a message queue with the specified path exists + /// </summary> + /// <param name="path"></param> + /// <returns></returns> + public static bool Exists(string path) + { + return MessageQueue.Exists(path); + } + MessageQueueTransactionType _transactionType = MessageQueueTransactionType.Automatic; /// <summary> /// Gets or sets the TransactionType that will be used when communicating with the message queue IServiceOriented.ServiceBus/MsmqMessageDeliveryQueue.cs @@ -7,8 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IServiceOriented.ServiceBus EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E4D3918D-955D-4AB0-9764-A9B001521895}" ProjectSection(SolutionItems) = preProject - IServiceOriented.vsmdi = IServiceOriented.vsmdi - LocalTestRun.testrunconfig = LocalTestRun.testrunconfig + License.txt = License.txt + Readme.txt = Readme.txt EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IServiceOriented.ServiceBus.ConsoleUtility", "IServiceOriented.ServiceBus.ConsoleUtility\IServiceOriented.ServiceBus.ConsoleUtility.csproj", "{31896FE3-1DDA-4B36-951C-1079DCAAFB51}" @@ -20,9 +20,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IServiceOriented.ServiceBus.Scripting.UnitTests", "IServiceOriented.ServiceBus.Scripting.UnitTests\IServiceOriented.ServiceBus.Scripting.UnitTests.csproj", "{B1B626F7-8C3E-4274-9A46-F4950BC6688A}" EndProject Global - GlobalSection(TestCaseManagementSettings) = postSolution - CategoryFile = IServiceOriented.vsmdi - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug with Scripting|Any CPU = Debug with Scripting|Any CPU Debug|Any CPU = Debug|Any CPU IServiceOriented.sln IServiceOriented.ServiceBus.UnitTests/MessageFiltersTest.cs IServiceOriented.ServiceBus.UnitTests/MsmqMessageDeliveryQueueTest.cs IServiceOriented.ServiceBus.UnitTests/RequestResponseTest.cs IServiceOriented.ServiceBus.UnitTests/ServiceBusManagementTest.cs IServiceOriented.ServiceBus.UnitTests/ServiceBusRuntimeTest.cs IServiceOriented.ServiceBus.UnitTests/SqlSubscriptionDbUnitTest.cs IServiceOriented.ServiceBus.UnitTests/WcfDispatcher.cs 89f762502c8204338646bea2045116ffc2e76ae2 jezell jezell@gmail.com http://github.com/jezell/iserviceoriented/commit/124bb40e58aebae6c69664508a6264af4491b8d4 124bb40e58aebae6c69664508a6264af4491b8d4 2008-10-09T06:28:25-07:00 2008-10-09T06:28:25-07:00 Move tests to NUnit, refactor tests, upgrade DLR support to latest DLR beta 38fec74326ef0b51bf0a08dea011685d132de021 jezell jezell@gmail.com