Skip to content

Commit 8202f80

Browse files
codebudecodebude
committed
Added logo for test cases
Logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909346
1 parent cd3c82a commit 8202f80

File tree

5 files changed

+225
-23
lines changed

5 files changed

+225
-23
lines changed

‎QRCoderTests/QRCodeRendererTests.cs

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,12 @@ public void can_create_standard_qrcode_graphic()
3737
[Fact]
3838
[Category("QRRenderer/QRCode")]
3939
public void can_create_qrcode_with_transparent_logo_graphic()
40-
{
41-
//Create dummy logo
42-
var logo = new Bitmap(32, 32);
43-
var gfx = Graphics.FromImage(logo);
44-
gfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
45-
gfx.FillRectangle(Brushes.Transparent, new Rectangle(0, 0, 32, 32));
46-
gfx.FillEllipse(Brushes.Red, new Rectangle(0, 0, 32, 32));
47-
gfx.Save();
48-
40+
{
4941
//Create QR code
5042
var gen = new QRCodeGenerator();
5143
var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
52-
var bmp = new QRCode(data).GetGraphic(10, Color.Black, Color.Transparent, icon: logo);
44+
var bmp = new QRCode(data).GetGraphic(10, Color.Black, Color.Transparent, icon: Resources.noun_software_engineer_2909346);
45+
//Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909346
5346

5447
var ms = new MemoryStream();
5548
bmp.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
@@ -59,25 +52,18 @@ public void can_create_qrcode_with_transparent_logo_graphic()
5952
var result = BitConverter.ToString(hash).Replace("-", "").ToLower();
6053
ms.Dispose();
6154

62-
result.ShouldBe("8f03d2c3fc5998cebb46658c3e6293b1");
55+
result.ShouldBe("ee65d96c3013f6032b561cc768251eef");
6356
}
6457

6558
[Fact]
6659
[Category("QRRenderer/QRCode")]
6760
public void can_create_qrcode_with_non_transparent_logo_graphic()
6861
{
69-
//Create dummy logo
70-
var logo = new Bitmap(32, 32);
71-
var gfx = Graphics.FromImage(logo);
72-
gfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
73-
gfx.FillRectangle(Brushes.White, new Rectangle(0, 0, 32, 32));
74-
gfx.FillEllipse(Brushes.Red, new Rectangle(0, 0, 32, 32));
75-
gfx.Save();
76-
7762
//Create QR code
7863
var gen = new QRCodeGenerator();
7964
var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
80-
var bmp = new QRCode(data).GetGraphic(10, Color.Black, Color.White, icon: logo);
65+
var bmp = new QRCode(data).GetGraphic(10, Color.Black, Color.White, icon: Resources.noun_software_engineer_2909346);
66+
//Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909346
8167

8268
var ms = new MemoryStream();
8369
bmp.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
@@ -87,7 +73,7 @@ public void can_create_qrcode_with_non_transparent_logo_graphic()
8773
var result = BitConverter.ToString(hash).Replace("-", "").ToLower();
8874
ms.Dispose();
8975

90-
result.ShouldBe("c2aae3658c7fa20cb5d22948d859c614");
76+
result.ShouldBe("1d718f06f904af4a46748f02af2d4eec");
9177
}
9278
#endif
9379
}

‎QRCoderTests/QRCoderTests.csproj

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
1111
</ItemGroup>
1212

13-
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' " >
13+
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' ">
1414
<PackageReference Include="xunit" Version="2.4.1" />
1515
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1616
<PackageReference Include="shouldly" Version="3.0.2" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' " >
19+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
2020
<PackageReference Include="xunit" Version="1.9.2" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="2.0.1" />
2222
<PackageReference Include="shouldly" Version="2.8.3" />
@@ -26,6 +26,21 @@
2626
<ProjectReference Include="..\QRCoder\QRCoder.csproj" />
2727
</ItemGroup>
2828

29+
<ItemGroup>
30+
<Compile Update="Resources.Designer.cs">
31+
<DesignTime>True</DesignTime>
32+
<AutoGen>True</AutoGen>
33+
<DependentUpon>Resources.resx</DependentUpon>
34+
</Compile>
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<EmbeddedResource Update="Resources.resx">
39+
<Generator>ResXFileCodeGenerator</Generator>
40+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
41+
</EmbeddedResource>
42+
</ItemGroup>
43+
2944
<PropertyGroup>
3045
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
3146
</PropertyGroup>

‎QRCoderTests/Resources.Designer.cs

Lines changed: 77 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎QRCoderTests/Resources.resx

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="noun_software_engineer_2909346" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>assets\noun_software engineer_2909346.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
</root>

‎QRCoderTests/assets/noun_software engineer_2909346.png

3.53 KB
Loading

0 commit comments

Comments
 (0)