fix: fix the "Non-nullable" warnings for QaseExporter.

testit-tms · Jan 10, 2025 · 5bc0713 · 5bc0713
1 parent b8467ab
commit 5bc0713
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 77 deletions.
diff --git a/Migrators/QaseExporter/Client/Client.cs b/Migrators/QaseExporter/Client/Client.cs
@@ -55,7 +55,7 @@ public async Task<QaseProject> GetProject()
         }
 
         var content = await response.Content.ReadAsStringAsync();
-        var projectData = JsonSerializer.Deserialize<QaseProjectData>(content);
+        var projectData = JsonSerializer.Deserialize<QaseProjectData>(content)!;
 
         _logger.LogDebug("Found project {@Project}", projectData.Project);
 
@@ -85,7 +85,7 @@ public async Task<List<QaseSuite>> GetSuites()
             }
 
             var content = await response.Content.ReadAsStringAsync();
-            var suitesData = JsonSerializer.Deserialize<QaseSuitesData>(content);
+            var suitesData = JsonSerializer.Deserialize<QaseSuitesData>(content)!;
 
             if (suitesData.SuitesData.Count > 0)
             {
@@ -130,7 +130,7 @@ public async Task<List<QaseTestCase>> GetTestCasesBySuiteId(int suiteId)
             }
 
             var content = await response.Content.ReadAsStringAsync();
-            var qaseCasesData = JsonSerializer.Deserialize<QaseCasesData>(content);
+            var qaseCasesData = JsonSerializer.Deserialize<QaseCasesData>(content)!;
 
             if (qaseCasesData.CasesData.Count > 0)
             {
@@ -175,7 +175,7 @@ public async Task<List<QaseSharedStep>> GetSharedSteps()
             }
 
             var content = await response.Content.ReadAsStringAsync();
-            var sharedStepData = JsonSerializer.Deserialize<SharedStepData>(content);
+            var sharedStepData = JsonSerializer.Deserialize<SharedStepData>(content)!;
 
             if (sharedStepData.SharedStepsData.Count > 0)
             {
@@ -220,7 +220,7 @@ public async Task<List<QaseCustomField>> GetCustomFields()
             }
 
             var content = await response.Content.ReadAsStringAsync();
-            var fieldsData = JsonSerializer.Deserialize<QaseFieldsData>(content);
+            var fieldsData = JsonSerializer.Deserialize<QaseFieldsData>(content)!;
 
             if (fieldsData.FieldsData.Count > 0)
             {
@@ -257,7 +257,7 @@ public async Task<List<QaseSystemField>> GetSystemFields()
         }
 
         var content = await response.Content.ReadAsStringAsync();
-        var systemFieldsData = JsonSerializer.Deserialize<QaseSysFieldsData>(content);
+        var systemFieldsData = JsonSerializer.Deserialize<QaseSysFieldsData>(content)!;
 
         _logger.LogDebug("Got system fields: {@Fields}", systemFieldsData.Fields);
 

diff --git a/Migrators/QaseExporter/Models/AttributeData.cs b/Migrators/QaseExporter/Models/AttributeData.cs
@@ -4,11 +4,11 @@ namespace QaseExporter.Models;
 
 public class AttributeData
 {
-    public List<Attribute> Attributes { get; set; }
+    public List<Attribute> Attributes { get; set; } = new();
 
-    public Dictionary<QaseCustomField, Guid> CustomAttributeMap { get; set; }
+    public Dictionary<QaseCustomField, Guid> CustomAttributeMap { get; set; } = new();
 
-    public Dictionary<QaseSystemField, Guid> SystemAttributeMap { get; set; }
+    public Dictionary<QaseSystemField, Guid> SystemAttributeMap { get; set; } = new();
 
-    public Dictionary<string, Attribute> AttributeMap { get; set; }
+    public Dictionary<string, Attribute> AttributeMap { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Models/QaseAttachment.cs b/Migrators/QaseExporter/Models/QaseAttachment.cs
@@ -8,17 +8,17 @@ public class QaseAttachment
     public int Size { get; set; }
 
     [JsonPropertyName("mime")]
-    public string Type { get; set; }
+    public string Type { get; set; } = null!;
 
     [JsonPropertyName("filename")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 
     [JsonPropertyName("url")]
-    public string Url { get; set; }
+    public string Url { get; set; } = null!;
 }
 
 public class QaseDescriptionData
 {
-    public string Description { get; set; }
-    public List<QaseAttachment> Attachments { get; set; }
+    public string? Description { get; set; }
+    public List<QaseAttachment> Attachments { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Models/QaseBaseField.cs b/Migrators/QaseExporter/Models/QaseBaseField.cs
@@ -5,13 +5,13 @@ namespace QaseExporter.Models;
 public class QaseBaseField
 {
     [JsonPropertyName("title")]
-    public string Title { get; set; }
+    public string Title { get; set; } = null!;
 
     [JsonPropertyName("is_required")]
     public bool Required { get; set; }
 
     [JsonPropertyName("options")]
-    public List<QaseOption>? Options { get; set; }
+    public List<QaseOption> Options { get; set; } = new();
 }
 
 public class QaseOption
@@ -20,5 +20,5 @@ public class QaseOption
     public int Id { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; set; }
+    public string Title { get; set; } = null!;
 }
diff --git a/Migrators/QaseExporter/Models/QaseCustomField.cs b/Migrators/QaseExporter/Models/QaseCustomField.cs
@@ -8,10 +8,10 @@ public class QaseCustomField : QaseBaseField
     public int Id { get; set; }
 
     [JsonPropertyName("type")]
-    public string Type { get; set; }
+    public string Type { get; set; } = null!;
 
     [JsonPropertyName("value")]
-    public string Value { get; set; }
+    public string Value { get; set; } = null!;
 }
 
 public class QaseFields
@@ -26,11 +26,11 @@ public class QaseFields
     public int Filtered { get; set; }
 
     [JsonPropertyName("entities")]
-    public List<QaseCustomField> Fields { get; set; }
+    public List<QaseCustomField> Fields { get; set; } = new();
 }
 
 public class QaseFieldsData
 {
     [JsonPropertyName("result")]
-    public QaseFields FieldsData { get; set; }
+    public QaseFields FieldsData { get; set; } = null!;
 }
diff --git a/Migrators/QaseExporter/Models/QaseProject.cs b/Migrators/QaseExporter/Models/QaseProject.cs
@@ -5,14 +5,14 @@ namespace QaseExporter.Models;
 public class QaseProject
 {
     [JsonPropertyName("code")]
-    public string Key { get; set; }
+    public string Key { get; set; } = null!;
 
     [JsonPropertyName("title")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 }
 
 public class QaseProjectData
 {
     [JsonPropertyName("result")]
-    public QaseProject Project { get; set; }
+    public QaseProject Project { get; set; } = null!;
 }
diff --git a/Migrators/QaseExporter/Models/QaseSharedStep.cs b/Migrators/QaseExporter/Models/QaseSharedStep.cs
@@ -5,13 +5,13 @@ namespace QaseExporter.Models;
 public class QaseSharedStep
 {
     [JsonPropertyName("hash")]
-    public string Hash { get; set; }
+    public string Hash { get; set; } = null!;
 
     [JsonPropertyName("title")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 
     [JsonPropertyName("steps")]
-    public List<QaseStep> Steps { get; set; }
+    public List<QaseStep> Steps { get; set; } = new();
 }
 
 public class QaseSharedSteps
@@ -26,11 +26,11 @@ public class QaseSharedSteps
     public int Filtered { get; set; }
 
     [JsonPropertyName("entities")]
-    public List<QaseSharedStep> SharedSteps { get; set; }
+    public List<QaseSharedStep> SharedSteps { get; set; } = new();
 }
 
 public class SharedStepData
 {
     [JsonPropertyName("result")]
-    public QaseSharedSteps SharedStepsData { get; set; }
+    public QaseSharedSteps SharedStepsData { get; set; } = null!;
 }
diff --git a/Migrators/QaseExporter/Models/QaseStep.cs b/Migrators/QaseExporter/Models/QaseStep.cs
@@ -5,7 +5,7 @@ namespace QaseExporter.Models;
 public class QaseStep
 {
     [JsonPropertyName("action")]
-    public string Action { get; set; }
+    public string Action { get; set; } = null!;
 
     [JsonPropertyName("expected_result")]
     public string? ExpectedResult { get; set; }
@@ -26,5 +26,5 @@ public class QaseStep
     public string? SharedStepNestedHash { get; set; }
 
     [JsonPropertyName("attachments")]
-    public List<QaseAttachment> Attachments { get; set; }
+    public List<QaseAttachment> Attachments { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Models/QaseSuite.cs b/Migrators/QaseExporter/Models/QaseSuite.cs
@@ -8,13 +8,13 @@ public class QaseSuite
     public int Id { get; set; }
 
     [JsonPropertyName("title")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 
     [JsonPropertyName("description")]
-    public string Description { get; set; }
+    public string Description { get; set; } = null!;
 
     [JsonPropertyName("preconditions")]
-    public string Preconditions { get; set; }
+    public string Preconditions { get; set; } = null!;
 
     [JsonPropertyName("cases_count")]
     public int CasesCount { get; set; }
@@ -35,11 +35,11 @@ public class QaseSuites
     public int Filtered { get; set; }
 
     [JsonPropertyName("entities")]
-    public List<QaseSuite> Suites { get; set; }
+    public List<QaseSuite> Suites { get; set; } = new();
 }
 
 public class QaseSuitesData
 {
     [JsonPropertyName("result")]
-    public QaseSuites SuitesData { get; set; }
+    public QaseSuites SuitesData { get; set; } = null!;
 }
diff --git a/Migrators/QaseExporter/Models/QaseSystemField.cs b/Migrators/QaseExporter/Models/QaseSystemField.cs
@@ -11,5 +11,5 @@ public class QaseSystemField : QaseBaseField
 public class QaseSysFieldsData
 {
     [JsonPropertyName("result")]
-    public List<QaseSystemField> Fields { get; set; }
+    public List<QaseSystemField> Fields { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Models/QaseTag.cs b/Migrators/QaseExporter/Models/QaseTag.cs
@@ -5,7 +5,7 @@ namespace QaseExporter.Models;
 public class QaseTag
 {
     [JsonPropertyName("title")]
-    public string Title { get; set; }
+    public string Title { get; set; } = null!;
 
     [JsonPropertyName("internal_id")]
     public int InternalId { get; set; }

diff --git a/Migrators/QaseExporter/Models/QaseTestCase.cs b/Migrators/QaseExporter/Models/QaseTestCase.cs
@@ -9,16 +9,16 @@ public class QaseTestCase
     public int Id { get; set; }
 
     [JsonPropertyName("title")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
 
     [JsonPropertyName("description")]
-    public string Description { get; set; }
+    public string Description { get; set; } = null!;
 
     [JsonPropertyName("preconditions")]
-    public string Preconditions { get; set; }
+    public string Preconditions { get; set; } = null!;
 
     [JsonPropertyName("postconditions")]
-    public string Postconditions { get; set; }
+    public string Postconditions { get; set; } = null!;
 
     [JsonPropertyName("status")]
     public int Status { get; set; }
@@ -36,22 +36,22 @@ public class QaseTestCase
     //public List<QaseLink> Links { get; set; }
 
     [JsonPropertyName("steps")]
-    public List<QaseStep> Steps { get; set; }
+    public List<QaseStep> Steps { get; set; } = new();
 
     [JsonPropertyName("custom_fields")]
-    public List<QaseCustomFieldValues> CustomFields { get; set; }
+    public List<QaseCustomFieldValues> CustomFields { get; set; } = new();
 
     [JsonPropertyName("params")]
-    public object Parameters { get; set; }
+    public object Parameters { get; set; } = null!;
 
     [JsonPropertyName("steps_type")]
-    public string StepsType { get; set; }
+    public string StepsType { get; set; } = null!;
 
     [JsonPropertyName("attachments")]
-    public List<QaseAttachment> Attachments { get; set; }
+    public List<QaseAttachment> Attachments { get; set; } = new();
 
     [JsonPropertyName("tags")]
-    public List<QaseTag> Tags { get; set; }
+    public List<QaseTag> Tags { get; set; } = new();
 
     [JsonPropertyName("type")]
     public int Type { get; set; }
@@ -78,7 +78,7 @@ public class QaseCustomFieldValues
     public int FieldId { get; set; }
 
     [JsonPropertyName("value")]
-    public string Value { get; set; }
+    public string Value { get; set; } = null!;
 }
 
 public class QaseCases
@@ -93,11 +93,11 @@ public class QaseCases
     public int Filtered { get; set; }
 
     [JsonPropertyName("entities")]
-    public List<QaseTestCase> Cases { get; set; }
+    public List<QaseTestCase> Cases { get; set; } = new();
 }
 
 public class QaseCasesData
 {
     [JsonPropertyName("result")]
-    public QaseCases CasesData { get; set; }
+    public QaseCases CasesData { get; set; } = null!;
 }
diff --git a/Migrators/QaseExporter/Models/SectionData.cs b/Migrators/QaseExporter/Models/SectionData.cs
@@ -4,6 +4,6 @@ namespace QaseExporter.Models;
 
 public class SectionData
 {
-    public Section MainSection { get; set; }
-    public Dictionary<int, Guid> SectionMap { get; set; }
+    public Section MainSection { get; set; } = null!;
+    public Dictionary<int, Guid> SectionMap { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Models/StepsData.cs b/Migrators/QaseExporter/Models/StepsData.cs
@@ -4,6 +4,6 @@ namespace QaseExporter.Models;
 
 public class StepsData
 {
-    public List<Step> Steps { get; set; }
-    public List<Iteration> Iterations { get; set; }
+    public List<Step> Steps { get; set; } = new();
+    public List<Iteration> Iterations { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Models/TestCaseData.cs b/Migrators/QaseExporter/Models/TestCaseData.cs
@@ -5,6 +5,6 @@ namespace QaseExporter.Models;
 
 public class TestCaseData
 {
-    public List<TestCase> TestCases { get; set; }
-    public List<Attribute> Attributes { get; set; }
+    public List<TestCase> TestCases { get; set; } = new();
+    public List<Attribute> Attributes { get; set; } = new();
 }
diff --git a/Migrators/QaseExporter/Services/AttributeService.cs b/Migrators/QaseExporter/Services/AttributeService.cs
@@ -83,9 +83,9 @@ public async Task<AttributeData> ConvertAttributes()
 
             if (attribute.Type == AttributeType.Options || attribute.Type == AttributeType.MultipleOptions)
             {
-                customField.Options = JsonSerializer.Deserialize<List<QaseOption>>(customField.Value);
+                customField.Options = JsonSerializer.Deserialize<List<QaseOption>>(customField.Value)!;
 
-                if (customField.Options == null)
+                if (customField.Options.Count == 0)
                 {
                     _logger.LogError("Problems converting the value {Value} to options for the custom field {Name}", customField.Value, customField.Title);
 

diff --git a/Migrators/QaseExporter/Services/SectionService.cs b/Migrators/QaseExporter/Services/SectionService.cs
@@ -18,6 +18,7 @@ public SectionService(ILogger<SectionService> logger, IClient client)
         _logger = logger;
         _client = client;
         _sectionMap = new Dictionary<int, Guid>();
+        _allSuites = new List<QaseSuite>();
     }
 
     public async Task<SectionData> ConvertSections()

diff --git a/Migrators/QaseExporter/Services/StepService.cs b/Migrators/QaseExporter/Services/StepService.cs
@@ -132,8 +132,13 @@ private async Task<Step> ConvertStep(QaseStep step, Guid testCaseId)
         return newStep;
     }
 
-    private static string ConvertingStepDescription(string description)
+    private static string ConvertingStepDescription(string? description)
     {
+        if (string.IsNullOrEmpty(description))
+        {
+            return string.Empty;
+        }
+
         return
             Utils.RemoveBackslashCharacters(
             Utils.ConvertingAngleBracketsStr(