unit: Move Get Inkey test data for 1.1-1.4

diff --git a/unit/stk-test-data.h b/unit/stk-test-data.h
index 9006087..526cc2e 100644 (file)
--- a/unit/stk-test-data.h
+++ b/unit/stk-test-data.h
@@ -295,3 +295,42 @@ static const unsigned char display_text_1011[] = {
 };
 
 #define display_text_response_1011 display_text_response_111
+
+static const unsigned char get_inkey_111[] = {
+       0xD0, 0x15, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+       0x0A, 0x04, 0x45, 0x6E, 0x74, 0x65, 0x72, 0x20, 0x22, 0x2B, 0x22
+};
+
+static const unsigned char get_inkey_response_111[] = {
+       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82, 0x81, 0x83, 0x01, 0x00,
+       0x8d, 0x02, 0x04, 0x2b,
+};
+
+static const unsigned char get_inkey_121[] = {
+       0xD0, 0x14, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+       0x09, 0x00, 0x45, 0x37, 0xBD, 0x2C, 0x07, 0x89, 0x60, 0x22
+};
+
+static const unsigned char get_inkey_response_121[] = {
+       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82, 0x81, 0x83, 0x01, 0x00,
+       0x8d, 0x02, 0x04, 0x30,
+};
+
+static const unsigned char get_inkey_131[] = {
+       0xD0, 0x1A, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+       0x0F, 0x04, 0x3C, 0x47, 0x4F, 0x2D, 0x42, 0x41, 0x43, 0x4B, 0x57, 0x41,
+       0x52, 0x44, 0x53, 0x3E
+};
+
+static const unsigned char get_inkey_response_131[] = {
+       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82, 0x81, 0x83, 0x01, 0x11,
+};
+
+static const unsigned char get_inkey_141[] = {
+       0xD0, 0x13, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+       0x08, 0x04, 0x3C, 0x41, 0x42, 0x4F, 0x52, 0x54, 0x3E
+};
+
+static const unsigned char get_inkey_response_141[] = {
+       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82, 0x81, 0x83, 0x01, 0x10,
+};

diff --git a/unit/test-stkutil.c b/unit/test-stkutil.c
index b085c2d..5b2fe36 100644 (file)
--- a/unit/test-stkutil.c
+++ b/unit/test-stkutil.c
@@ -891,30 +891,6 @@ struct get_inkey_test {
        char *html;
 };
 
-static unsigned char get_inkey_111[] = { 0xD0, 0x15, 0x81, 0x03, 0x01, 0x22,
-                                               0x00, 0x82, 0x02, 0x81, 0x82,
-                                               0x8D, 0x0A, 0x04, 0x45, 0x6E,
-                                               0x74, 0x65, 0x72, 0x20, 0x22,
-                                               0x2B, 0x22 };
-
-static unsigned char get_inkey_121[] = { 0xD0, 0x14, 0x81, 0x03, 0x01, 0x22,
-                                               0x00, 0x82, 0x02, 0x81, 0x82,
-                                               0x8D, 0x09, 0x00, 0x45, 0x37,
-                                               0xBD, 0x2C, 0x07, 0x89, 0x60,
-                                               0x22 };
-
-static unsigned char get_inkey_131[] = { 0xD0, 0x1A, 0x81, 0x03, 0x01, 0x22,
-                                               0x00, 0x82, 0x02, 0x81, 0x82,
-                                               0x8D, 0x0F, 0x04, 0x3C, 0x47,
-                                               0x4F, 0x2D, 0x42, 0x41, 0x43,
-                                               0x4B, 0x57, 0x41, 0x52, 0x44,
-                                               0x53, 0x3E };
-
-static unsigned char get_inkey_141[] = { 0xD0, 0x13, 0x81, 0x03, 0x01, 0x22,
-                                               0x00, 0x82, 0x02, 0x81, 0x82,
-                                               0x8D, 0x08, 0x04, 0x3C, 0x41,
-                                               0x42, 0x4F, 0x52, 0x54, 0x3E };
-
 static unsigned char get_inkey_151[] = { 0xD0, 0x15, 0x81, 0x03, 0x01, 0x22,
                                                0x01, 0x82, 0x02, 0x81, 0x82,
                                                0x8D, 0x0A, 0x04, 0x45, 0x6E,
@@ -17603,11 +17579,6 @@ static const struct terminal_response_test display_text_response_data_511b = {
        },
 };
 
-static const unsigned char get_inkey_response_111[] = {
-       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82,
-       0x81, 0x83, 0x01, 0x00, 0x8d, 0x02, 0x04, 0x2b,
-};
-
 static const struct terminal_response_test get_inkey_response_data_111 = {
        .pdu = get_inkey_response_111,
        .pdu_len = sizeof(get_inkey_response_111),
@@ -17628,11 +17599,6 @@ static const struct terminal_response_test get_inkey_response_data_111 = {
        },
 };
 
-static const unsigned char get_inkey_response_121[] = {
-       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82,
-       0x81, 0x83, 0x01, 0x00, 0x8d, 0x02, 0x04, 0x30,
-};
-
 static const struct terminal_response_test get_inkey_response_data_121 = {
        .pdu = get_inkey_response_121,
        .pdu_len = sizeof(get_inkey_response_121),
@@ -17653,11 +17619,6 @@ static const struct terminal_response_test get_inkey_response_data_121 = {
        },
 };
 
-static const unsigned char get_inkey_response_131[] = {
-       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82,
-       0x81, 0x83, 0x01, 0x11,
-};
-
 static const struct terminal_response_test get_inkey_response_data_131 = {
        .pdu = get_inkey_response_131,
        .pdu_len = sizeof(get_inkey_response_131),
@@ -17673,11 +17634,6 @@ static const struct terminal_response_test get_inkey_response_data_131 = {
        },
 };
 
-static const unsigned char get_inkey_response_141[] = {
-       0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x82,
-       0x81, 0x83, 0x01, 0x10,
-};
-
 static const struct terminal_response_test get_inkey_response_data_141 = {
        .pdu = get_inkey_response_141,
        .pdu_len = sizeof(get_inkey_response_141),