diff --git a/HttpClientStudy.UnitTest/GlobalUsings.cs b/HttpClientStudy.UnitTest/GlobalUsings.cs index 4cc2447..b5b9a32 100644 --- a/HttpClientStudy.UnitTest/GlobalUsings.cs +++ b/HttpClientStudy.UnitTest/GlobalUsings.cs @@ -1,4 +1,15 @@ +global using System; +global using System.Collections.Generic; +global using System.Linq; +global using System.Text; +global using System.Threading.Tasks; + global using Xunit; +global using Xunit.Sdk; +global using Xunit.Abstractions; +global using Xunit.Extensions; +global using Xunit.Internal; +global using Xunit.Serialization; global using HttpClientStudy.Model; global using HttpClientStudy.Core; diff --git a/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs b/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs index d747455..0ab2c5b 100644 --- a/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs +++ b/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using Xunit.Abstractions; - -namespace HttpClientStudy.UnitTest.WebApp +namespace HttpClientStudy.UnitTest.WebApp { public class BaseResultTest { @@ -23,7 +15,7 @@ namespace HttpClientStudy.UnitTest.WebApp var result = new BaseResult() { Code = 1, Message = "成功", Data = null }; Assert.NotNull(result); - Assert.Equal(1, result.Code); + Assert.True(1 == result.Code); Assert.Equal("成功", result.Message); Assert.Null(result.Data); } @@ -91,11 +83,11 @@ namespace HttpClientStudy.UnitTest.WebApp var result3 = BaseResultUtil.Default(new { Name="匿名类"}); - Assert.NotNull(result); + Assert.NotNull(result3); Assert.IsType(result3.Data!.GetType(),result3.Data); Assert.Equal("匿名类",result3.Data!.Name); - Assert.Equal(0, result2.Code); - Assert.Equal("", result2.Message); + Assert.Equal(0, result3.Code); + Assert.Equal("", result3.Message); } [Fact] @@ -104,23 +96,23 @@ namespace HttpClientStudy.UnitTest.WebApp var result = BaseResultUtil.Success(); Assert.NotNull(result); Assert.Null(result.Data); - Assert.Equal(0, result.Code); - Assert.Equal("", result.Message); + Assert.Equal(1, result.Code); + Assert.Equal("成功", result.Message); var result2 = BaseResultUtil.Success(); Assert.NotNull(result2); Assert.IsType(result2.Data); Assert.Equal(0, result2.Data); - Assert.Equal(0, result2.Code); - Assert.Equal("", result2.Message); + Assert.Equal(1, result2.Code); + Assert.Equal("成功", result2.Message); var result3 = BaseResultUtil.Success(new { Name = "匿名类" },1,"成功"); - Assert.NotNull(result); + Assert.NotNull(result3); Assert.IsType(result3.Data!.GetType(), result3.Data); Assert.Equal("匿名类", result3.Data!.Name); - Assert.Equal(0, result2.Code); - Assert.Equal("", result2.Message); + Assert.Equal(1, result3.Code); + Assert.Equal("成功", result3.Message); } [Fact] diff --git a/HttpClientStudy.WebApp/BaseResult.cs b/HttpClientStudy.WebApp/BaseResult.cs index d39f4ce..09a64b7 100644 --- a/HttpClientStudy.WebApp/BaseResult.cs +++ b/HttpClientStudy.WebApp/BaseResult.cs @@ -1,4 +1,6 @@ -namespace HttpClientStudy.WebApp +using System.Linq.Expressions; + +namespace HttpClientStudy.WebApp { /// /// API 返回基类 @@ -41,77 +43,126 @@ /// public static class BaseResultUtil { + /// + /// 创建 泛型返回基类 + /// public static BaseResult Create(TData data, int code = 0, string message = "") { return new BaseResult() { Data = data, Code = code, Message = message }; } + /// + /// 创建 泛型成功返回基类 + /// public static BaseResult Success() { return Success(default, 1, "成功"); - //return new BaseResult() { Data = default, Code = 1, Message = "成功" }; } - public static BaseResult Success(TData data) + /// + /// 创建 泛型成功返回基类 + /// + public static BaseResult Success(TData? data) { - return new BaseResult() { Data = data, Code = 1, Message = "成功" }; + return Success(data, 1, "成功"); } - public static BaseResult Success(TData data, string message) + /// + /// 创建 泛型成功返回基类 + /// + public static BaseResult Success(TData? data, string message) { - return new BaseResult() { Data = data, Code = 1, Message = message }; + return Success(data, 1, message); } - public static BaseResult Success(TData data, int code, string message) + /// + /// 创建 泛型成功返回基类 + /// + public static BaseResult Success(TData? data, int code, string message) { return new BaseResult() { Data = data, Code = code, Message = message }; } + /// + /// 创建 泛型错误返回基类 + /// public static BaseResult Error() { - return new BaseResult() { Data = default, Code = 0, Message = "错误" }; + return Error(default, 0, "错误"); } - public static BaseResult Error(TData data, string message = "错误") + /// + /// 创建 泛型错误返回基类 + /// + public static BaseResult Error(TData? data, string message = "错误") { - return new BaseResult() { Data = data, Code = 0, Message = "错误" }; + return Error(data, 0, message); } - public static BaseResult Error(TData data, int code = 0, string message = "错误") + /// + /// 创建 泛型错误返回基类 + /// + public static BaseResult Error(TData? data, int code = 0, string message = "错误") { - return new BaseResult() { Data = data, Code = 0, Message = "错误" }; + return Error(data, code, message); } - public static BaseResult Fail() where TData : class + /// + /// 创建 泛型失败返回基类 + /// + public static BaseResult Fail() { - return new BaseResult() { Data = default, Code = 0, Message = "失败" }; + return Fail(default, 0, "失败"); } - public static BaseResult Fail(TData data, string message = "失败") + /// + /// 创建 泛型失败返回基类 + /// + public static BaseResult Fail(TData? data, string message = "失败") { - return new BaseResult() { Data = data, Code = 0, Message = "失败" }; + return Fail(data, 0, message); } - public static BaseResult Fail(TData data, int code = 0, string message = "失败") + /// + /// 创建 泛型失败返回基类 + /// + public static BaseResult Fail(TData? data, int code = 0, string message = "失败") { return new BaseResult() { Data = data, Code = 0, Message = "失败" }; } + /// + /// 创建 泛型异常返回基类 + /// public static BaseResult Exception(Exception ex) { - return new BaseResult() { Data = default, Code = 0, Message = $"异常:{ex.Message}" }; + return Exception(ex, default,0); } - public static BaseResult Exception(Exception ex, TData data) + /// + /// 创建 泛型异常返回基类 + /// + /// + /// + /// + /// + public static BaseResult Exception(Exception ex, TData? data) { - return new BaseResult() { Data = data, Code = 0, Message = $"异常:{ex.Message}" }; + return Exception(ex, data, 0); } - public static BaseResult Exception(Exception ex, TData data, int code = 0) + /// + /// 创建 泛型异常返回基类 + /// + + public static BaseResult Exception(Exception ex, TData? data, int code = 0) { return new BaseResult() { Data = data, Code = code, Message = $"异常:{ex.Message}" }; } + /// + /// 创建 泛型默认返回基类 + /// public static BaseResult Default(TData? data = default) { return new BaseResult() { Code = 0, Message = "", Data = data };