Skip to content

Commit f50ab31

Browse files
alex-kulakovalex-kulakov
committed
Various changes fixing merge
- Addressed some changes merged incorrectly - Updated async versions of tests to be on the same page with sync ones - other minor changes
1 parent 408bc19 commit f50ab31

File tree

5 files changed

+91
-85
lines changed

5 files changed

+91
-85
lines changed

‎Extensions/Xtensive.Orm.BulkOperations.Tests/Other.cs

Lines changed: 73 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public void CompositeKeyUpdate()
2424
var date2 = FixDateTimeForPK(DateTime.Now.AddDays(1));
2525
var id1 = Guid.NewGuid();
2626
var id2 = Guid.NewGuid();
27-
session.SaveChanges();
2827
var foo1 = new Bar2(session, date1, id1) { Name = "test" };
2928
var foo2 = new Bar2(session, date2, id1);
3029
var foo3 = new Bar2(session, date2, id2) { Name = "test" };
@@ -40,23 +39,21 @@ public void CompositeKeyUpdate()
4039
[Test]
4140
public async Task CompositeKeyUpdateAsync()
4241
{
43-
await using (Session session = await Domain.OpenSessionAsync()) {
44-
await using (TransactionScope trx = session.OpenTransaction()) {
45-
DateTime date1 = DateTime.Now;
46-
DateTime date2 = DateTime.Now.AddDays(1);
47-
Guid id1 = Guid.NewGuid();
48-
Guid id2 = Guid.NewGuid();
49-
var foo1 = new Bar2(session, date1, id1) {Name = "test"};
50-
var foo2 = new Bar2(session, date2, id1);
51-
var foo3 = new Bar2(session, date2, id2) {Name = "test"};
52-
int updated =
53-
await session.Query.All<Bar2>().Where(a => a.Name=="test").Set(a => a.Name, "abccba").UpdateAsync();
54-
Assert.That(updated, Is.EqualTo(2));
55-
Assert.That(foo1.Name, Is.EqualTo("abccba"));
56-
Assert.That(foo3.Name, Is.EqualTo("abccba"));
57-
Assert.That(foo2.Name, Is.Null);
58-
trx.Complete();
59-
}
42+
await using (var session = await Domain.OpenSessionAsync())
43+
await using (var trx = session.OpenTransaction()) {
44+
var date1 = FixDateTimeForPK(DateTime.Now);
45+
var date2 = FixDateTimeForPK(DateTime.Now.AddDays(1));
46+
var id1 = Guid.NewGuid();
47+
var id2 = Guid.NewGuid();
48+
var foo1 = new Bar2(session, date1, id1) { Name = "test" };
49+
var foo2 = new Bar2(session, date2, id1);
50+
var foo3 = new Bar2(session, date2, id2) { Name = "test" };
51+
var updated = await session.Query.All<Bar2>().Where(a => a.Name == "test").Set(a => a.Name, "abccba").UpdateAsync();
52+
Assert.That(updated, Is.EqualTo(2));
53+
Assert.That(foo1.Name, Is.EqualTo("abccba"));
54+
Assert.That(foo3.Name, Is.EqualTo("abccba"));
55+
Assert.That(foo2.Name, Is.Null);
56+
trx.Complete();
6057
}
6158
}
6259

@@ -89,30 +86,29 @@ public void SimpleDelete()
8986
[Test]
9087
public async Task SimpleDeleteAsync()
9188
{
92-
await using (Session session = await Domain.OpenSessionAsync()) {
93-
await using (TransactionScope trx = session.OpenTransaction()) {
94-
var bar1 = new Bar(session) {Name = "test", Count = 3};
95-
var bar2 = new Bar(session);
96-
var bar3 = new Bar(session);
97-
bar3.Foo.Add(new Foo(session) {Name = "Foo"});
98-
string s = "test";
99-
100-
int deleted = await session.Query.All<Bar>().Where(a => a.Name==s).DeleteAsync();
101-
Assert.That(bar1.IsRemoved, Is.True);
102-
Assert.That(bar2.IsRemoved, Is.False);
103-
Assert.That(bar3.IsRemoved, Is.False);
104-
Assert.That(deleted, Is.EqualTo(1));
105-
106-
await session.Query.All<Bar>()
107-
.Where(a => a.Foo.Any(b => b.Name=="Foo"))
108-
.UpdateAsync(a => new Bar(null) {Name = ""});
109-
110-
deleted = await session.Query.All<Bar>().Where(a => a.Foo.Count(b => b.Name=="Foo")==0).DeleteAsync();
111-
Assert.That(bar2.IsRemoved, Is.True);
112-
Assert.That(bar3.IsRemoved, Is.False);
113-
Assert.That(deleted, Is.EqualTo(1));
114-
trx.Complete();
115-
}
89+
await using (var session = await Domain.OpenSessionAsync())
90+
await using (var trx = session.OpenTransaction()) {
91+
var bar1 = new Bar(session) { Name = "test", Count = 3 };
92+
var bar2 = new Bar(session);
93+
var bar3 = new Bar(session);
94+
_ = bar3.Foo.Add(new Foo(session) { Name = "Foo" });
95+
var s = "test";
96+
97+
var deleted = await session.Query.All<Bar>().Where(a => a.Name == s).DeleteAsync();
98+
Assert.That(bar1.IsRemoved, Is.True);
99+
Assert.That(bar2.IsRemoved, Is.False);
100+
Assert.That(bar3.IsRemoved, Is.False);
101+
Assert.That(deleted, Is.EqualTo(1));
102+
103+
_ = await session.Query.All<Bar>()
104+
.Where(a => a.Foo.Any(b => b.Name == "Foo"))
105+
.UpdateAsync(a => new Bar(null) { Name = "" });
106+
107+
deleted = await session.Query.All<Bar>().Where(a => a.Foo.Count(b => b.Name == "Foo") == 0).DeleteAsync();
108+
Assert.That(bar2.IsRemoved, Is.True);
109+
Assert.That(bar3.IsRemoved, Is.False);
110+
Assert.That(deleted, Is.EqualTo(1));
111+
trx.Complete();
116112
}
117113
}
118114

@@ -147,28 +143,27 @@ public void SimpleInsert()
147143
[Test]
148144
public async Task SimpleInsertAsync()
149145
{
150-
await using (Session session = await Domain.OpenSessionAsync()) {
151-
await using (TransactionScope trx = session.OpenTransaction()) {
152-
string s1 = "abccba";
153-
int i = 5;
154-
Key key = await session.Query.InsertAsync(
155-
() => new Bar(session) {Name = "test1" + s1, Count = i * 2 + 1, Description = null});
156-
Assert.That(key, Is.EqualTo(Key.Create<Bar>(session.Domain, 1)));
157-
var bar = session.Query.Single<Bar>(key);
158-
Assert.That(bar.Name, Is.EqualTo("test1abccba"));
159-
Assert.That(bar.Count, Is.EqualTo(11));
160-
Assert.That(bar.Description, Is.Null);
161-
162-
key = await session.Query.InsertAsync(
163-
() => new Bar(session) {Id = 100, Name = "test" + s1, Count = i * 2 + 1, Description = null});
164-
Assert.That(key, Is.EqualTo(Key.Create<Bar>(session.Domain, 100)));
165-
bar = session.Query.Single<Bar>(key);
166-
Assert.That(bar.Name, Is.EqualTo("testabccba"));
167-
Assert.That(bar.Count, Is.EqualTo(11));
168-
Assert.That(bar.Description, Is.Null);
169-
170-
trx.Complete();
171-
}
146+
await using (var session = await Domain.OpenSessionAsync())
147+
await using (var trx = session.OpenTransaction()) {
148+
var s1 = "abccba";
149+
var i = 5;
150+
var key = await session.Query.InsertAsync(
151+
() => new Bar(session) { Name = "test1" + s1, Count = i * 2 + 1, Description = null });
152+
Assert.That(key, Is.EqualTo(Key.Create<Bar>(session.Domain, 1)));
153+
var bar = session.Query.Single<Bar>(key);
154+
Assert.That(bar.Name, Is.EqualTo("test1abccba"));
155+
Assert.That(bar.Count, Is.EqualTo(11));
156+
Assert.That(bar.Description, Is.Null);
157+
158+
key = await session.Query.InsertAsync(
159+
() => new Bar(session) { Id = 100, Name = "test" + s1, Count = i * 2 + 1, Description = null });
160+
Assert.That(key, Is.EqualTo(Key.Create<Bar>(session.Domain, 100)));
161+
bar = session.Query.Single<Bar>(key);
162+
Assert.That(bar.Name, Is.EqualTo("testabccba"));
163+
Assert.That(bar.Count, Is.EqualTo(11));
164+
Assert.That(bar.Description, Is.Null);
165+
166+
trx.Complete();
172167
}
173168
}
174169

@@ -195,21 +190,20 @@ public void SimpleUpdate()
195190
[Test]
196191
public async Task SimpleUpdateAsync()
197192
{
198-
await using (Session session = await Domain.OpenSessionAsync()) {
199-
await using (TransactionScope trx = session.OpenTransaction()) {
200-
var bar1 = new Bar(session) {Name = "test", Count = 3};
201-
var bar2 = new Bar(session);
202-
string s = "test";
203-
string s1 = "abccba";
204-
int updated = await session.Query.All<Bar>()
205-
.Where(a => a.Name.Contains(s))
206-
.UpdateAsync(a => new Bar(session) {Name = a.Name + s1, Count = a.Count * 2, Description = null});
207-
Assert.That(bar1.Name, Is.EqualTo("testabccba"));
208-
Assert.That(bar1.Description, Is.Null);
209-
Assert.That(bar1.Count, Is.EqualTo(6));
210-
Assert.That(updated, Is.EqualTo(1));
211-
trx.Complete();
212-
}
193+
await using (var session = await Domain.OpenSessionAsync())
194+
await using (var trx = session.OpenTransaction()) {
195+
var bar1 = new Bar(session) { Name = "test", Count = 3 };
196+
var bar2 = new Bar(session);
197+
var s = "test";
198+
var s1 = "abccba";
199+
var updated = await session.Query.All<Bar>()
200+
.Where(a => a.Name.Contains(s))
201+
.UpdateAsync(a => new Bar(session) { Name = a.Name + s1, Count = a.Count * 2, Description = null });
202+
Assert.That(bar1.Name, Is.EqualTo("testabccba"));
203+
Assert.That(bar1.Description, Is.Null);
204+
Assert.That(bar1.Count, Is.EqualTo(6));
205+
Assert.That(updated, Is.EqualTo(1));
206+
trx.Complete();
213207
}
214208
}
215209

‎Orm/Xtensive.Orm.Tests/Issues/IssueJira0728_NullGroupHasNoElementsTest.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,15 @@ protected override void PopulateData()
3939
new Battery { Amps = 2, Cell = 5, Volts = 3.7 }
4040
};
4141

42+
var baseDateTime = DateTime.UtcNow;
43+
baseDateTime = new DateTime(
44+
baseDateTime.Year, baseDateTime.Month, baseDateTime.Day,
45+
baseDateTime.Hour, baseDateTime.Minute, baseDateTime.Second, 128);
46+
4247
for (var i = 0; i < 10; i++) {
4348
_ = new Product {
4449
Name = "Name:" + i % 3,
45-
CreationDate = DateTime.UtcNow.AddDays(-(i % 3)),
50+
CreationDate = baseDateTime.AddDays(-(i % 3)),
4651
Description = i % 3 != 0 ? "Lap:" + i % 3 : null,
4752
Comment = i % 3 != 0 ? "Comment:" + i % 3 : null,
4853
Price = new Money { CurrencyCode = 100 + i % 3, Value = (decimal) 12.3 },

‎Orm/Xtensive.Orm.Tests/Storage/QueryResultTest.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,12 @@ public void EnumerationInOuterTransactionAfterInnerRollbackTest()
303303

304304
if (directReader) {
305305
_ = Assert.Throws<StorageException>(() => innerTx.Dispose());
306-
_ = Assert.Throws<StorageException>(() => outerTx.Dispose());
306+
_ = Assert.Throws<InvalidOperationException>(() => result.ToList());
307+
Assert.DoesNotThrow(() => outerTx.Dispose());
307308
}
308309
else {
309310
Assert.DoesNotThrow(() => innerTx.Dispose());
311+
_ = Assert.Throws<InvalidOperationException>(() => result.ToList());
310312
Assert.DoesNotThrow(() => outerTx.Dispose());
311313
}
312314
}
@@ -328,10 +330,12 @@ public async Task EnumerationInOuterTransactionAfterInnerRollbackAsyncTest()
328330

329331
if (directReader) {
330332
_ = Assert.Throws<StorageException>(() => innerTx.Dispose());
331-
_ = Assert.Throws<StorageException>(() => outerTx.Dispose());
333+
_ = Assert.Throws<InvalidOperationException>(() => result.ToList());
334+
Assert.DoesNotThrow(() => outerTx.Dispose());
332335
}
333336
else {
334337
Assert.DoesNotThrow(() => innerTx.Dispose());
338+
_ = Assert.Throws<InvalidOperationException>(() => result.ToList());
335339
Assert.DoesNotThrow(() => outerTx.Dispose());
336340
}
337341
}

‎Orm/Xtensive.Orm.Tests/Upgrade/FullText/DynamicFullTextCatalogTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public async Task MultischemaAsyncTest()
375375
ftIndex = model2SchemaTable.FullTextIndexes[0];
376376
Assert.That(ftIndex, Is.Not.Null);
377377
Assert.That(ftIndex.FullTextCatalog, Is.Not.Null);
378-
Assert.That(ftIndex.FullTextCatalog, Is.EqualTo($"{database}_{Schema1}"));
378+
Assert.That(ftIndex.FullTextCatalog, Is.EqualTo($"{database}_{Schema2}"));
379379
}
380380
}
381381

@@ -596,7 +596,7 @@ public void MultinodeTest1()
596596
domain.Extensions.Clear();
597597
_ = domain.StorageNodeManager.AddNode(nodeConfiguration2);
598598
var node2StorageModel = domain.Extensions.Get<StorageModel>();
599-
table = node2StorageModel.Tables[$"{Schema1}:TestEntity"];
599+
table = node2StorageModel.Tables[$"{Schema2}:TestEntity"];
600600
Assert.That(table, Is.Not.Null);
601601
ftIndex = table.FullTextIndexes[0];
602602
Assert.That(ftIndex, Is.Not.Null);

‎Orm/Xtensive.Orm.Tests/Upgrade/UpgradeToNewHierarchyThatInheritsStructureTest.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,10 @@ public void NewTablePerformSafelyTest(InheritanceSchema inheritanceSchema, bool
318318
: Assert.Throws<SchemaSynchronizationException>(() => { using (BuildDomain(DomainUpgradeMode.PerformSafely, upgradeTypes)) ; });
319319
Assert.That(ex.ComparisonResult, Is.Not.Null);
320320
var allActions = ex.ComparisonResult.UpgradeActions.Flatten().ToList();
321-
Assert.That(allActions.Count(), Is.EqualTo(17));
321+
var expectedActionsCount = StorageProviderInfo.Instance.CheckProviderIsNot(StorageProvider.SqlServer)
322+
? 15
323+
: 17;
324+
Assert.That(allActions.Count(), Is.EqualTo(expectedActionsCount));
322325
Assert.That(ex.ComparisonResult.HasUnsafeActions, Is.True);
323326
Assert.That(ex.ComparisonResult.UnsafeActions.Count, Is.EqualTo(1));
324327
Assert.That(ex.ComparisonResult.UnsafeActions.OfType<DataAction>().Count(), Is.EqualTo(1));

0 commit comments

Comments
 (0)