Commit 2790cf67 authored by yangxiaodong's avatar yangxiaodong

update

parent 6bce650b
...@@ -17,7 +17,10 @@ namespace DotNetCore.CAP.SqlServer.Test ...@@ -17,7 +17,10 @@ namespace DotNetCore.CAP.SqlServer.Test
{ {
if (!_sqlObjectInstalled) if (!_sqlObjectInstalled)
{ {
InitializeDatabase(); lock (this)
{
InitializeDatabase();
}
} }
} }
} }
......
//using System; using System;
//using System.Collections.Generic; using System.Collections.Generic;
//using System.Text; using System.Text;
//using System.Threading.Tasks; using System.Threading.Tasks;
//using Dapper; using Dapper;
//using DotNetCore.CAP.Infrastructure; using DotNetCore.CAP.Infrastructure;
//using DotNetCore.CAP.Models; using DotNetCore.CAP.Models;
//using Xunit; using Xunit;
//namespace DotNetCore.CAP.SqlServer.Test namespace DotNetCore.CAP.SqlServer.Test
//{ {
// public class SqlServerStorageConnectionTest : DatabaseTestHost public class SqlServerStorageConnectionTest : DatabaseTestHost
// { {
// private SqlServerStorageConnection _storage; private SqlServerStorageConnection _storage;
public SqlServerStorageConnectionTest()
{
var options = GetService<SqlServerOptions>();
_storage = new SqlServerStorageConnection(options);
}
// public SqlServerStorageConnectionTest() [Fact]
// { public async Task GetPublishedMessageAsync_Test()
// var options = GetService<SqlServerOptions>(); {
// _storage = new SqlServerStorageConnection(options); var sql = "INSERT INTO [Cap].[Published]([Name],[Content],[Retries],[Added],[ExpiresAt],[StatusName]) OUTPUT INSERTED.Id VALUES(@Name,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
// } var publishMessage = new CapPublishedMessage
{
Name = "SqlServerStorageConnectionTest",
Content = "",
StatusName = StatusName.Scheduled
};
var insertedId = default(int);
using (var connection = ConnectionUtil.CreateConnection())
{
insertedId = connection.QueryFirst<int>(sql, publishMessage);
}
var message = await _storage.GetPublishedMessageAsync(insertedId);
Assert.NotNull(message);
Assert.Equal("SqlServerStorageConnectionTest", message.Name);
Assert.Equal(StatusName.Scheduled, message.StatusName);
}
// [Fact] [Fact]
// public async Task GetPublishedMessageAsync_Test() public async Task FetchNextMessageAsync_Test()
// { {
// var sql = "INSERT INTO [Cap].[Published]([Name],[Content],[Retries],[Added],[ExpiresAt],[StatusName]) OUTPUT INSERTED.Id VALUES(@Name,@Content,@Retries,@Added,@ExpiresAt,@StatusName);"; var sql = "INSERT INTO [Cap].[Queue]([MessageId],[MessageType]) VALUES(@MessageId,@MessageType);";
// var publishMessage = new CapPublishedMessage var queue = new CapQueue
// { {
// Name = "SqlServerStorageConnectionTest", MessageId = 3333,
// Content = "", MessageType = MessageType.Publish
// StatusName = StatusName.Scheduled };
// }; using (var connection = ConnectionUtil.CreateConnection())
// var insertedId = default(int); {
// using (var connection = ConnectionUtil.CreateConnection()) connection.Execute(sql, queue);
// { }
// insertedId = connection.QueryFirst<int>(sql, publishMessage); var fetchedMessage = await _storage.FetchNextMessageAsync();
// } fetchedMessage.Dispose();
// var message = await _storage.GetPublishedMessageAsync(insertedId); Assert.NotNull(fetchedMessage);
// Assert.NotNull(message); Assert.Equal(MessageType.Publish, fetchedMessage.MessageType);
// Assert.Equal("SqlServerStorageConnectionTest", message.Name); Assert.Equal(3333, fetchedMessage.MessageId);
// Assert.Equal(StatusName.Scheduled, message.StatusName); }
// }
// [Fact] [Fact]
// public async Task FetchNextMessageAsync_Test() public async Task StoreReceivedMessageAsync_Test()
// { {
// var sql = "INSERT INTO [Cap].[Queue]([MessageId],[MessageType]) VALUES(@MessageId,@MessageType);"; var receivedMessage = new CapReceivedMessage
// var queue = new CapQueue {
// { Name = "SqlServerStorageConnectionTest",
// MessageId = 3333, Content = "",
// MessageType = MessageType.Publish Group = "mygroup",
// }; StatusName = StatusName.Scheduled
// using (var connection = ConnectionUtil.CreateConnection()) };
// {
// connection.Execute(sql, queue);
// }
// var fetchedMessage = await _storage.FetchNextMessageAsync();
// fetchedMessage.Dispose();
// Assert.NotNull(fetchedMessage);
// Assert.Equal(MessageType.Publish, fetchedMessage.MessageType);
// Assert.Equal(3333, fetchedMessage.MessageId);
// }
// [Fact] Exception exception = null;
// public async Task StoreReceivedMessageAsync_Test() try
// { {
// var receivedMessage = new CapReceivedMessage await _storage.StoreReceivedMessageAsync(receivedMessage);
// { }
// Name = "SqlServerStorageConnectionTest", catch (Exception ex)
// Content = "", {
// Group = "mygroup", exception = ex;
// StatusName = StatusName.Scheduled }
// }; Assert.Null(exception);
}
// Exception exception = null; [Fact]
// try public async Task GetReceivedMessageAsync_Test()
// { {
// await _storage.StoreReceivedMessageAsync(receivedMessage);
// }
// catch (Exception ex)
// {
// exception = ex;
// }
// Assert.Null(exception);
// }
// [Fact] var sql = $@"
// public async Task GetReceivedMessageAsync_Test() INSERT INTO [Cap].[Received]([Name],[Group],[Content],[Retries],[Added],[ExpiresAt],[StatusName]) OUTPUT INSERTED.Id
// { VALUES(@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
var receivedMessage = new CapReceivedMessage
{
Name = "SqlServerStorageConnectionTest",
Content = "",
Group = "mygroup",
StatusName = StatusName.Scheduled
};
var insertedId = default(int);
using (var connection = ConnectionUtil.CreateConnection())
{
insertedId = connection.QueryFirst<int>(sql, receivedMessage);
}
// var sql = $@" var message = await _storage.GetReceivedMessageAsync(insertedId);
//INSERT INTO [Cap].[Received]([Name],[Group],[Content],[Retries],[Added],[ExpiresAt],[StatusName]) OUTPUT INSERTED.Id
//VALUES(@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
// var receivedMessage = new CapReceivedMessage
// {
// Name = "SqlServerStorageConnectionTest",
// Content = "",
// Group = "mygroup",
// StatusName = StatusName.Scheduled
// };
// var insertedId = default(int);
// using (var connection = ConnectionUtil.CreateConnection())
// {
// insertedId = connection.QueryFirst<int>(sql, receivedMessage);
// }
// var message = await _storage.GetReceivedMessageAsync(insertedId); Assert.NotNull(message);
Assert.Equal(StatusName.Scheduled, message.StatusName);
Assert.Equal("SqlServerStorageConnectionTest", message.Name);
Assert.Equal("mygroup", message.Group);
}
// Assert.NotNull(message); [Fact]
// Assert.Equal(StatusName.Scheduled, message.StatusName); public async Task GetNextReceviedMessageToBeEnqueuedAsync_Test()
// Assert.Equal("SqlServerStorageConnectionTest", message.Name); {
// Assert.Equal("mygroup", message.Group); var receivedMessage = new CapReceivedMessage
// } {
Name = "SqlServerStorageConnectionTest",
Content = "",
Group = "mygroup",
StatusName = StatusName.Scheduled
};
await _storage.StoreReceivedMessageAsync(receivedMessage);
// [Fact] var message = await _storage.GetNextReceviedMessageToBeEnqueuedAsync();
// public async Task GetNextReceviedMessageToBeEnqueuedAsync_Test()
// {
// var receivedMessage = new CapReceivedMessage
// {
// Name = "SqlServerStorageConnectionTest",
// Content = "",
// Group = "mygroup",
// StatusName = StatusName.Scheduled
// };
// await _storage.StoreReceivedMessageAsync(receivedMessage);
// var message = await _storage.GetNextReceviedMessageToBeEnqueuedAsync(); Assert.NotNull(message);
Assert.Equal(StatusName.Scheduled, message.StatusName);
Assert.Equal("SqlServerStorageConnectionTest", message.Name);
Assert.Equal("mygroup", message.Group);
}
// Assert.NotNull(message); }
// Assert.Equal(StatusName.Scheduled, message.StatusName); }
// Assert.Equal("SqlServerStorageConnectionTest", message.Name);
// Assert.Equal("mygroup", message.Group);
// }
// }
//}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment