8000 nuxt · githubsunyf/cms@97cabaa · GitHub
[go: up one dir, main page]
Skip to content

Commit 97cabaa

Browse files
starlyingstarlying
committed
nuxt
1 parent 48c25e5 commit 97cabaa

File tree

280 files changed

+27743
-8693
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+27743
-8693
lines changed

‎Datory.Tests/Core/GenericRepositoryTest.cs

Lines changed: 52 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System;
2+
using System.Globalization;
23
using System.Linq;
34
using Datory.Tests.Mocks;
5+
using Datory.Utils;
46
using SqlKata;
57
using Xunit;
68
using Xunit.Abstractions;
@@ -12,13 +14,13 @@ public class GenericRepositoryTest : IClassFixture<EnvironmentFixture>
1214
{
1315
public EnvironmentFixture Fixture { get; }
1416
private readonly ITestOutputHelper _output;
15-
private readonly TestTableRepository _repository;
17+
private readonly Repository<TestTableInfo> _repository;
1618

1719
public GenericRepositoryTest(EnvironmentFixture fixture, ITestOutputHelper output)
1820
{
1921
Fixture = fixture;
2022
_output = output;
21-
_repository = new TestTableRepository();
23+
_repository = new Repository<TestTableInfo>(EnvUtils.DatabaseType, EnvUtils.ConnectionString);
2224
}
2325

2426
[SkippableFact, TestPriority(0)]
@@ -53,15 +55,13 @@ public void Start()
5355
var lockedColumn = tableColumns.FirstOrDefault(x => x.AttributeName == nameof(TestTableInfo.Locked));
5456
Assert.Null(lockedColumn);
5557

56-
var isExists = DatorySql.IsTableExists(EnvUtils.DatabaseType, EnvUtils.ConnectionString, tableName);
58+
var isExists = DatoryUtils.IsTableExists(EnvUtils.DatabaseType, EnvUtils.ConnectionString, tableName);
5759
if (isExists)
5860
{
59-
DatorySql.DropTable(EnvUtils.DatabaseType, EnvUtils.ConnectionString, tableName);
61+
DatoryUtils.DropTable(EnvUtils.DatabaseType, EnvUtils.ConnectionString, tableName);
6062
}
6163

62-
var created = DatorySql.CreateTable(EnvUtils.DatabaseType, EnvUtils.ConnectionString, tableName, tableColumns, out _, out var sqlString);
63-
_output.WriteLine(sqlString);
64-
Assert.True(created);
64+
DatoryUtils.CreateTable(EnvUtils.DatabaseType, EnvUtils.ConnectionString, tableName, tableColumns);
6565
}
6666

6767
[SkippableFact, TestPriority(1)]
@@ -75,7 +75,7 @@ public void TestInsert()
7575
var dataInfo = new TestTableInfo();
7676
_repository.Insert(dataInfo);
7777
Assert.Equal(1, dataInfo.Id);
78-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
78+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
7979
Assert.True(dataInfo.LastModifiedDate.HasValue);
8080
Assert.Null(dataInfo.VarChar100);
8181
Assert.Null(dataInfo.VarCharDefault);
@@ -96,7 +96,7 @@ public void TestInsert()
9696
};
9797
_repository.Insert(dataInfo);
9898
Assert.Equal(2, dataInfo.Id);
99-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
99+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
100100
Assert.True(dataInfo.LastModifiedDate.HasValue);
101101
Assert.Equal("string", dataInfo.VarChar100);
102102
Assert.Null(dataInfo.VarCharDefault);
@@ -115,10 +115,10 @@ public void TestGet()
115115
{
116116
Skip.IfNot(EnvUtils.IntegrationTestMachine);
117117

118-
var dataInfo = _repository.First(1);
118+
var dataInfo = _repository.Get(1);
119119
Assert.NotNull(dataInfo);
120120
Assert.Equal(1, dataInfo.Id);
121-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
121+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
122122
Assert.True(dataInfo.LastModifiedDate.HasValue);
123123
Assert.Null(dataInfo.VarChar100);
124124
Assert.Null(dataInfo.VarCharDefault);
@@ -131,10 +131,10 @@ public void TestGet()
131131
_output.WriteLine(dataInfo.Guid);
132132
_output.WriteLine(dataInfo.LastModifiedDate.ToString());
133133

134-
dataInfo = _repository.First(2);
134+
dataInfo = _repository.Get(2);
135135
Assert.NotNull(dataInfo);
136136
Assert.Equal(2, dataInfo.Id);
137-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
137+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
138138
Assert.True(dataInfo.LastModifiedDate.HasValue);
139139
Assert.Equal("string", dataInfo.VarChar100);
140140
Assert.Null(dataInfo.VarCharDefault);
@@ -149,10 +149,10 @@ public void TestGetWithParameters()
149149
{
150150
Skip.IfNot(EnvUtils.IntegrationTestMachine);
151151

152-
var dataInfo = _repository.First(new Query().Where(Attr.VarChar100, "string"));
152+
var dataInfo = _repository.Get(new Query().Where(Attr.VarChar100, "string"));
153153
Assert.NotNull(dataInfo);
154154
Assert.Equal(2, dataInfo.Id);
155-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
155+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
156156
Assert.True(dataInfo.LastModifiedDate.HasValue);
157157
Assert.Equal("string", dataInfo.VarChar100);
158158
Assert.Null(dataInfo.VarCharDefault);
@@ -161,10 +161,10 @@ public void TestGetWithParameters()
161161
Assert.Equal(0, dataInfo.Currency);
162162
Assert.True(dataInfo.Date.HasValue);
163163

164-
dataInfo = _repository.First(dataInfo.Guid);
164+
dataInfo = _repository.Get(dataInfo.Guid);
165165
Assert.NotNull(dataInfo);
166166
Assert.Equal(2, dataInfo.Id);
167-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
167+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
168168
Assert.True(dataInfo.LastModifiedDate.HasValue);
169169
Assert.Equal("string", dataInfo.VarChar100);
170170
Assert.Null(dataInfo.VarCharDefault);
@@ -173,10 +173,10 @@ public void TestGetWithParameters()
173173
Assert.Equal(0, dataInfo.Currency);
174174
Assert.True(dataInfo.Date.HasValue);
175175

176-
dataInfo = _repository.First(dataInfo.Guid);
176+
dataInfo = _repository.Get(dataInfo.Guid);
177177
Assert.NotNull(dataInfo);
178178
Assert.Equal(2, dataInfo.Id);
179-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
179+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
180180
Assert.True(dataInfo.LastModifiedDate.HasValue);
181181
Assert.Equal("string", dataInfo.VarChar100);
182182
Assert.Null(dataInfo.VarCharDefault);
@@ -185,10 +185,10 @@ public void TestGetWithParameters()
185185
Assert.Equal(0, dataInfo.Currency);
186186
Assert.True(dataInfo.Date.HasValue);
187187

188-
dataInfo = _repository.First(new Query().Where(Attr.VarChar100, "not exists"));
188+
dataInfo = _repository.Get(new Query().Where(Attr.VarChar100, "not exists"));
189189
Assert.Null(dataInfo);
190190

191-
dataInfo = _repository.First(new Query());
191+
dataInfo = _repository.Get(new Query());
192192
Assert.NotNull(dataInfo);
193193
}
194194

@@ -225,39 +225,39 @@ public void TestGetValue()
225225
{
226226
Skip.IfNot(EnvUtils.IntegrationTestMachine);
227227

228-
var guid = _repository.GetValue<string>(new Query()
229-
.Select(nameof(DynamicEntity.Guid)).Where("Id", 1));
230-
Assert.True(DatoryUtils.IsGuid(guid));
228+
var guid = _repository.Get<string>(new Query()
229+
.Select(nameof(Entity.Guid)).Where("Id", 1));
230+
Assert.True(ConvertUtils.IsGuid(guid));
231231

232-
var date = _repository.GetValue<DateTime?>(new Query()
232+
var date = _repository.Get<DateTime?>(new Query()
233233
.Select(nameof(TestTableInfo.Date)).Where("Guid", guid));
234234
Assert.False(date.HasValue);
235235

236-
var lastModifiedDate = _repository.GetValue<DateTime?>(new Query()
236+
var lastModifiedDate = _repository.Get<DateTime?>(new Query()
237237
.Select(nameof(TestTableInfo.LastModifiedDate))
238238
.Where("Guid", guid));
239239
Assert.True(lastModifiedDate.HasValue);
240-
_output.WriteLine(lastModifiedDate.Value.ToString());
240+
_output.WriteLine(lastModifiedDate.Value.ToString(CultureInfo.InvariantCulture));
241241
}
242242

243243
[SkippableFact, TestPriority(2)]
244244
public void TestGetValues()
245245
{
246246
Skip.IfNot(EnvUtils.IntegrationTestMachine);
247247

248-
var guidList = _repository.GetValueList<string>(new Query()
248+
var guidList = _repository.GetAll<string>(new Query()
249249
.Select(nameof(TestTableInfo.Guid))
250250
.Where("Id", 1)).ToList();
251251

252252
Assert.NotNull(guidList);
253-
Assert.True(DatoryUtils.IsGuid(guidList.First()));
253+
Assert.True(ConvertUtils.IsGuid(guidList.First()));
254254

255-
var dateList = _repository.GetValueList<DateTime?>(new Query()
255+
var dateList = _repository.GetAll<DateTime?>(new Query()
256256
.Select(nameof(TestTableInfo.Date))
257257
.Where("Guid", guidList.First())).ToList();
258258
Assert.False(dateList.First().HasValue);
259259

260-
var lastModifiedDateList = _repository.GetValueList<DateTime?>(new Query()
260+
var lastModifiedDateList = _repository.GetAll<DateTime?>(new Query()
261261
.Select(nameof(TestTableInfo.LastModifiedDate))
262262
.Where("Id", 1)).ToList();
263263
Assert.True(lastModifiedDateList.First().HasValue);
@@ -282,18 +282,18 @@ public void TestUpdate()
282282
{
283283
Skip.IfNot(EnvUtils.IntegrationTestMachine);
284284

285-
var dataInfo = _repository.First(1);
285+
var dataInfo = _repository.Get(1);
286286
Assert.True(dataInfo.LastModifiedDate.HasValue);
287287
var lastModified = dataInfo.LastModifiedDate.Value.Ticks;
288288

289289
dataInfo.Content = "new content";
290290
dataInfo.LastModifiedDate = DateTime.Now.AddDays(-1);
291291

292-
var updated = _repository.UpdateObject(dataInfo);
292+
var updated = _repository.Update(dataInfo);
293293
Assert.True(updated);
294294

295295
Assert.Equal(1, dataInfo.Id);
296-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
296+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
297297
Assert.True(dataInfo.LastModifiedDate.HasValue);
298298
Assert.Null(dataInfo.VarChar100);
299299
Assert.Null(dataInfo.VarCharDefault);
@@ -308,7 +308,7 @@ public void TestUpdate()
308308
_output.WriteLine(lastModified2.ToString());
309309
Assert.True(lastModified2 > lastModified);
310310

311-
updated = _repository.UpdateObject(null);
311+
updated = _repository.Update((TestTableInfo)null);
312312
Assert.False(updated);
313313
}
314314

@@ -317,22 +317,22 @@ public void TestUpdateWithParameters()
317317
{
318318
Skip.IfNot(EnvUtils.IntegrationTestMachine);
319319

320-
var lastModified = _repository.GetValue<DateTime?>(new Query()
321-
.Select(nameof(DynamicEntity.LastModifiedDate)).Where("Id", 1));
320+
var lastModified = _repository.Get<DateTime?>(new Query()
321+
.Select(nameof(Entity.LastModifiedDate)).Where("Id", 1));
322322
Assert.True(lastModified.HasValue);
323323

324-
var updated = _repository.UpdateAll(new Query()
324+
var updated = _repository.Update(new Query()
325325
.Set("Content", "new content2")
326326
.Set("LastModifiedDate", DateTime.Now.AddDays(-1))
327327
.Where(nameof(Attr.Id), 1));
328328
Assert.True(updated == 1);
329329

330-
var dataInfo = _repository.First(1);
330+
var dataInfo = _repository.Get(1);
331331
Assert.True(dataInfo.LastModifiedDate.HasValue);
332332
var lastModified2 = dataInfo.LastModifiedDate.Value.Ticks;
333333

334334
Assert.Equal(1, dataInfo.Id);
335-
Assert.True(DatoryUtils.IsGuid(dataInfo.Guid));
335+
Assert.True(ConvertUtils.IsGuid(dataInfo.Guid));
336336
Assert.True(dataInfo.LastModifiedDate.HasValue);
337337
Assert.Null(dataInfo.VarChar100);
338338
Assert.Null(dataInfo.VarCharDefault);
@@ -344,7 +344,7 @@ public void TestUpdateWithParameters()
344344

345345
Assert.True(lastModified2 > lastModified.Value.Ticks);
346346

347-
updated = _repository.UpdateAll(new Query());
347+
updated = _repository.Update(new Query());
348348
Assert.True(updated == 2);
349349
}
350350

@@ -353,52 +353,49 @@ public void TestUpdateAll()
353353
{
354354
Skip.IfNot(EnvUtils.IntegrationTestMachine);
355355

356-
var lastModified = _repository.GetValue<DateTime?>(new Query()
357-
.Select(nameof(DynamicEntity.LastModifiedDate))
356+
var lastModified = _repository.Get<DateTime?>(new Query()
357+
.Select(nameof(Entity.LastModifiedDate))
358358
.Where("Id", 1));
359359
Assert.True(lastModified.HasValue);
360360

361-
var updatedCount = _repository.UpdateAll(new Query()
361+
var updatedCount = _repository.Update(new Query()
362362
.Set("Content", "new content2")
363363
.Set("LastModifiedDate", DateTime.Now.AddDays(-1))
364364
.Where("Id", 1));
365365

366366
Assert.True(updatedCount == 1);
367367

368-
updatedCount = _repository.UpdateAll(new Query()
368+
updatedCount = _repository.Update(new Query()
369369
.Set("Content", "new content3")
370370
.Where("Content", "new content2"));
371371

372372
Assert.True(updatedCount == 1);
373373

374-
var dataInfo = _repository.First(1);
374+
var dataInfo = _repository.Get(1);
375375
Assert.True(dataInfo.LastModifiedDate.HasValue);
376376
var lastModified2 = dataInfo.LastModifiedDate.Value.Ticks;
377377

378378
Assert.True(lastModified2 > lastModified.Value.Ticks);
379-
380-
updatedCount = _repository.UpdateAll(null);
381-
Assert.True(updatedCount == 2);
382379
}
383380

384381
[SkippableFact, TestPriority(3)]
385382
public void TestIncrementAll()
386383
{
387384
Skip.IfNot(EnvUtils.IntegrationTestMachine);
388385

389-
var dataInfo = _repository.First(1);
386+
var dataInfo = _repository.Get(1);
390387
Assert.Equal(0, dataInfo.Num);
391388

392-
var affected = _repository.IncrementAll(Attr.Num, new Query().Where(Attr.Id, 1));
389+
var affected = _repository.Increment(new Query().Select(Attr.Num).Where(Attr.Id, 1));
393390
Assert.True(affected == 1);
394391

395-
dataInfo = _repository.First(1);
392+
dataInfo = _repository.Get(1);
396393
Assert.Equal(1, dataInfo.Num);
397394

398-
affected = _repository.DecrementAll(Attr.Num, new Query().Where(Attr.Id, 1));
395+
affected = _repository.Decrement(new Query().Select(Attr.Num).Where(Attr.Id, 1));
399396
Assert.True(affected == 1);
400397

401-
dataInfo = _repository.First(1);
398+
dataInfo = _repository.Get(1);
402399
Assert.Equal(0, dataInfo.Num);
403400
}
404401

@@ -419,7 +416,7 @@ public void End()
419416
{
420417
Skip.IfNot(EnvUtils.IntegrationTestMachine);
421418

422-
DatorySql.DropTable(EnvUtils.DatabaseType, EnvUtils.ConnectionString, _repository.TableName);
419+
DatoryUtils.DropTable(EnvUtils.DatabaseType, EnvUtils.ConnectionString, _repository.TableName);
423420
}
424421
}
425422
}

‎Datory.Tests/Core/ReflectionUtilsTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Xunit;
1+
using Datory.Utils;
2+
using Xunit;
23

34
namespace Datory.Tests.Core
45
{

0 commit comments

Comments
 (0)
0