Skip to content

Commit 68dd646

Browse files
renemadsenrenemadsen
committed
Code cleanup and fixing timing issue with tests.
1 parent 1c11aa0 commit 68dd646

File tree

5 files changed

+14
-30
lines changed

5 files changed

+14
-30
lines changed

‎eFormCore/Core.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -652,10 +652,10 @@ public async Task<MainElement> TemplateFromXml(string xmlString)
652652
//XML HACK TODO
653653
// xmlString = corrected xml if needed
654654
xmlString = xmlString.Trim();
655-
655+
656656
// Use StringBuilder for efficient string manipulations
657657
StringBuilder sb = new StringBuilder(xmlString);
658-
658+
659659
//xmlString = xmlString.Replace("=\"choose_entity\">", "=\"EntitySearch\">");
660660
sb.Replace("=\"single_select\">", "=\"SingleSelect\">");
661661
sb.Replace("=\"multi_select\">", "=\"MultiSelect\">");
@@ -739,7 +739,7 @@ public async Task<MainElement> TemplateFromXml(string xmlString)
739739
sb.Replace("<DecimalCount />", "<DecimalCount>0</DecimalCount>");
740740
sb.Replace("<DecimalCount/>", "<DecimalCount>0</DecimalCount>");
741741
sb.Replace("<DisplayOrder></DisplayOrder>", "<DisplayOrder>0</DisplayOrder>");
742-
742+
743743
// Convert back to string for regex operations
744744
xmlString = sb.ToString();
745745
var matches = Regex.Matches(xmlString, "<Description>(.*)</Description>");
@@ -2450,8 +2450,6 @@ private async Task<string> DocxToPdf(int caseId, string templateId, string timeS
24502450
{
24512451
foreach (var value in profile.Values)
24522452
{
2453-
Console.WriteLine("{0}({1}): {2}", value.Tag, value.DataType, value);
2454-
24552453
if (value.Tag == ExifTag.Orientation)
24562454
{
24572455
if (value.GetValue().ToString() == "6")
@@ -6196,10 +6194,8 @@ public async Task<bool> DownloadUploadedData(int uploadedDataId)
61966194
{
61976195
foreach (var value in profile.Values)
61986196
{
6199-
Console.WriteLine($"value: {value}");
62006197
if (value.Tag == ExifTag.Orientation)
62016198
{
6202-
Console.WriteLine($"rotate value is {value.GetValue()}");
62036199
if (unit.Manufacturer == "iOS")
62046200
{
62056201
// CW90, Normal, 270 CW, Rotate 180
@@ -6221,7 +6217,6 @@ public async Task<bool> DownloadUploadedData(int uploadedDataId)
62216217
}
62226218
else
62236219
{
6224-
// Console.WriteLine($"rotate value is {value.GetValue()}");
62256220
if (value.GetValue().ToString() == "6")
62266221
{
62276222
image.Rotate(90);
@@ -6274,7 +6269,6 @@ public async Task<bool> DownloadUploadedData(int uploadedDataId)
62746269
{
62756270
if (unit.Manufacturer == "iOS")
62766271
{
6277-
Console.WriteLine($"rotate value is {value.GetValue()}");
62786272
// CW90, Normal, 270 CW, Rotate 180
62796273
if (value.GetValue().ToString() == "6")
62806274
{
@@ -6346,7 +6340,6 @@ public async Task<bool> DownloadUploadedData(int uploadedDataId)
63466340
{
63476341
if (unit.Manufacturer == "iOS")
63486342
{
6349-
Console.WriteLine($"rotate value is {value.GetValue()}");
63506343
// CW90, Normal, 270 CW, Rotate 180
63516344
if (value.GetValue().ToString() == "6")
63526345
{

‎eFormCore/Helpers/TestHelpers.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public TestHelpers(string connectionString)
4848

4949
public async Task GenerateDefaultLanguages()
5050
{
51-
var languages = await dbContext.Languages.ToListAsync();
52-
foreach (var language1 in languages)
53-
{
54-
Console.WriteLine(language1.Name);
55-
}
51+
// var languages = await dbContext.Languages.ToListAsync();
52+
// // foreach (var language1 in languages)
53+
// // {
54+
// // Console.WriteLine(language1.Name);
55+
// // }
5656
language = await dbContext.Languages.FirstOrDefaultAsync(x => x.Name == "Dansk");
5757
}
5858

‎eFormSDK.Base.Tests/DbTestFixture.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ private MicrotingDbContext GetContext(string connectionStr)
7070
[SetUp]
7171
public async Task Setup()
7272
{
73-
Console.WriteLine($"{DateTime.Now} : Starting MariaDb Container...");
7473
await _mariadbTestcontainer.StartAsync();
75-
Console.WriteLine($"{DateTime.Now} : Started MariaDb Container");
7674
ConnectionString = _mariadbTestcontainer.GetConnectionString();
7775

7876
DbContext = GetContext(_mariadbTestcontainer.GetConnectionString());
@@ -91,17 +89,13 @@ public async Task Setup()
9189
try
9290
{
9391
Core core = new Core();
94-
Console.WriteLine($"{DateTime.Now} : StartSqlOnly...");
9592
await core.StartSqlOnly(_mariadbTestcontainer.GetConnectionString());
96-
Console.WriteLine($"{DateTime.Now} : StartSqlOnly close...");
9793
await core.Close();
9894
}
9995
catch
10096
{
10197
AdminTools adminTools = new AdminTools(_mariadbTestcontainer.GetConnectionString());
102-
Console.WriteLine($"{DateTime.Now} : DbSetup...");
10398
await adminTools.DbSetup("abc1234567890abc1234567890abcdef");
104-
Console.WriteLine($"{DateTime.Now} : DbSetup done");
10599
}
106100

107101
await DoSetup();
@@ -110,7 +104,6 @@ public async Task Setup()
110104
[TearDown]
111105
public async Task TearDown()
112106
{
113-
Console.WriteLine($"{DateTime.Now} : TearDown...");
114107
await ClearDb();
115108

116109
ClearFile();
@@ -122,7 +115,6 @@ public async Task TearDown()
122115

123116
private async Task ClearDb()
124117
{
125-
Console.WriteLine($"{DateTime.Now} : ClearDb...");
126118
List<string> modelNames = new List<string>
127119
{
128120
"CaseVersions",
@@ -205,7 +197,6 @@ private async Task ClearDb()
205197
{
206198
if (firstRunNotDone)
207199
{
208-
Console.WriteLine($"{DateTime.Now} : Truncating {modelName}...");
209200
#pragma warning disable CA2100 // Review SQL queries for security vulnerabilities
210201
#pragma warning disable EF1002 // Review SQL queries for security vulnerabilities
211202
await DbContext.Database.ExecuteSqlRawAsync(

‎eFormSDK.Integration.Case.SqlControllerTests/SqlControllerTestCaseReadAllShort.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,22 @@ public async Task SQL_Template_TemplateItemReadAll_DoesSortAccordingly()
9393

9494
#region Template2
9595

96-
CheckList cl2 = await testHelpers.CreateTemplate(DateTime.UtcNow, DateTime.UtcNow, "B", "C",
96+
CheckList cl2 = await testHelpers.CreateTemplate(DateTime.UtcNow.AddSeconds(2), DateTime.UtcNow, "B", "C",
9797
"CheckList", "Template1FolderName", 1, 0);
9898
await cl2.Delete(DbContext);
9999

100100
#endregion
101101

102102
#region Template3
103103

104-
CheckList cl3 = await testHelpers.CreateTemplate(DateTime.UtcNow, DateTime.UtcNow, "D", "B",
104+
CheckList cl3 = await testHelpers.CreateTemplate(DateTime.UtcNow.AddSeconds(3), DateTime.UtcNow, "D", "B",
105105
"CheckList", "Template1FolderName", 1, 0);
106106

107107
#endregion
108108

109109
#region Template4
110110

111-
CheckList cl4 = await testHelpers.CreateTemplate(DateTime.UtcNow, DateTime.UtcNow, "C", "A",
111+
CheckList cl4 = await testHelpers.CreateTemplate(DateTime.UtcNow.AddSeconds(4), DateTime.UtcNow, "C", "A",
112112
"CheckList", "Template1FolderName", 1, 0);
113113

114114
#endregion

‎eFormSDK.Integration.CheckLists.CoreTests/CoreTesteForm.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public async Task Core_Template_TemplateItemReadAll_DoesReturnSortedTemplates()
142142

143143
#region Template2
144144

145-
CheckList cl2 = await testHelpers.CreateTemplate(DateTime.UtcNow, DateTime.UtcNow, "B", "C", "CheckList",
145+
CheckList cl2 = await testHelpers.CreateTemplate(DateTime.UtcNow.AddSeconds(2), DateTime.UtcNow, "B", "C", "CheckList",
146146
"TemplateFolderName", 1, 1);
147147

148148
await cl2.Delete(DbContext);
@@ -151,14 +151,14 @@ public async Task Core_Template_TemplateItemReadAll_DoesReturnSortedTemplates()
151151

152152
#region Template3
153153

154-
CheckList cl3 = await testHelpers.CreateTemplate(DateTime.UtcNow, DateTime.UtcNow, "D", "B", "CheckList",
154+
CheckList cl3 = await testHelpers.CreateTemplate(DateTime.UtcNow.AddSeconds(3), DateTime.UtcNow, "D", "B", "CheckList",
155155
"TemplateFolderName", 1, 1);
156156

157157
#endregion
158158

159159
#region Template4
160160

161-
CheckList cl4 = await testHelpers.CreateTemplate(DateTime.UtcNow, DateTime.UtcNow, "C", "A", "CheckList",
161+
CheckList cl4 = await testHelpers.CreateTemplate(DateTime.UtcNow.AddSeconds(4), DateTime.UtcNow, "C", "A", "CheckList",
162162
"TemplateFolderName", 1, 1);
163163

164164
#endregion

0 commit comments

Comments
 (0)