Skip to content

Commit e8c8b1e

Browse files
decriptordecriptor
committed
Avoid allocating empty arrays
CA1825: Avoid zero-length array allocations https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1825
1 parent c853d26 commit e8c8b1e

Some content is hidden

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

50 files changed

+127
-116
lines changed

‎src/TaglibSharp.Tests/Images/AddImageMetadataTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static void AddXMPTest2 (string sample_file, string tmp_file, bool contai
108108
xmp_tag.Comment = null;
109109
xmp_tag.Software = test_comment;
110110

111-
Assert.AreEqual (new string[] { }, xmp_tag.Keywords);
111+
Assert.AreEqual (Array.Empty<string> (), xmp_tag.Keywords);
112112
Assert.AreEqual (null, xmp_tag.Comment);
113113
Assert.AreEqual (test_comment, xmp_tag.Software);
114114

@@ -119,7 +119,7 @@ public static void AddXMPTest2 (string sample_file, string tmp_file, bool contai
119119
xmp_tag = file.GetTag (TagTypes.XMP, false) as XmpTag;
120120
Assert.IsNotNull (xmp_tag, "XMP Tag not read");
121121

122-
Assert.AreEqual (new string[] { }, xmp_tag.Keywords);
122+
Assert.AreEqual (Array.Empty<string> (), xmp_tag.Keywords);
123123
Assert.AreEqual (null, xmp_tag.Comment);
124124
Assert.AreEqual (test_comment, xmp_tag.Software);
125125
}

‎src/TaglibSharp.Tests/Images/CopyFromTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public void TestJPGtoTIFF ()
2121
Assert.AreEqual (TagTypes.TiffIFD | TagTypes.XMP, file2.TagTypes);
2222
Assert.AreEqual ("%test comment%", file1.ImageTag.Comment);
2323
Assert.AreEqual (string.Empty, file2.ImageTag.Comment);
24-
Assert.AreEqual (new string[] { }, file1.ImageTag.Keywords);
25-
Assert.AreEqual (new string[] { }, file2.ImageTag.Keywords);
24+
Assert.AreEqual (Array.Empty<string> (), file1.ImageTag.Keywords);
25+
Assert.AreEqual (Array.Empty<string> (), file2.ImageTag.Keywords);
2626
Assert.AreEqual (null, file1.ImageTag.Rating);
2727
Assert.AreEqual (0, file2.ImageTag.Rating);
2828
Assert.AreEqual (new DateTime (2009, 8, 9, 19, 12, 44), (DateTime)file1.ImageTag.DateTime);
@@ -62,8 +62,8 @@ public void TestJPGtoTIFF ()
6262
Assert.AreEqual (TagTypes.TiffIFD | TagTypes.XMP, file2.TagTypes);
6363
Assert.AreEqual ("%test comment%", file1.ImageTag.Comment);
6464
Assert.AreEqual ("%test comment%", file2.ImageTag.Comment);
65-
Assert.AreEqual (new string[] { }, file1.ImageTag.Keywords);
66-
Assert.AreEqual (new string[] { }, file2.ImageTag.Keywords);
65+
Assert.AreEqual (Array.Empty<string> (), file1.ImageTag.Keywords);
66+
Assert.AreEqual (Array.Empty<string> (), file2.ImageTag.Keywords);
6767
Assert.AreEqual (null, file1.ImageTag.Rating);
6868
Assert.AreEqual (null, file2.ImageTag.Rating);
6969
Assert.AreEqual (new DateTime (2009, 8, 9, 19, 12, 44), (DateTime)file1.ImageTag.DateTime);

‎src/TaglibSharp.Tests/Images/GifExiftoolLongCommentTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Test ()
2020
true,
2121
new GifExiftoolLongCommentTestInvariantValidator (),
2222
NoModificationValidator.Instance,
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true),
23+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true),
2424
new CommentModificationValidator (long_comment_orig),
2525
new CommentModificationValidator (long_comment_orig, long_comment_test),
2626
new TagCommentModificationValidator (long_comment_orig, TagTypes.GifComment, true),

‎src/TaglibSharp.Tests/Images/GifExiftoolTangled3Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void Test ()
1919
true,
2020
new GifExiftoolTangled3TestInvariantValidator (),
2121
NoModificationValidator.Instance,
22-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, false),
22+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, false),
2323
new CommentModificationValidator ("Created with GIMP"),
2424
new TagCommentModificationValidator ("Created with GIMP", TagTypes.GifComment, true),
2525
new RemoveMetadataValidator (TagTypes.GifComment)

‎src/TaglibSharp.Tests/Images/ImageTagTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void TestXMPImageTag ()
2020
Assert.IsNotNull (tag);
2121

2222
Assert.AreEqual (null, tag.Comment, "Comment");
23-
Assert.AreEqual (new string[] { }, tag.Keywords, "Keywords");
23+
Assert.AreEqual (Array.Empty<string> (), tag.Keywords, "Keywords");
2424
Assert.AreEqual (0, tag.Rating, "Rating");
2525
Assert.AreEqual (null, tag.DateTime, "DateTime");
2626
Assert.AreEqual (ImageOrientation.None, tag.Orientation, "Orientation");

‎src/TaglibSharp.Tests/Images/JpegNikon1Bibble5Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Test ()
2020
new CommentModificationValidator (string.Empty),
2121
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2222
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
23+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2424
);
2525
}
2626
}

‎src/TaglibSharp.Tests/Images/JpegNikon2Bibble5Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Test ()
2020
new CommentModificationValidator (string.Empty),
2121
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2222
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
23+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2424
);
2525
}
2626
}

‎src/TaglibSharp.Tests/Images/JpegOlympus2Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void CheckXMP (File file)
165165

166166
Assert.IsNotNull (tag, "tag");
167167

168-
Assert.AreEqual (new string[] { }, tag.Keywords);
168+
Assert.AreEqual (Array.Empty<string> (), tag.Keywords);
169169
Assert.AreEqual ("OLYMPUS CORPORATION", tag.Make);
170170
Assert.AreEqual ("C5060WZ", tag.Model);
171171
Assert.AreEqual ("Adobe Photoshop Elements 4.0", tag.Software);

‎src/TaglibSharp.Tests/Images/PefPentaxKd10Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void ValidateMetadataInvariants (TagLib.Image.File file)
3030
var imagetag = file.ImageTag;
3131
Assert.IsNotNull (imagetag);
3232
Assert.AreEqual (String.Empty, imagetag.Comment, "Comment");
33-
Assert.AreEqual (new string[] { }, imagetag.Keywords, "Keywords");
33+
Assert.AreEqual (Array.Empty<string> (), imagetag.Keywords, "Keywords");
3434
Assert.AreEqual (null, imagetag.Rating, "Rating");
3535
Assert.AreEqual (TagLib.Image.ImageOrientation.LeftBottom, imagetag.Orientation, "Orientation");
3636
Assert.AreEqual ("K10D Ver 1.31 ", imagetag.Software, "Software");

‎src/TaglibSharp.Tests/Images/RawLeicaDigilux2Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void ValidateMetadataInvariants (TagLib.Image.File file)
2626
var imagetag = file.ImageTag;
2727
Assert.IsNotNull (imagetag);
2828
Assert.AreEqual (String.Empty, imagetag.Comment, "Comment");
29-
Assert.AreEqual (new string[] { }, imagetag.Keywords, "Keywords");
29+
Assert.AreEqual (Array.Empty<string> (), imagetag.Keywords, "Keywords");
3030
Assert.AreEqual (null, imagetag.Rating, "Rating");
3131
Assert.AreEqual (TagLib.Image.ImageOrientation.TopLeft, imagetag.Orientation, "Orientation");
3232
Assert.AreEqual (null, imagetag.Software, "Software");

0 commit comments

Comments
 (0)