Skip to content

Commit 55c816c

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 55c816c

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

+161
-116
lines changed

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

+2-2
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

+4-4
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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TaglibSharp.Tests.Images.Validators;
@@ -20,7 +22,7 @@ public void Test ()
2022
true,
2123
new GifExiftoolLongCommentTestInvariantValidator (),
2224
NoModificationValidator.Instance,
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true),
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true),
2426
new CommentModificationValidator (long_comment_orig),
2527
new CommentModificationValidator (long_comment_orig, long_comment_test),
2628
new TagCommentModificationValidator (long_comment_orig, TagTypes.GifComment, true),

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TaglibSharp.Tests.Images.Validators;
@@ -19,7 +21,7 @@ public void Test ()
1921
true,
2022
new GifExiftoolTangled3TestInvariantValidator (),
2123
NoModificationValidator.Instance,
22-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, false),
24+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, false),
2325
new CommentModificationValidator ("Created with GIMP"),
2426
new TagCommentModificationValidator ("Created with GIMP", TagTypes.GifComment, true),
2527
new RemoveMetadataValidator (TagTypes.GifComment)

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.Image;
@@ -20,7 +22,7 @@ public void TestXMPImageTag ()
2022
Assert.IsNotNull (tag);
2123

2224
Assert.AreEqual (null, tag.Comment, "Comment");
23-
Assert.AreEqual (new string[] { }, tag.Keywords, "Keywords");
25+
Assert.AreEqual (Array.Empty<string> (), tag.Keywords, "Keywords");
2426
Assert.AreEqual (0, tag.Rating, "Rating");
2527
Assert.AreEqual (null, tag.DateTime, "DateTime");
2628
Assert.AreEqual (ImageOrientation.None, tag.Orientation, "Orientation");

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+1-1
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

+1-1
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

+1-1
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");

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -259,7 +261,7 @@ public void ValidateMetadataInvariants (TagLib.Image.File file)
259261
Assert.IsNotNull (entry, "Entry 0x92D6 missing in IFD 0");
260262
Assert.IsNotNull (entry as UndefinedIFDEntry, "Entry is not an undefined IFD entry!");
261263
var parsed_bytes = (entry as UndefinedIFDEntry).Data.Data;
262-
var bytes = new byte[] { };
264+
var bytes = Array.Empty<byte> ();
263265
Assert.AreEqual (bytes, parsed_bytes);
264266
}
265267
// Thumbnail.0x0103 (Compression/Short/1) "6"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void ValidateMetadataInvariants (TagLib.Image.File file)
3333
var imagetag = file.ImageTag;
3434
Assert.IsNotNull (imagetag);
3535
Assert.AreEqual (String.Empty, imagetag.Comment, "Comment");
36-
Assert.AreEqual (new string[] { }, imagetag.Keywords, "Keywords");
36+
Assert.AreEqual (Array.Empty<string> (), imagetag.Keywords, "Keywords");
3737
Assert.AreEqual (null, imagetag.Rating, "Rating");
3838
Assert.AreEqual (TagLib.Image.ImageOrientation.TopLeft, imagetag.Orientation, "Orientation");
3939
Assert.AreEqual (null, imagetag.Software, "Software");

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using TagLib.IFD;
@@ -20,7 +22,7 @@ public void Test ()
2022
new CommentModificationValidator (string.Empty),
2123
new TagCommentModificationValidator (null, TagTypes.TiffIFD, true),
2224
new TagCommentModificationValidator (null, TagTypes.XMP, true),
23-
new TagKeywordsModificationValidator (new string[] { }, TagTypes.XMP, true)
25+
new TagKeywordsModificationValidator (Array.Empty<string> (), TagTypes.XMP, true)
2426
);
2527
}
2628
}

‎src/TaglibSharp.Tests/Images/Validators/KeywordsModificationValidator.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35

@@ -12,7 +14,7 @@ public class KeywordsModificationValidator : IMetadataModificationValidator
1214
readonly string[] orig_keywords;
1315
readonly string[] test_keywords = { "keyword 1", "§$&§%", "99 dsf", "ഈ ヰᛥกツ" };
1416

15-
public KeywordsModificationValidator () : this (new string[] { }) { }
17+
public KeywordsModificationValidator () : this (Array.Empty<string> ()) { }
1618

1719
public KeywordsModificationValidator (string[] orig_keywords)
1820
{

‎src/TaglibSharp.Tests/Images/Validators/TagKeywordsModificationValidator.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35

@@ -12,7 +14,7 @@ public class TagKeywordsModificationValidator : KeywordsModificationValidator
1214
readonly bool tag_present;
1315
readonly TagTypes type;
1416

15-
public TagKeywordsModificationValidator (TagTypes type, bool tag_present) : this (new string[] { }, type, tag_present) { }
17+
public TagKeywordsModificationValidator (TagTypes type, bool tag_present) : this (Array.Empty<string> (), type, tag_present) { }
1618

1719
public TagKeywordsModificationValidator (string[] orig_keywords, TagTypes type, bool tag_present) : base (orig_keywords)
1820
{

‎src/TaglibSharp.Tests/TaggingFormats/ApeTest.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using Tag = TagLib.Ape.Tag;
@@ -61,7 +63,7 @@ public void TestPerformers ()
6163
}
6264
});
6365

64-
tag.Performers = new string[0];
66+
tag.Performers = Array.Empty<string> ();
6567

6668
TagTestWithSave (ref tag, delegate (Tag t, string m) {
6769
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -89,7 +91,7 @@ public void TestAlbumArtists ()
8991
}
9092
});
9193

92-
tag.AlbumArtists = new string[0];
94+
tag.AlbumArtists = Array.Empty<string> ();
9395

9496
TagTestWithSave (ref tag, delegate (Tag t, string m) {
9597
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -117,7 +119,7 @@ public void TestComposers ()
117119
}
118120
});
119121

120-
tag.Composers = new string[0];
122+
tag.Composers = Array.Empty<string> ();
121123

122124
TagTestWithSave (ref tag, delegate (Tag t, string m) {
123125
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -205,7 +207,7 @@ public void TestGenres ()
205207
}
206208
});
207209

208-
tag.Genres = new string[0];
210+
tag.Genres = Array.Empty<string> ();
209211

210212
TagTestWithSave (ref tag, delegate (Tag t, string m) {
211213
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -501,7 +503,7 @@ public void TestPictures ()
501503
}
502504
});
503505

504-
tag.Pictures = new Picture[0];
506+
tag.Pictures = Array.Empty<Picture> ();
505507

506508
TagTestWithSave (ref tag, delegate (Tag t, string m) {
507509
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);

‎src/TaglibSharp.Tests/TaggingFormats/AsfTest.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
13
using NUnit.Framework;
24
using TagLib;
35
using File = TagLib.Asf.File;
@@ -60,7 +62,7 @@ public void TestPerformers ()
6062
}
6163
});
6264

63-
file.Tag.Performers = new string[0];
65+
file.Tag.Performers = Array.Empty<string> ();
6466

6567
TagTestWithSave (ref file, abst, delegate (Tag t, string m) {
6668
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -88,7 +90,7 @@ public void TestAlbumArtists ()
8890
}
8991
});
9092

91-
file.Tag.AlbumArtists = new string[0];
93+
file.Tag.AlbumArtists = Array.Empty<string> ();
9294

9395
TagTestWithSave (ref file, abst, delegate (Tag t, string m) {
9496
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -116,7 +118,7 @@ public void TestComposers ()
116118
}
117119
});
118120

119-
file.Tag.Composers = new string[0];
121+
file.Tag.Composers = Array.Empty<string> ();
120122

121123
TagTestWithSave (ref file, abst, delegate (Tag t, string m) {
122124
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -204,7 +206,7 @@ public void TestGenres ()
204206
}
205207
});
206208

207-
file.Tag.Genres = new string[0];
209+
file.Tag.Genres = Array.Empty<string> ();
208210

209211
TagTestWithSave (ref file, abst, delegate (Tag t, string m) {
210212
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);
@@ -500,7 +502,7 @@ public void TestPictures ()
500502
}
501503
});
502504

503-
file.Tag.Pictures = new Picture[0];
505+
file.Tag.Pictures = Array.Empty<Picture> ();
504506

505507
TagTestWithSave (ref file, abst, delegate (Tag t, string m) {
506508
Assert.IsTrue (t.IsEmpty, "Value Cleared (IsEmpty): " + m);

0 commit comments

Comments
 (0)