ISO88595 Code page support: Fixes

Author: wOvAN

smpp/pdu/pdutext/codec_test.go

@@ -17,6 +17,7 @@ func TestEncode(t *testing.T) {
 	}{
 		{Latin1Type, []byte("áéíóú moço"), []byte("\xe1\xe9\xed\xf3\xfa mo\xe7o")},
 		{UCS2Type, []byte("áéíóú moço"), []byte("\x00\xe1\x00\xe9\x00\xed\x00\xf3\x00\xfa\x00 \x00m\x00o\x00\xe7\x00o")},
+		{ISO88595Type, []byte(iso88595UTF8_Bytes), []byte(iso88595_Bytes)},
 	}
 	for _, tc := range test {
 		have := Encode(tc.typ, tc.text)
@@ -35,6 +36,7 @@ func TestDecode(t *testing.T) {
 	}{
 		{Latin1Type, []byte("áéíóú moço"), []byte("\xe1\xe9\xed\xf3\xfa mo\xe7o")},
 		{UCS2Type, []byte("áéíóú moço"), []byte("\x00\xe1\x00\xe9\x00\xed\x00\xf3\x00\xfa\x00 \x00m\x00o\x00\xe7\x00o")},
+		{ISO88595Type, []byte(iso88595UTF8_Bytes), []byte(iso88595_Bytes)},
 	}
 	for _, tc := range test {
 		have := Decode(tc.typ, tc.text)

smpp/pdu/pdutext/iso88595_test.go

@@ -10,17 +10,22 @@ import (
 	"testing"
 )
 
+const (
+	iso88595TypeCode = 0x06
+	testDataDir      = "testdata"
+)
+
 var (
-	ISO88595_Bytes []byte = readBytesFromFile("test_text/iso88595_test.txt")
-	Utf8_Bytes     []byte = readBytesFromFile("test_text/iso88595_test_utf8.txt")
+	iso88595_Bytes     []byte = readBytesFromFile(testDataDir + "/iso88595_test.txt")
+	iso88595UTF8_Bytes []byte = readBytesFromFile(testDataDir + "/iso88595_test_utf8.txt")
 )
 
 func TestISO88595Encoder(t *testing.T) {
-	want := []byte(ISO88595_Bytes)
-	text := []byte(Utf8_Bytes)
+	want := []byte(iso88595_Bytes)
+	text := []byte(iso88595UTF8_Bytes)
 	s := ISO88595(text)
-	if s.Type() != 0x06 {
-		t.Fatalf("Unexpected data type; want 0x03, have %d", s.Type())
+	if s.Type() != iso88595TypeCode {
+		t.Fatalf("Unexpected data type; want %d, have %d", iso88595TypeCode, s.Type())
 	}
 	have := s.Encode()
 	if !bytes.Equal(want, have) {
@@ -29,22 +34,22 @@ func TestISO88595Encoder(t *testing.T) {
 }
 
 func TestISO88595Decoder(t *testing.T) {
-	want := []byte(Utf8_Bytes)
-	text := []byte(ISO88595_Bytes)
+	want := []byte(iso88595UTF8_Bytes)
+	text := []byte(iso88595_Bytes)
 	s := ISO88595(text)
-	if s.Type() != 0x06 {
-		t.Fatalf("Unexpected data type; want 0x03, have %d", s.Type())
+	if s.Type() != iso88595TypeCode {
+		t.Fatalf("Unexpected data type; want %d, have %d", iso88595TypeCode, s.Type())
 	}
 	have := s.Decode()
 	if !bytes.Equal(want, have) {
 		t.Fatalf("Unexpected text; want %q, have %q", want, have)
 	}
 }
 
-func readBytesFromFile(aFileName string) []byte {
-	dat, err := ioutil.ReadFile(aFileName)
+func readBytesFromFile(filename string) []byte {
+	dat, err := ioutil.ReadFile(filename)
 	if err != nil {
-		return nil
+		panic("Error reading testdata file; " + filename + ", err " + err.Error())
 	} else {
 		return dat
 	}