Skip to content

Commit

Permalink
Use C# 10 features
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Jeanes committed Nov 9, 2021
1 parent 6d72f90 commit acf0d51
Show file tree
Hide file tree
Showing 27 changed files with 1,013 additions and 953 deletions.
125 changes: 125 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\_git\TeslaMateAgile codebase based on best match to current usage at 09/11/21
# You can modify the rules from these initially generated values to suit your own policies
# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
[*.cs]


#Core editorconfig formatting - indentation

#use soft tabs (spaces) for indentation
indent_style = space

#Formatting - new line options

#place catch statements on a new line
csharp_new_line_before_catch = true
#place else statements on a new line
csharp_new_line_before_else = true
#require members of anonymous types to be on separate lines
csharp_new_line_before_members_in_anonymous_types = true
#require members of object intializers to be on separate lines
csharp_new_line_before_members_in_object_initializers = true
#require braces to be on a new line for control_blocks, object_collection_array_initializers, lambdas, types, anonymous_types, and methods (also known as "Allman" style)
csharp_new_line_before_open_brace = control_blocks, object_collection_array_initializers, lambdas, types, anonymous_types, methods

#Formatting - organize using options

#do not place System.* using directives before other using directives
dotnet_sort_system_directives_first = false

#Formatting - spacing options

#require NO space between a cast and the value
csharp_space_after_cast = false
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_after_colon_in_inheritance_clause = true
#require a space after a keyword in a control flow statement such as a for loop
csharp_space_after_keywords_in_control_flow_statements = true
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_before_colon_in_inheritance_clause = true
#remove space within empty argument list parentheses
csharp_space_between_method_call_empty_parameter_list_parentheses = false
#remove space between method call name and opening parenthesis
csharp_space_between_method_call_name_and_opening_parenthesis = false
#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
csharp_space_between_method_call_parameter_list_parentheses = false
#remove space within empty parameter list parentheses for a method declaration
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
csharp_space_between_method_declaration_parameter_list_parentheses = false

#Formatting - wrapping options

#leave code block on single line
csharp_preserve_single_line_blocks = true
#leave statements and member declarations on the same line
csharp_preserve_single_line_statements = true

#Style - Code block preferences

#prefer curly braces even for one line of code
csharp_prefer_braces = true:suggestion

#Style - expression bodied member options

#prefer expression-bodied members for accessors
csharp_style_expression_bodied_accessors = true:suggestion
#prefer block bodies for methods
csharp_style_expression_bodied_methods = false:suggestion
#prefer expression-bodied members for properties
csharp_style_expression_bodied_properties = true:suggestion

#Style - expression level options

#prefer out variables to be declared inline in the argument list of a method call when possible
csharp_style_inlined_variable_declaration = true:suggestion
#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_member_access = true:suggestion

#Style - Expression-level preferences

#prefer objects to be initialized using object initializers when possible
dotnet_style_object_initializer = true:suggestion
#prefer inferred anonymous type member names
dotnet_style_prefer_inferred_anonymous_type_member_names = false:suggestion
#prefer inferred tuple element names
dotnet_style_prefer_inferred_tuple_names = true:suggestion

#Style - implicit and explicit types

#prefer var over explicit type in all cases, unless overridden by another code style rule
csharp_style_var_elsewhere = true:suggestion
#prefer var is used to declare variables with built-in system types such as int
csharp_style_var_for_built_in_types = true:suggestion
#prefer var when the type is already mentioned on the right-hand side of a declaration expression
csharp_style_var_when_type_is_apparent = true:suggestion

#Style - language keyword and framework type options

#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

#Style - Miscellaneous preferences

#prefer local functions over anonymous functions
csharp_style_pattern_local_over_anonymous_function = true:suggestion

#Style - modifier options

#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

#Style - Modifier preferences

#when this rule is set to a list of modifiers, prefer the specified ordering.
csharp_preferred_modifier_order = public,private,readonly,async,static:suggestion

#Style - qualification options

#prefer fields not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_field = false:suggestion
#prefer methods not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_method = false:suggestion
#prefer properties not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_property = false:suggestion
csharp_style_namespace_declarations=file_scoped:silent
115 changes: 57 additions & 58 deletions TeslaMateAgile.Tests/IntegrationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,75 +11,74 @@
using TeslaMateAgile.Services;
using TeslaMateAgile.Services.Interfaces;

namespace TeslaMateAgile.Tests
namespace TeslaMateAgile.Tests;

public class IntegrationTests
{
public class IntegrationTests
private const string IntegrationTest = "Integration test";

[Ignore(IntegrationTest)]
[Test]
public async Task IntegrationTests_Tibber()
{
private const string IntegrationTest = "Integration test";
var configBuilder = new ConfigurationBuilder()
.AddJsonFile("appsettings.json")
.AddUserSecrets<Program>();

var config = configBuilder.Build();

[Ignore(IntegrationTest)]
[Test]
public async Task IntegrationTests_Tibber()
var services = new ServiceCollection();
services.AddHttpClient();
services.AddTransient<IGraphQLJsonSerializer, SystemTextJsonSerializer>();
services.Configure<TibberOptions>(config.GetSection("Tibber"));
services.AddHttpClient<IPriceDataService, TibberService>((serviceProvider, client) =>
{
var configBuilder = new ConfigurationBuilder()
.AddJsonFile("appsettings.json")
.AddUserSecrets<Program>();
var options = serviceProvider.GetRequiredService<IOptions<TibberOptions>>().Value;
client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", options.AccessToken);
});

var config = configBuilder.Build();
var priceDataService = services.BuildServiceProvider().GetRequiredService<IPriceDataService>();

var services = new ServiceCollection();
services.AddHttpClient();
services.AddTransient<IGraphQLJsonSerializer, SystemTextJsonSerializer>();
services.Configure<TibberOptions>(config.GetSection("Tibber"));
services.AddHttpClient<IPriceDataService, TibberService>((serviceProvider, client) =>
{
var options = serviceProvider.GetRequiredService<IOptions<TibberOptions>>().Value;
client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", options.AccessToken);
});
var from = DateTimeOffset.Parse("2020-01-01T00:25:00+00:00");
var to = DateTimeOffset.Parse("2020-01-01T15:00:00+00:00");

var priceDataService = services.BuildServiceProvider().GetRequiredService<IPriceDataService>();
var priceData = await priceDataService.GetPriceData(from, to);

var from = DateTimeOffset.Parse("2020-01-01T00:25:00+00:00");
var to = DateTimeOffset.Parse("2020-01-01T15:00:00+00:00");
Assert.LessOrEqual(priceData.Min(x => x.ValidFrom), from);
Assert.GreaterOrEqual(priceData.Max(x => x.ValidTo), to);
}

var priceData = await priceDataService.GetPriceData(from, to);
[Ignore(IntegrationTest)]
[Test]
public async Task IntegrationTests_Awattar()
{
var configBuilder = new ConfigurationBuilder()
.AddJsonFile("appsettings.json")
.AddUserSecrets<Program>();

Assert.LessOrEqual(priceData.Min(x => x.ValidFrom), from);
Assert.GreaterOrEqual(priceData.Max(x => x.ValidTo), to);
}
var config = configBuilder.Build();

[Ignore(IntegrationTest)]
[Test]
public async Task IntegrationTests_Awattar()
var services = new ServiceCollection();
services.AddHttpClient();
services.AddOptions<AwattarOptions>()
.Bind(config.GetSection("Awattar"))
.ValidateDataAnnotations();
services.AddHttpClient<IPriceDataService, AwattarService>((serviceProvider, client) =>
{
var configBuilder = new ConfigurationBuilder()
.AddJsonFile("appsettings.json")
.AddUserSecrets<Program>();

var config = configBuilder.Build();

var services = new ServiceCollection();
services.AddHttpClient();
services.AddOptions<AwattarOptions>()
.Bind(config.GetSection("Awattar"))
.ValidateDataAnnotations();
services.AddHttpClient<IPriceDataService, AwattarService>((serviceProvider, client) =>
{
var options = serviceProvider.GetRequiredService<IOptions<AwattarOptions>>().Value;
var baseUrl = options.BaseUrl;
if (!baseUrl.EndsWith("/")) { baseUrl += "/"; }
client.BaseAddress = new Uri(baseUrl);
});

var priceDataService = services.BuildServiceProvider().GetRequiredService<IPriceDataService>();

var from = DateTimeOffset.Parse("2020-01-01T00:25:00+00:00");
var to = DateTimeOffset.Parse("2020-01-01T15:55:00+00:00");

var priceData = await priceDataService.GetPriceData(from, to);

Assert.LessOrEqual(priceData.Min(x => x.ValidFrom), from);
Assert.GreaterOrEqual(priceData.Max(x => x.ValidTo), to);
}
var options = serviceProvider.GetRequiredService<IOptions<AwattarOptions>>().Value;
var baseUrl = options.BaseUrl;
if (!baseUrl.EndsWith("/")) { baseUrl += "/"; }
client.BaseAddress = new Uri(baseUrl);
});

var priceDataService = services.BuildServiceProvider().GetRequiredService<IPriceDataService>();

var from = DateTimeOffset.Parse("2020-01-01T00:25:00+00:00");
var to = DateTimeOffset.Parse("2020-01-01T15:55:00+00:00");

var priceData = await priceDataService.GetPriceData(from, to);

Assert.LessOrEqual(priceData.Min(x => x.ValidFrom), from);
Assert.GreaterOrEqual(priceData.Max(x => x.ValidTo), to);
}
}
79 changes: 39 additions & 40 deletions TeslaMateAgile.Tests/PriceHelperTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,32 @@
using TeslaMateAgile.Data.TeslaMate.Entities;
using TeslaMateAgile.Services.Interfaces;

namespace TeslaMateAgile.Tests
namespace TeslaMateAgile.Tests;

public class PriceHelperTests
{
public class PriceHelperTests
public PriceHelper Setup(List<Price> prices = null)
{
public PriceHelper Setup(List<Price> prices = null)
{
if (prices == null) { prices = new List<Price>(); }
if (prices == null) { prices = new List<Price>(); }

var priceDataService = new Mock<IPriceDataService>();
priceDataService
.Setup(x => x.GetPriceData(It.IsAny<DateTimeOffset>(), It.IsAny<DateTimeOffset>()))
.ReturnsAsync(prices.OrderBy(x => x.ValidFrom));
var priceDataService = new Mock<IPriceDataService>();
priceDataService
.Setup(x => x.GetPriceData(It.IsAny<DateTimeOffset>(), It.IsAny<DateTimeOffset>()))
.ReturnsAsync(prices.OrderBy(x => x.ValidFrom));

var teslaMateDbContext = new Mock<TeslaMateDbContext>(new DbContextOptions<TeslaMateDbContext>());
var teslaMateDbContext = new Mock<TeslaMateDbContext>(new DbContextOptions<TeslaMateDbContext>());

var logger = new ServiceCollection()
.AddLogging(x => x.AddConsole())
.BuildServiceProvider()
.GetRequiredService<ILogger<PriceHelper>>();
var logger = new ServiceCollection()
.AddLogging(x => x.AddConsole())
.BuildServiceProvider()
.GetRequiredService<ILogger<PriceHelper>>();

var teslaMateOptions = Options.Create(new TeslaMateOptions());
var teslaMateOptions = Options.Create(new TeslaMateOptions());

return new PriceHelper(logger, teslaMateDbContext.Object, priceDataService.Object, teslaMateOptions);
}
return new PriceHelper(logger, teslaMateDbContext.Object, priceDataService.Object, teslaMateOptions);
}

private static readonly object[][] PriceHelper_CalculateChargeCost_Cases = new object[][] {
private static readonly object[][] PriceHelper_CalculateChargeCost_Cases = new object[][] {
new object[]
{
"Plunge",
Expand All @@ -66,18 +66,18 @@ public PriceHelper Setup(List<Price> prices = null)
}
};

[Test]
[TestCaseSource(nameof(PriceHelper_CalculateChargeCost_Cases))]
public async Task PriceHelper_CalculateChargeCost(string testName, List<Price> prices, List<Charge> charges, decimal expectedPrice, decimal expectedEnergy)
{
Console.WriteLine($"Running calculate charge cost test '{testName}'");
var priceHelper = Setup(prices);
var (price, energy) = await priceHelper.CalculateChargeCost(charges);
Assert.AreEqual(expectedPrice, price);
Assert.AreEqual(expectedEnergy, energy);
}
[Test]
[TestCaseSource(nameof(PriceHelper_CalculateChargeCost_Cases))]
public async Task PriceHelper_CalculateChargeCost(string testName, List<Price> prices, List<Charge> charges, decimal expectedPrice, decimal expectedEnergy)
{
Console.WriteLine($"Running calculate charge cost test '{testName}'");
var priceHelper = Setup(prices);
var (price, energy) = await priceHelper.CalculateChargeCost(charges);
Assert.AreEqual(expectedPrice, price);
Assert.AreEqual(expectedEnergy, energy);
}

private static readonly object[][] PriceHelper_CalculateEnergyUsed_Cases = new object[][] {
private static readonly object[][] PriceHelper_CalculateEnergyUsed_Cases = new object[][] {
new object[]
{
"ThreePhase",
Expand All @@ -86,15 +86,14 @@ public async Task PriceHelper_CalculateChargeCost(string testName, List<Price> p
}
};

[Test]
[TestCaseSource(nameof(PriceHelper_CalculateEnergyUsed_Cases))]
public void PriceHelper_CalculateEnergyUsed(string testName, List<Charge> charges, decimal expectedEnergy)
{
Console.WriteLine($"Running calculate energy used test '{testName}'");
var priceHelper = Setup();
var phases = priceHelper.DeterminePhases(charges);
var energy = priceHelper.CalculateEnergyUsed(charges, phases.Value);
Assert.AreEqual(expectedEnergy, Math.Round(energy, 2));
}
[Test]
[TestCaseSource(nameof(PriceHelper_CalculateEnergyUsed_Cases))]
public void PriceHelper_CalculateEnergyUsed(string testName, List<Charge> charges, decimal expectedEnergy)
{
Console.WriteLine($"Running calculate energy used test '{testName}'");
var priceHelper = Setup();
var phases = priceHelper.DeterminePhases(charges);
var energy = priceHelper.CalculateEnergyUsed(charges, phases.Value);
Assert.AreEqual(expectedEnergy, Math.Round(energy, 2));
}
}
}
Loading

0 comments on commit acf0d51

Please sign in to comment.