Skip to content

Commit

Permalink
changing some tests - moving from adhoc to assertquery, also removing…
Browse files Browse the repository at this point in the history 
… some tests that were similar
  • Loading branch information
@maumar
maumar committed Oct 21, 2024
1 parent b120752 commit eaab440
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 359 deletions.
28 changes: 28 additions & 0 deletions test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5289,6 +5289,34 @@ public virtual async Task ToPageAsync_in_subquery_throws()

#endregion ToPageAsync

public override async Task Ternary_Not_Null_Contains(bool async)
{
await AssertTranslationFailed(() => base.Ternary_Not_Null_Contains(async));

AssertSql();
}

public override async Task Ternary_Not_Null_endsWith_Non_Numeric_First_Part(bool async)
{
await AssertTranslationFailed(() => base.Ternary_Not_Null_endsWith_Non_Numeric_First_Part(async));

AssertSql();
}

public override async Task Ternary_Null_Equals_Non_Numeric_First_Part(bool async)
{
await AssertTranslationFailed(() => base.Ternary_Null_Equals_Non_Numeric_First_Part(async));

AssertSql();
}

public override async Task Ternary_Null_StartsWith(bool async)
{
await AssertTranslationFailed(() => base.Ternary_Null_StartsWith(async));

AssertSql();
}

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);

Expand Down
177 changes: 0 additions & 177 deletions test/EFCore.Specification.Tests/Query/AdHocMiscellaneousQueryTestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2283,181 +2283,4 @@ public class CompanyDto : ICompanyDto
}

#endregion

#region 34618

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_Contains(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? x.Id + "" : null).FirstOrDefault(x => x!.Contains("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_Contains_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? "" + x.Id + "" : null).FirstOrDefault(x => x!.Contains("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_EndsWith(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? x.Id + "" : null).FirstOrDefault(x => x!.EndsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_EndsWith_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? "" + x.Id + "" : null).FirstOrDefault(x => x!.EndsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_Equals(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? x.Id + "" : null).FirstOrDefault(x => x == "1");
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_Equals_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? "" + x.Id + "" : null).FirstOrDefault(x => x == "1");
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_StartsWith(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? x.Id + "" : null).FirstOrDefault(x => x!.StartsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Not_Null_StartsWith_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x != null ? "" + x.Id + "" : null).FirstOrDefault(x => x!.StartsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_Contains(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : x.Id + "").FirstOrDefault(x => x!.Contains("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_Contains_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : "" + x.Id + "").FirstOrDefault(x => x!.Contains("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_EndsWith(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : x.Id + "").FirstOrDefault(x => x!.EndsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_EndsWith_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : "" + x.Id + "").FirstOrDefault(x => x!.EndsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_Equals(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : x.Id + "").FirstOrDefault(x => x == "1");
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_Equals_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : "" + x.Id + "").FirstOrDefault(x => x == "1");
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_StartsWith(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : x.Id + "").FirstOrDefault(x => x!.StartsWith("1"));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Ternary_Null_StartsWith_Non_Numeric_First_Part(bool async)
{
var contextFactory = await InitializeAsync<Context34618>(seed: x => x.SeedAsync());
using var context = contextFactory.CreateContext();
context.Set<Entity34618>().Select(x => x == null ? null : "" + x.Id + "").FirstOrDefault(x => x!.StartsWith("1"));
}

protected class Context34618(DbContextOptions options) : DbContext(options)
{
public DbSet<Entity34618> Entities { get; set; }

protected override void OnModelCreating(ModelBuilder modelBuilder)
=> modelBuilder.Entity<Entity34618>().Property(x => x.Id).ValueGeneratedNever();

public async Task SeedAsync()
{
var e1 = new Entity34618
{
Id = 1,
};

var e2 = new Entity34618
{
Id = 2,
};

AddRange(e1, e2);
await SaveChangesAsync();
}
}

protected class Entity34618
{
public int Id { get; set; }
}

#endregion
}
32 changes: 32 additions & 0 deletions test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5858,4 +5858,36 @@ public virtual Task Where_nanosecond_and_microsecond_component(bool async)
// TODO: this is basically just about translation, we don't have data with nanoseconds and microseconds
ss => ss.Set<Order>().Where(o => o.OrderDate.Value.Nanosecond != 0 && o.OrderDate.Value.Microsecond != 0),
assertEmpty: true);

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Ternary_Not_Null_Contains(bool async)
=> AssertFirstOrDefault(
async,
ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x != null ? x.OrderID + "" : null),
x => x.Contains("1"));

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Ternary_Not_Null_endsWith_Non_Numeric_First_Part(bool async)
=> AssertFirstOrDefault(
async,
ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x != null ? "" + x.OrderID + "" : null),
x => x.EndsWith("1"));

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Ternary_Null_Equals_Non_Numeric_First_Part(bool async)
=> AssertFirstOrDefault(
async,
ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x == null ? null : "" + x.OrderID + ""),
x => x == "1");

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Ternary_Null_StartsWith(bool async)
=> AssertFirstOrDefault(
async,
ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x == null ? null : x.OrderID + ""),
x => x.StartsWith("1"));
}
Loading

0 comments on commit eaab440

Please sign in to comment.