Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155d748f authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Nfc: Vts: modify WriteInvalidAndThenValidCommand am: a915c5a2 

am: fe5dd573

Change-Id: I9721de547efb1c3017bb014f6932f1c9c873e9f8
parents 1ea71cc4 fe5dd573

nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp

+5 −10
Original line number Original line Diff line number Diff line
@@ -46,8 +46,6 @@ using ::android::sp; 
    { 0x20, 0x01, 0x00 }

    { 0x20, 0x01, 0x00 }

#define INVALID_COMMAND \

#define INVALID_COMMAND \

  { 0x20, 0x00, 0x00 }

  { 0x20, 0x00, 0x00 }

#define FAULTY_DATA_PACKET \

  { 0x00, 0x00, 0xFF }





#define LOOP_BACK_HEADER_SIZE 3

#define LOOP_BACK_HEADER_SIZE 3

#define SYNTAX_ERROR 5

#define SYNTAX_ERROR 5
@@ -271,8 +269,8 @@ TEST_F(NfcHidlTest, WriteInvalidCommand) { 




/*

/*

 * WriteInvalidAndThenValidCommand:

 * WriteInvalidAndThenValidCommand:

 * Sends an Faulty Data Packet

 * Sends an Invalid command

 * Waits for CORE_INTERFACE_ERROR_NTF

 * Waits for response

 * Checks SYNTAX_ERROR status

 * Checks SYNTAX_ERROR status

 * Repeat for 100 times appending 0xFF each time to the packet

 * Repeat for 100 times appending 0xFF each time to the packet

 * Send CORE_CONN_CREATE_CMD for loop-back mode

 * Send CORE_CONN_CREATE_CMD for loop-back mode
@@ -303,7 +301,7 @@ TEST_F(NfcHidlTest, WriteInvalidAndThenValidCommand) { 
    EXPECT_EQ((int)NfcStatus::OK, res.args->last_data_[3]);

    EXPECT_EQ((int)NfcStatus::OK, res.args->last_data_[3]);





    // Send an Error Data Packet

    // Send an Error Data Packet

    cmd = FAULTY_DATA_PACKET;

    cmd = INVALID_COMMAND;

    data = cmd;

    data = cmd;

    size_t size = data.size();

    size_t size = data.size();
@@ -311,13 +309,10 @@ TEST_F(NfcHidlTest, WriteInvalidAndThenValidCommand) { 
        data.resize(++size);

        data.resize(++size);

        data[size - 1] = 0xFF;

        data[size - 1] = 0xFF;

        EXPECT_EQ(data.size(), nfc_->write(data));

        EXPECT_EQ(data.size(), nfc_->write(data));

        // Wait for CORE_INTERFACE_ERROR_NTF

        // Wait for response with SYNTAX_ERROR

        res = nfc_cb_->WaitForCallback(kCallbackNameSendData);

        res = nfc_cb_->WaitForCallback(kCallbackNameSendData);

        EXPECT_TRUE(res.no_timeout);

        EXPECT_TRUE(res.no_timeout);

        EXPECT_EQ(5ul, res.args->last_data_.size());

        EXPECT_EQ(4ul, res.args->last_data_.size());

        EXPECT_EQ(0x60, res.args->last_data_[0]);

        EXPECT_EQ(0x08, res.args->last_data_[1]);

        EXPECT_EQ(0x02, res.args->last_data_[2]);

        EXPECT_EQ(SYNTAX_ERROR, res.args->last_data_[3]);

        EXPECT_EQ(SYNTAX_ERROR, res.args->last_data_[3]);

  }

  }