more tests

README.md

@@ -11,6 +11,8 @@
 
 The ZPLGFA Golang package implements some functions to convert PNG, JPEG and GIF files to ZPL compatible ^GF-elements ([Graphic Fields](https://www.zebra.com/us/en/support-downloads/knowledge-articles/gf-graphic-field-zpl-command.html)).
 
+If you need a ready to use application and don't want to hassle around with source code, take a look at the [ZPLGFA CLI Tool](https://github.com/SimonWaldherr/zplgfa/tree/master/cmd/zplgfa) which is based on this package.
+
 ## install
 
 1. [install Golang](https://golang.org/doc/install)

tests/README.md

@@ -0,0 +1,7 @@
+# ZPLGFA Tests
+
+This folder contains some test cases for the ZPLGFA package.  
+The test coverage can be seen at the [coveralls](https://coveralls.io/github/SimonWaldherr/zplgfa?branch=master) project page.  
+
+[![Coverage Status](https://coveralls.io/repos/github/SimonWaldherr/zplgfa/badge.svg?branch=master)](https://coveralls.io/github/SimonWaldherr/zplgfa?branch=master) 
+

tests/tests.json

@@ -18,5 +18,15 @@
     "filename": "./tests/test.png",
     "zplstring": "^XA,^FS^FO0,0^GFA,119,51,3,00000000000000000001c00001c00001c000000000001c00001c00001c000000001ddc001ddc001ddc00000000000000000000^FS,^XZ",
     "graphictype": "ASCII"
+  },
+  {
+    "filename": "./tests/test4.jpg",
+    "zplstring": "^XA,^FS^FO0,0^GFA,4910,45000,75,,::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::iQ07LFEiQ0iN01RF8iN0iL01VF8iL0iK07XFEiK0iJ0gHFiJ0iI0gJFiI0iG01gLF8iG0iG0gNFiG0i0gPFi0hY07gPFEhY0hX03gRFChX0hW03gTFChW0hW0gVFhW0hV07gVFEhV0hU03gXFChU0hU0hFhU0hT07hFEhT0hS01hHF8hS0hS07hHFEhS0hR03hJFChR0hR0hLFhR0hQ03hLFChQ0hQ0hNFhQ0hP03hNFChP0hP0hPFhP0hO03hPFChO0hO0hRFhO0hN01hRF8hN0hN07hRFEhN0hM01hTF8hM0hM03gIFCL03gIFChM0hM0gHF8P01gHFhM0hL03gFCT03gFChL0hL07YFX0YFEhL0hK01XFEg07XF8hK0hK03WFEgH07WFChK0hK0WFEgJ07WFhK0hJ01WFgL0WF8hJ0hJ07VF8gL01VFEhJ0hJ0VFCgN03VFhJ0hI03UFEgP07UFChI0hI07UFgR0UFEhI0hI0UF8gR01UFhI0hH03TFEgT07TFChH0hH07TFgV0TFEhH0hH0TFCgV03TFhH0hG03TFgX0TFChG0hG07SF8gX01SFEhG0hG0SFEh07SFhG0h01SF8h01SF8h0h03SFhH0SFCh0h0SFChH03SFh0gY01SFhJ0SF8gY0gY03RFChJ03RFCgY0gY07RFhL0RFEgY0gY0RFChL03RFgY0gX01RF8hL01RF8gX0gX03QFEhN07QFCgX0gX07QF8hN01QFEgX0gX0RFhP0RFgX0gW01QFChP03QF8gW0gW07QF8hP01QFEgW0gW07PFEhR07PFEgW0gV01QFChR03QF8gV0gV03QF8hR01QFCgV0gV03PFEhT07PFCgV0gV07PFChT03PFEgV0gV0QFhV0QFgV0gU01PFEhV07PF8gU0gU03PFChV03PFCgU0gU07PF8hV01PFEgU0gU0PFEhX07PFgU0gT01PFChX03PF8gT0gT03PF8hX01PFCgT0gT07PFi0PFEgT0gT0PFEi07PFgT0gT0PF8i01PFgT0gS01PFiH0PF8gS0gS03OFEiH07OFCgS0gS07OFCiH03OFEgS0gS0PF8iH01PFgS0gR01PFiJ0PF8gR0gR01OFEiJ07OF8gR0gR03OFCiJ03OFCgR0gR07OF8iJ01OFEgR0gR0PFiL0PFgR0gR0OFEiL07OFgR0gQ01OFCiL03OF8gQ0gQ03OF8iL01OFCgQ0gQ07OFiN0OFEgQ0gQ07NFEiN07NFEgQ0gQ0OFCiN03OFgQ0gP01OF8iN03OF8gP0gP01OF8iN01OF8gP0gP03OFiP0OFCgP0gP07NFEiP07NFEgP0gP07NFCiP03NFEgP0gP0OF8iP01OFgP0gO01OFiR0OF8gO0:gO03NFEiR07NFCgO0gO07NFCiR03NFEgO0gO07NF8iR01NFEgO0gO0OFiT0OFgO0:gN01NFEiT07NF8gN0gN03NFCiT03NFCgN0:gN07NF8iT01NFEgN0gN07NFiV0NFEgN0gN0NFEiV07NFgN0gM01NFEiV07NF8gM0gM01NFCiV03NF8gM0gM03NF8iV01NFCgM0:gM07NFiX0NFEgM0gM07MFEiX07MFEgM0gM0NFEiX07NFgM0gM0NFCiX03NFgM0gL01NFCiX03NF8gL0gL01NF8iX01NF8gL0gL03NFj0NFCgL0:gL07MFEj07MFEgL0:gL0NFCj03NFgL0:gL0NF8j01NFgL0gK01NF8jG0NF8gK0gK01NFjH0NF8gK0gK03NFjH0NFCgK0gK03MFEjH07MFCgK0gK07MFCjH03MFEgK0:gK07MF8jH01MFEgK0gK0NF8jH01NFgK0gK0NFjJ0NFgK0gJ01NFjJ0NF8gJ0:gJ01MFEjJ07MF8gJ0gJ03MFEjJ07MFCgJ0gJ03MFCjJ03MFCgJ0:gJ07MF8jJ01MFEgJ0:gJ0NF8jJ01NFgJ0gJ0NFjL0NFgJ0:gI01MFEjL07MF8gI0::gI01MFCjL03MF8gI0gI03MFCjL03MFCgI0:gI03MF8jL01MFCgI0gI07MF8jL01MFEgI0:gI07MFjN0MFEgI0:gI0MFEjN07MFgI0::gH01MFEjN07MF8gH0gH01MFCjN03MF8gH0:::gH03MF8jN01MFCgH0::gH03MFjP0MFCgH0gH07MFjP0MFEgH0::gH07LFEjP07LFEgH0:gH0MFEjP07MFgH0::gH0MFCjP03MFgH0::gG01MFCjP03MF8gG0::gG01MF8jP01MF8gG0::::gG03MF8jP01MFCgG0:gG03MFjR0MFCgG0:::::::gG07MFjR0MFEgG0gG07LFEjR07LFEgG0:::::::::::::::::::::::::::gG07MFjR0MFEgG0gG03MFjR0MFCgG0:::::::gG03MF8jP01MFCgG0:gG01MF8jP01MF8gG0::::gG01MFCjP03MF8gG0::gH0MFCjP03MFgH0::gH0MFEjP07MFgH0::gH07LFEjP07LFEgH0:gH07MFjP0MFEgH0::gH03MFjP0MFCgH0gH03MF8jN01MFCgH0::gH01MF8jN01MF8gH0gH01MFCjN03MF8gH0::gH01MFEjN07MF8gH0gI0MFEjN07MFgI0:gI0NFjN0NFgI0gI07MFjN0MFEgI0:gI07MF8jM0MFEgI0gI07MF8jL01MFEgI0gI03MF8jL01MFCgI0gI03MFCjL03MFCgI0:gI01MFCjL03MF8gI0gI01MFEjL07MF8gI0::gJ0NFjL0NFgJ0:gJ0NF8jJ01NFgJ0gJ07MF8jJ01MFEgJ0:gJ03MFCjJ03MFCgJ0:gJ03MFEjJ07MFCgJ0gJ01MFEjJ07MF8gJ0gJ01NFjJ0NF8gJ0:gK0NF8jH01NFgK0:gK07MF8jH01MFEgK0gK07MFCjH03MFEgK0:gK03MFEjH07MFCgK0gK03NFjH0NFCgK0gK01NFjH0NF8gK0:gL0NF8j01NFgL0gL0NFCj03NFgL0:gL07MFEj07MFEgL0:gL03NFj0NFCgL0:gL01NF8iX01NF8gL0gL01NFCiX03NF8gL0gM0NFCiX03NFgM0gM0NFEiX07NFgM0gM07MFEiX07MFEgM0gM07NFiX0NFEgM0gM03NF8iV01NFCgM0:gM01NFCiV03NF8gM0gM01NFEiV07NF8gM0gN0NFEiV07NFgN0gN07NFiV0NFEgN0gN07NF8iT01NFEgN0gN03NFCiT03NFCgN0:gN01NFEiT07NF8gN0gO0OFiT0OFgO0:gO07NF8iR01NFEgO0gO07NFCiR03NFEgO0gO03NFEiR07NFCgO0gO01OFiR0OF8gO0:gP0OF8iP01OFgP0gP07NFCiP03NFEgP0gP07NFEiP07NFEgP0gP03OFiP0OFCgP0gP01OF8iN01OF8gP0:gQ0OFCiN03OFgQ0gQ07NFEiN07NFEgQ0gQ07OFiN0OFEgQ0gQ03OF8iL01OFCgQ0gQ01OFCiL03OF8gQ0gR0OFEiL07OFgR0gR0PFiL0PFgR0gR07OF8iJ01OFEgR0gR03OFCiJ03OFCgR0gR01OFEiJ07OF8gR0gR01PFiJ0PF8gR0gS0PF8iH01PFgS0gS07OFCiH03OFEgS0gS03OFEiH07OFCgS0gS01PFiH0PF8gS0gT0PF8i01PFgT0gT0PFEi07PFgT0gT07PFi0PFEgT0gT03PF8hX01PFCgT0gT01PFChX03PF8gT0gU0PFEhX07PFgU0gU07PF8hV01PFEgU0gU03PFChV03PFCgU0gU01PFEhV07PF8gU0gV0QFhV0QFgV0gV07PFChT03PFEgV0gV03PFEhT07PFCgV0gV03QF8hR01QFCgV0gV01QFChR03QF8gV0gW0QFEhR07QFgW0gW07QF8hP01QFEgW0gW03QFChP03QFCgW0gW01RFhP0RF8gW0gX07QF8hN01QFEgX0gX03QFEhN07QFCgX0gX01RF8hL01RF8gX0gY0RFChL03RFgY0gY07RFhL0RFEgY0gY03RFChJ03RFCgY0gY01SFhJ0SF8gY0h0SFChH03SFh0h03SFhH0SFCh0h01SF8h01SF8h0hG0SFEh07SFhG0hG07SF8gX01SFEhG0hG03TFgX0TFChG0hH0TFCgV03TFhH0hH07TFgV0TFEhH0hH03TFEgT07TFChH0hI0UF8gR01UFhI0hI07UFgR0UFEhI0hI03UFEgP07UFChI0hJ0VFCgN03VFhJ0hJ07VF8gL01VFEhJ0hJ01WFgL0WF8hJ0hK0WFEgJ07WFhK0hK03WFEgH07WFChK0hK01XFEg07XF8hK0hL07YFX0YFEhL0hL03gFCT03gFChL0hM0gHF8P01gHFhM0hM03gIFCL03gIFChM0hM01hTF8hM0hN07hRFEhN0hN01hRF8hN0hO0hRFhO0hO03hPFChO0hP0hPFhP0hP03hNFChP0hQ0hNFhQ0hQ03hLFChQ0hR0hLFhR0hR03hJFChR0hS07hHFEhS0hS01hHF8hS0hT07hFEhT0hU0hFhU0hU03gXFChU0hV07gVFEhV0hW0gVFhW0hW03gTFChW0hX07gRFEhX0hY07gPFEhY0i0gPFi0iG0gNFiG0iG01gLF8iG0iI0gJFiI0iJ0gHFiJ0iK07XFEiK0iL01VF8iL0iN01RF8iN0iQ07LFEiQ0,::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::^FS,^XZ",
+    "graphictype": "CompressedASCII"
+  },
+  {
+    "filename": "./tests/test5.png",
+    "zplstring": "^XA,^FS^FO0,0^GFA,5602,125000,125,E38E38E38E38E38E38E38E38qL0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::hV07F800001FE0FFgN0FFhJ07F8P0FEjR0R078hH07F800001FE0FFgN0FFhJ07F8O07FEjR0R0FChH07F800001FE0FFgN0FFP07CW0F8S07F8O0FFEjR0EP01FEhH07F800001FE0FFgN0FFP0F8V01FT07F8N01FFEjR0:EP01FEhH07F800001FE0FFgN0FFP0F8V01FT07F8N03FFEjR0Q01FEhH07F800001FE0FFgN0FFP0F8V01FT07F8N03FCjS0R0FChH07F800001FE0FFgN0FFO01FW03ET07F8N07F8jS0R078hH07F800001FE0FFgN0FFO01FW03ET07F8N07F8jS0EhU07F800001FE0FFgN0FFO01FW03ET07F8N07F8jS0EhU07F800001FE0FFgN0FFO03EW07CT07F8N07F8jS0EL01FC01FE07F0FC01F80000FE0007F0FC01FE01F80FF00FF0007F8003F1FE0FF0F800003F000FE0E1FC1C00001F8FF0003F00003E000FC7F0003F800007C3FFFFC1FC1F8007F8007E3F83FFFC03FCjN0M0FFF81FE07F3FF07FC0007FFC007F3FF01FE03F80FF0FFFE007F800FFDFE0FF3FE0001FFE00FE3E1FC7C00007FEFF001FFE0003E003FE7F001FFF00007C3FFFFC1FCFFE007F801FF3F83FFFC3FFF8jM0L01FFF01FE07F7FFCFFE000FFFE007F7FF80FE03F80FE1FFFF807F803FFFFE0FF7FF0003FFF00FE7E1FCFC0001KF003FFF0007C00FFF7F003FFF8000F83FFFFC1FDFFF007F807FFBF83FFFC7FFFEjM0L03FFF01FE07FFFFDFFF003FFFF807FFFFC0FE03FC0FE1FFFFC07F807FFFFE0KF8007FFF80FEFE1FDFC0003KF007FFF8007C01KF00FFFFE000F83FFFFC1KF807F80KF83FFFC7FFFFjM0EK07FFF01FE07NF803FFFF807FFFFE0FF03FC0FE0FFFFC07F807FFFFE0KFC00FFFFC0FFFE1FFFC0003KF00FFFFC007C01KF00FFFFE000F83FFFF81KFC07F80KF83FFFC3FFFFjM0EK07F0701FE07NF807FC7FC07FFFFE07F07FC1FC0F03FE07F80KFE0KFC01FE1FC0FFFE1FFFC0007KF01FE1FC007C03KF01FF1FF000F83FFFF81KFC07F81KF83FFFC3C0FF8jL0EK0FF0001FE07FC1FF87F80FF83FE07FC1FE07F07FC1FC0C01FE07F81FF07FE0FF83FC01F80FE0FFFE1FFFC000FF83FF01F80FE00F807FC1FF03FE0FF801F0000FF01FF83FE07F83FE0FF807F803007F8jL0L0FF0001FE07FC1FF83FC0FF01FE07FC1FF07F07FE1FC0000FE07F81FE03FE0FF83FE03F80FE0FFE01FFC0000FF01FF03F80FE00F807F81FF03FC07F801F0001FE01FF01FE07F83FC0FF807F800003F8jL0L0FF8001FE07F80FF03FC0FF01FE07F80FF07F0FBE1F80000FF07F81FE01FE0FF01FE03F007F0FF801FFK0FF00FF03F007F00F807F80FF03FC07F801F0003FC01FE01FE07F83FC07F807F800003FCjL0L0FFC001FE07F80FF03FC1FE00FF07F80FF03F8FBE3F8001FFF07F83FC01FE0FF01FE07F007F0FF801FF00001FE00FF07F007F01F007F00FF07F803FC03E0007FC01FE00FF07F83F807F807F80007FFCjL0EK07FF001FE07F80FF03FC1FE00FF07F80FF03F8FBE3F801FFFF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF01F00FF00FF07F803FC03E0007F801FE00FF07F87F807F807F8007FFFCjL0EK03FFC01FE07F80FF03FC1FE00FF07F80FF03F8FBE3F007FFFF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF01F00FF00FF07F803FC03E000FF001FE00FF07F87F807F807F801FFFFCjL0EK01FFF01FE07F80FF03FC1FE00FF07F80FF01F8FBF3F00KF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF03F00FF00FF07F803FC07E001FF001FE00FF07F87F807F807F803FFFFCjL0M0FFF81FE07F80FF03FC1FE00FF07F80FF01F9F3F3F01KF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF03E00FF00FF07F803FC07C003FE001FE00FF07F87F807F807F807FFFFCjL0M03FF81FE07F80FF03FC1FE00FF07F80FF01F9F1F3F03FE0FF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF03E00FF00FF07F803FC07C003FC001FE00FF07F87F807F807F80FF83FCjL0N0FFC1FE07F80FF03FC1FE00FE07F80FF00FDF1F3E03FC0FF07F83FC01FE0FF01FE07FK0FF001FE00001FE00FF07FK03E00FF00FF07F803F807C007F8001FE00FE07F87F807F807F80FF03FCjL0EM03FC1FE07F80FF03FC0FF01FE07F80FF00FDF1F7E07F80FF07F81FE01FE0FF01FE03FK0FF001FE00F80FF00FF03FK07C007F80FF03FC07F80F800FF8001FE01FE07F83FC07F807F81FE03FCjL0EM03FC1FE07F80FF03FC0FF01FE07F80FF00FDE1FFE07F80FF07F81FE03FE0FF01FE03F80000FF001FE01FC0FF01FF03F800007C007F81FF03FC07F80F800FF0001FF01FE07F83FC0FF807F81FE03FCjL0EK0403FC1FE07F80FF03FC0FF83FC07F80FF00FFE0FFC07F81FF07F81FF07FE0FF01FE03FE0040FF001FE03FE0FF83FF03FE00407C007FC3FF03FE0FF00F801FE0001FF83FE07F83FE1FF807F81FE07FCjL0L0703F81FE07F80FF03FC07FFFFC07F80FF007FE0FFC07FC3FF07F80KFE0FF01FE01FFFFC0FF001FE03FE07KF01FFFFC0F8003KF01KF01F003FFFFC1KFC07F81KF807F81FF0FFCjL0L0FFFF81FE07F80FF03FC03FFFF807F80FF007FE0FFC03KF07F80KFE0FF01FE01FFFFC0FF001FE03FE07KF01FFFFC0F8003KF00FFFFE01F007FFFFC1KF807F81KF807F80KFCjL0L0FFFF01FE07F80FF03FC01FFFF007F80FF007FC0FF803KF07F807FFEFE0FF01FE00FFFFC0FF001FE03FE03FFF7F00FFFFC0F8001KF007FFFC01F007FFFFC1KF807F80KF807F80KFCjL0EK0FFFE01FE07F80FF03FC00FFFE007F80FF003FC07F801FFF7F07F803FFEFE0FF01FE007FFFC0FF001FE01FC01FFF7F007FFFC0F8000FFEFF003FFF801F007FFFFC1KF007F807FF7F807F807FFDFCjL0EK0FFFC01FE07F80FF03FC007FFC007F80FF003FC07F800FFE7F07F801FF8FE0FF01FE001FFFE0FF001FE01FC00FFC7F001FFFE1F00007FCFF001FFF003E007FFFFC1FEFFC007F803FE7F807F803FF9FCjL0EL0FE001FE07F80FF03FC000FE0007F80FF003F807F8001F07F07F8007E0FE0FF01FE0003FE00FF001FE0070003F07F0003FE01FK0F0FF0003F8003E007FFFFC1FE3F0007F800787F807F8007C1FCjL0kL01FM0FEN03EN01FER07FjX0kL03EL01FEN07CN01FER0FFjX0kT01FEX01FER0FFjX0kR0C03FEX01FEO0601FFjX0kQ01FFFFCX01FEO0FFFFEjX0kQ01FFFF8X01FEO0FFFFCjX0:kQ03FFFFY01FEN01FFFF8jX0kQ01FFFCY01FEO0FFFEjY0kR03FEg01FEO01FFk0,:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::rJF8K0::::::::::::::::::,:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::79E79E79E79EqX0:::79E78001E79EqX079E79E79E79EqX0:::,^FS,^XZ",
+    "graphictype": "CompressedASCII"
   }
 ]

zplgfa.go

@@ -185,9 +185,6 @@ func ConvertToGraphicField(source image.Image, graphicType GraphicType) string {
 			lastLine = curLine
 		case Binary:
 			GraphicFieldData += fmt.Sprintf("%s", line)
-		default:
-			graphicType = CompressedASCII
-			GraphicFieldData += fmt.Sprintln(CompressASCII(hexstr))
 		}
 	}
 

zplgfa_test.go

@@ -1,6 +1,7 @@
 package zplgfa
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"image"
 	_ "image/gif"
@@ -81,7 +82,13 @@ func Test_ConvertToZPL(t *testing.T) {
 		gfimg = strings.Replace(gfimg, " ", "", -1)
 		gfimg = strings.Replace(gfimg, "\n", "", -1)
 
+		switch graphictype {
+		case "Binary":
+			gfimg = base64.StdEncoding.EncodeToString([]byte(gfimg))
+		}
+
 		if gfimg != zplstring {
+			log.Printf("ConvertToZPL Test for file \"%s\" failed, wanted: \n%s\ngot: \n%s\n", filename, zplstring, gfimg)
 			t.Fatalf("Testcase %d ConvertToZPL failed", i)
 		}
 	}