Browse Source

add new service calls to the binary message tests

Julius Pfrommer 8 years ago
parent
commit
3477fd6fcb

+ 17 - 1
tests/CMakeLists.txt

@@ -73,13 +73,19 @@ add_test(check_server_userspace ${CMAKE_CURRENT_BINARY_DIR}/check_server_userspa
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/client_HELOPN.bin
                           ${CMAKE_CURRENT_BINARY_DIR}/client_CreateActivateSession.bin
+                          ${CMAKE_CURRENT_BINARY_DIR}/client_Browse.bin
+                          ${CMAKE_CURRENT_BINARY_DIR}/client_Read.bin
                   PRE_BUILD
                   COMMAND python ${PROJECT_SOURCE_DIR}/tools/hex2bin.py
                                  ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_HELOPN.hex
                                  ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_CreateActivateSession.hex
+                                 ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_Browse.hex
+                                 ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_Read.hex
                   DEPENDS ${PROJECT_SOURCE_DIR}/tools/hex2bin.py
                           ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_HELOPN.hex
-                          ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_CreateActivateSession.hex)
+                          ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_CreateActivateSession.hex
+                          ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_Browse.hex
+                          ${CMAKE_CURRENT_SOURCE_DIR}/dumps/client_Read.hex)
 add_custom_target(client_HELOPN.bin DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/client_HELOPN.bin")
 add_custom_target(client_CreateActivateSession.bin DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/client_CreateActivateSession.bin")
 
@@ -94,3 +100,13 @@ add_test(check_server_binary_messages_helopn ${CMAKE_CURRENT_BINARY_DIR}/check_s
 add_test(check_server_binary_messages_activate_session ${CMAKE_CURRENT_BINARY_DIR}/check_server_binary_messages
                                                        ${CMAKE_CURRENT_BINARY_DIR}/client_HELOPN.bin
                                                        ${CMAKE_CURRENT_BINARY_DIR}/client_CreateActivateSession.bin)
+
+add_test(check_server_binary_messages_browse ${CMAKE_CURRENT_BINARY_DIR}/check_server_binary_messages
+                                             ${CMAKE_CURRENT_BINARY_DIR}/client_HELOPN.bin
+                                             ${CMAKE_CURRENT_BINARY_DIR}/client_CreateActivateSession.bin
+                                             ${CMAKE_CURRENT_BINARY_DIR}/client_Browse.bin)
+
+add_test(check_server_binary_messages_read ${CMAKE_CURRENT_BINARY_DIR}/check_server_binary_messages
+                                           ${CMAKE_CURRENT_BINARY_DIR}/client_HELOPN.bin
+                                           ${CMAKE_CURRENT_BINARY_DIR}/client_CreateActivateSession.bin
+                                           ${CMAKE_CURRENT_BINARY_DIR}/client_Read.bin)

+ 8 - 0
tests/dumps/client_Browse.hex

@@ -0,0 +1,8 @@
+4d 53 47 46 71 00 00 00 01 00 00 00 01 00 00 00  /* MSGFq........... */
+04 00 00 00 04 00 00 00 01 00 0f 02 04 01 00 e3  /* ...............H */
+77 d7 1c 90 95 e2 a4 6d b6 4b e4 0e e0 9e b9 9e  /* ....4~..~.l.q.k. */
+90 25 6a 81 bf d1 01 05 00 00 00 00 00 00 00 ff  /* .%j............. */
+ff ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00  /* ................ */
+00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00  /* ................ */
+00 55 00 00 00 00 00 00 00 00 00 00 00 3f 00 00  /* .U...........?.. */
+00                                               /* . */

+ 19 - 17
tests/dumps/client_CreateActivateSession.hex

@@ -1,17 +1,19 @@
-4d 53 47 46 05 01 00 00 08 00 00 00 08 00 00 00  /* MSGF............ */
-34 00 00 00 02 00 00 00 01 00 cd 01 00 00 ad 6e  /* 4..............n */
-22 33 58 6c d0 01 01 00 00 00 00 00 00 00 ff ff  /* "3Xl............ */
-ff ff 00 00 00 00 00 00 00 14 00 00 00 75 72 6e  /* .............urn */
-3a 6c 6f 63 61 6c 68 6f 73 74 3a 55 41 3a 43 54  /* :localhost:UA:CT */
-54 1c 00 00 00 75 72 6e 3a 6f 70 63 66 6f 75 6e  /* T....urn:opcfoun */
-64 61 74 69 6f 6e 2e 6f 72 67 3a 55 41 3a 43 54  /* dation.org:UA:CT */
-54 03 02 00 00 00 65 6e 2d 00 00 00 4f 50 43 20  /* T.....en-...OPC  */
-55 6e 69 66 69 65 64 20 41 72 63 68 69 74 65 63  /* Unified Architec */
-74 75 72 65 20 43 6f 6d 70 6c 69 61 6e 63 65 20  /* ture Compliance  */
-54 65 73 74 20 54 6f 6f 6c 01 00 00 00 ff ff ff  /* Test Tool....... */
-ff ff ff ff ff 00 00 00 00 ff ff ff ff 1e 00 00  /* ................ */
-00 6f 70 63 2e 74 63 70 3a 2f 2f 31 39 32 2e 31  /* .opc.tcp://192.1 */
-36 38 2e 35 36 2e 31 30 31 3a 31 36 36 36 34 0e  /* 68.56.101:16664. */
-00 00 00 55 61 43 74 74 53 65 73 73 69 6f 6e 5f  /* ...UaCttSession_ */
-31 ff ff ff ff ff ff ff ff 00 00 00 00 00 4c fd  /* 1.............L. */
-40 00 00 00 00                                   /* @....            */
+4d 53 47 46 72 00 00 00 01 00 00 00 01 00 00 00  /* MSGFr........... */
+02 00 00 00 02 00 00 00 01 00 cd 01 00 00 92 6a  /* ...............j */
+25 6a 81 bf d1 01 02 00 00 00 00 00 00 00 ff ff  /* %j.............. */
+ff ff 10 27 00 00 00 00 00 ff ff ff ff ff ff ff  /* ...'............ */
+ff 00 00 00 00 00 ff ff ff ff ff ff ff ff ff ff  /* ................ */
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff  /* ................ */
+ff ff ff ff ff ff 00 00 00 00 80 4f 32 41 ff ff  /* ...........O2A.. */
+ff 7f                                            /* .. */
+4d 53 47 46 a1 00 00 00 01 00 00 00 01 00 00 00  /* MSGF............ */
+03 00 00 00 03 00 00 00 01 00 d3 01 04 01 00 e3  /* ...............H */
+77 d7 1c 90 95 e2 a4 6d b6 4b e4 0e e0 9e b9 84  /* ....4~..~.l.q.k. */
+78 25 6a 81 bf d1 01 04 00 00 00 00 00 00 00 ff  /* x%j............. */
+ff ff ff c0 27 09 00 00 00 00 ff ff ff ff ff ff  /* ....'........... */
+ff ff ff ff ff ff ff ff ff ff 01 00 44 01 01 36  /* ............D..6 */
+00 00 00 19 00 00 00 6f 70 65 6e 36 32 35 34 31  /* .......open62541 */
+2d 75 73 65 72 6e 61 6d 65 2d 70 6f 6c 69 63 79  /* -username-policy */
+05 00 00 00 75 73 65 72 31 08 00 00 00 70 61 73  /* ....user1....pas */
+73 77 6f 72 64 ff ff ff ff ff ff ff ff ff ff ff  /* sword........... */
+ff                                               /* . */

+ 1 - 1
tests/dumps/client_HELOPN.hex

@@ -6,7 +6,7 @@
 68 74 74 70 3a 2f 2f 6f 70 63 66 6f 75 6e 64 61  /* http://opcfounda */
 74 69 6f 6e 2e 6f 72 67 2f 55 41 2f 53 65 63 75  /* tion.org/UA/Secu */
 72 69 74 79 50 6f 6c 69 63 79 23 4e 6f 6e 65 ff  /* rityPolicy#None. */
-ff ff ff ff ff ff ff 33 00 00 00 01 00 00 00 01  /* .......3........ */
+ff ff ff ff ff ff ff 01 00 00 00 01 00 00 00 01  /* .......3........ */
 00 be 01 00 00 97 db 02 02 a8 d2 ce 01 00 00 00  /* ................ */
 00 00 00 00 00 ff ff ff ff 00 00 00 00 00 00 00  /* ................ */
 00 00 00 00 00 00 00 00 01 00 00 00 01 00 00 00  /* ................ */

+ 8 - 0
tests/dumps/client_Read.hex

@@ -0,0 +1,8 @@
+4d 53 47 46 79 00 00 00 01 00 00 00 01 00 00 00  /* MSGFq........... */
+04 00 00 00 04 00 00 00 01 00 77 02 04 01 00 e3  /* ...............H */
+77 d7 1c 90 95 e2 a4 6d b6 4b e4 0e e0 9e b9 9e  /* ....4~..~.l.q.k. */
+90 25 6a 81 bf d1 01 05 00 00 00 00 00 00 00 ff  /* .%j............. */
+ff ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00  /* ................ */
+00 00 00 00 00 00 01 00 00 00 03 01 00 0a 00 00  /* ................ */
+00 74 68 65 2e 61 6e 73 77 65 72 0d 00 00 00 ff  /* .the.answer..... */
+ff ff ff 00 00 ff ff ff ff                       /* ......... */