Get tests passing on Linux

Add AmpqTypesTest for 32 bits (rather non __LP64__) to get passing test numbers on 32 bit and 64 bit Linux to match passing test numbers on MacOs.

src/LibAmqp/AmqpTypes/AmqpTypesTest.cpp

@@ -96,5 +96,75 @@ SUITE(AmqpTypes)
         CHECK_EQUAL(40U, sizeof(amqp_messaging_amqp_value_t));
         CHECK_EQUAL(32U, sizeof(amqp_messaging_footer_t));
     }
+#else
+    // Assuming 32 bits - possible a big mistake
+    TEST_FIXTURE(AmqpTypesFixture, type_sizes)
+    {
+        CHECK_EQUAL(44U, sizeof(amqp_type_t));
+
+        CHECK_EQUAL(16U, sizeof(amqp_array_t));
+        CHECK_EQUAL(28U, sizeof(amqp_binary_t));
+        CHECK_EQUAL(28U, sizeof(amqp_entry_t));
+        CHECK_EQUAL(8U, sizeof(amqp_list_t));
+        CHECK_EQUAL(32U, sizeof(amqp_hash_table_t));
+        CHECK_EQUAL(16U, sizeof(amqp_multiple_symbol_t));
+        CHECK_EQUAL(28U, sizeof(amqp_string_t));
+        CHECK_EQUAL(28U, sizeof(amqp_symbol_t));
+        CHECK_EQUAL(32U, sizeof(amqp_amqp_type_t));
+        CHECK_EQUAL(12U, sizeof(amqp_memory_t));
+    }
+    TEST_FIXTURE(AmqpTypesFixture, error_definition)
+    {
+        CHECK_EQUAL(76U, sizeof(amqp_error_t));
+    }
+    TEST_FIXTURE(AmqpTypesFixture, frames)
+    {
+        CHECK_EQUAL(148U, sizeof(amqp_transport_open_t));
+        CHECK_EQUAL(76U, sizeof(amqp_transport_begin_t));
+        CHECK_EQUAL(168U, sizeof(amqp_transport_attach_t));
+        CHECK_EQUAL(72U, sizeof(amqp_transport_flow_t));
+        CHECK_EQUAL(96U, sizeof(amqp_transport_transfer_t));
+        CHECK_EQUAL(48U, sizeof(amqp_transport_disposition_t));
+        CHECK_EQUAL(88U, sizeof(amqp_transport_detach_t));
+        CHECK_EQUAL(76U, sizeof(amqp_transport_end_t));
+        CHECK_EQUAL(76U, sizeof(amqp_transport_close_t));
+    }
+    TEST_FIXTURE(AmqpTypesFixture, security)
+    {
+        CHECK_EQUAL(16U, sizeof(amqp_security_sasl_mechanisms_t));
+        CHECK_EQUAL(84U, sizeof(amqp_security_sasl_init_t));
+        CHECK_EQUAL(28U, sizeof(amqp_security_sasl_challenge_t));
+        CHECK_EQUAL(28U, sizeof(amqp_security_sasl_response_t));
+        CHECK_EQUAL(32U, sizeof(amqp_security_sasl_outcome_t));
+    }
+    TEST_FIXTURE(AmqpTypesFixture, messaging_addressing)
+    {
+        CHECK_EQUAL(136U, sizeof(amqp_addressing_source_t));
+        CHECK_EQUAL(68U, sizeof(amqp_addressing_target_t));
+        CHECK_EQUAL(8U, sizeof(amqp_addressing_delete_on_close_t));
+        CHECK_EQUAL(8U, sizeof(amqp_addressing_delete_on_no_links_t));
+        CHECK_EQUAL(8U, sizeof(amqp_addressing_delete_on_no_messages_t));
+        CHECK_EQUAL(8U, sizeof(amqp_addressing_delete_on_no_links_or_messages_t));
+    }
+    TEST_FIXTURE(AmqpTypesFixture, messaging_delivery_state)
+    {
+        CHECK_EQUAL(12U, sizeof(amqp_delivery_state_received_t));
+        CHECK_EQUAL(8U, sizeof(amqp_delivery_state_accepted_t));
+        CHECK_EQUAL(76U, sizeof(amqp_delivery_state_rejected_t));
+        CHECK_EQUAL(8U, sizeof(amqp_delivery_state_released_t));
+        CHECK_EQUAL(24U, sizeof(amqp_delivery_state_modified_t));
+    }
+    TEST_FIXTURE(AmqpTypesFixture, messaging)
+    {
+        CHECK_EQUAL(20U, sizeof(amqp_messaging_header_t));
+        CHECK_EQUAL(16U, sizeof(amqp_messaging_delivery_annotations_t));
+        CHECK_EQUAL(16U, sizeof(amqp_messaging_message_annotations_t));
+        CHECK_EQUAL(272U, sizeof(amqp_messaging_properties_t));
+        CHECK_EQUAL(16U, sizeof(amqp_messaging_application_properties_t));
+        CHECK_EQUAL(28U, sizeof(amqp_messaging_data_t));
+        CHECK_EQUAL(8U, sizeof(amqp_messaging_amqp_sequence_t));
+        CHECK_EQUAL(20U, sizeof(amqp_messaging_amqp_value_t));
+        CHECK_EQUAL(16U, sizeof(amqp_messaging_footer_t));
+    }
 #endif
 }

src/LibAmqp/Transport/Connection/ConnectionTest.cpp

@@ -112,6 +112,7 @@ SUITE(Connection)
         connection->state.connection.mode.client.connect(connection, "localhost", 54321);
         loop_while_socket_state_is("Connecting");
         loop_while_connection_state_is("ConnectingSasl");
+        loop_while_connection_state_is("DrainingInput");
         CHECK_EQUAL("Stopped", connection->state.connection.name); // TODO - Should it be Failed
         loop_while_running();
 
@@ -124,6 +125,7 @@ SUITE(Connection)
         connection->state.connection.mode.client.connect(connection, "localhost", 54321);
         loop_while_socket_state_is("Connecting");
         loop_while_connection_state_is("ConnectingAmqp");
+        loop_while_connection_state_is("DrainingInput");
         CHECK_EQUAL("Stopped", connection->state.connection.name); // TODO - Should it be Failed
 
         CHECK(connection->failure_flags & AMQP_CONNECTION_AMQP_NEGOTIATION_REJECTED);