Browse Source

Cosmetics

Piotr Czajkowski 2 years ago
parent
commit
e7f151bcbe

+ 1 - 4
analyzeJSON/AnalyzeJSON.cs

@@ -29,10 +29,7 @@ namespace analyzeJSON
 
         public static string GetNameFromPath(string tokenPath)
         {
-            if (string.IsNullOrWhiteSpace(tokenPath))
-                return string.Empty;
-
-            return tokenPath.Split(".").Last();
+            return string.IsNullOrWhiteSpace(tokenPath) ? string.Empty : tokenPath.Split(".").Last();
         }
 
         private void Traverse(IJEnumerable<JToken> tokens, Action<JToken> action)

+ 1 - 1
analyzeJSON/AnalyzeStructure.cs

@@ -17,7 +17,7 @@ namespace analyzeJSON
 
         public void AnalyzeToken(JToken token)
         {
-            if (token.Type == JTokenType.Object || token.Type == JTokenType.Array)
+            if (token.Type is JTokenType.Object or JTokenType.Array)
                 return;
 
             var tokenName = AnalyzeJSON.GetNameFromPath(token.Path);

+ 1 - 1
analyzeJSONTests/AnalyzeJSONIntegrationTests.cs

@@ -10,7 +10,7 @@ namespace analyzeJSONTests
         [Fact]
         public void AnalyzeJSON_AllGood()
         {
-            var test = new AnalyzeJSON(testFile);
+            _ = new AnalyzeJSON(testFile);
         }
     }
 }

+ 8 - 4
analyzeJSONTests/AnalyzeJSONUnitTests.cs

@@ -22,8 +22,10 @@ namespace analyzeJSONTests
         [Fact]
         public void Traverse_NullAction()
         {
-            var jObject = new JObject();
-            jObject.Add("test", new JObject());
+            var jObject = new JObject
+            {
+                { "test", new JObject() }
+            };
             var test = new AnalyzeJSON(jObject);
 
             var result = test.Traverse(null);
@@ -34,8 +36,10 @@ namespace analyzeJSONTests
         [Fact]
         public void Traverse_AllGood()
         {
-            var jObject = new JObject();
-            jObject.Add("test", new JObject());
+            var jObject = new JObject
+            {
+                { "test", new JObject() }
+            };
             var test = new AnalyzeJSON(jObject);
 
             var result = test.Traverse((token) => Console.WriteLine(token));

+ 3 - 1
analyzeJSONTests/AnalyzeStructureIntegrationTests.cs

@@ -12,7 +12,9 @@ namespace analyzeJSONTests
         {
             var test = new AnalyzeJSON(testFile);
             var analyze = new AnalyzeStructure();
-            test.Traverse((token) => analyze.AnalyzeToken(token));
+            var status = test.Traverse((token) => analyze.AnalyzeToken(token));
+            Assert.True(status.Success);
+            Assert.Empty(status.Message);
 
             var result = analyze.Result;
             Assert.Equal(9, result.Nodes.Count);

+ 2 - 2
analyzeJSONTests/AnalyzeStructureUnitTests.cs

@@ -21,8 +21,8 @@ namespace analyzeJSONTests
             analyze.AnalyzeToken(node);
 
             var result = analyze.Result;
-            Assert.Single(result.Nodes);
-            Assert.Single(result.Leafs);
+            _ = Assert.Single(result.Nodes);
+            _ = Assert.Single(result.Leafs);
         }
     }
 }

+ 3 - 1
analyzeJSONTests/StatisticsIntegrationTests.cs

@@ -13,7 +13,9 @@ namespace analyzeJSONTests
             var test = new AnalyzeJSON(testFile);
             var stats = new Statistics();
 
-            test.Traverse((token) => stats.RunStatistics(token));
+            var status = test.Traverse((token) => stats.RunStatistics(token));
+            Assert.True(status.Success);
+            Assert.Empty(status.Message);
             Assert.Equal(10, stats.Result.NodeCounts.Count);
             Assert.Equal(165, stats.Result.TotalWordCount);
         }