commit b59a5a9f0accd2352db6c8e6304823aee0fa1f6c
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Dec 13 17:35:56 2018 +0000
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Dec 13 17:35:56 2018 +0000
tree 818bce1c1bbf83ca9673d3c5fbfb07edd797acb5
parent 7335aed2830e8d30f2eafc1fbc3a90a7939eb964

Fix OperandExtraParamsTest failures

After rebasing, new operand types were added to list of inputs, but
not to the switch that creates ExtraParams values.

Test: OperandExtraParamsTest
Bug: 120973385
Change-Id: Iad4a427b691ece676f13aa2ce6dfc406d12bbcfb

runtime/test/TestOperandExtraParams.cpp

diff --git a/runtime/test/TestOperandExtraParams.cpp b/runtime/test/TestOperandExtraParams.cpp
index 8afcf13..3ec3700 100644
--- a/runtime/test/TestOperandExtraParams.cpp
+++ b/runtime/test/TestOperandExtraParams.cpp
@@ -44,6 +44,7 @@
         static uint32_t dims[4] = {1, 2, 3, CHANNEL_DIM_SIZE};
         switch (dataType) {
             case ANEURALNETWORKS_FLOAT32:
+            case ANEURALNETWORKS_FLOAT16:
             case ANEURALNETWORKS_INT32:
             case ANEURALNETWORKS_UINT32:
             case ANEURALNETWORKS_BOOL:
@@ -58,6 +59,7 @@
             case ANEURALNETWORKS_TENSOR_FLOAT32:
             case ANEURALNETWORKS_TENSOR_FLOAT16:
             case ANEURALNETWORKS_TENSOR_INT32:
+            case ANEURALNETWORKS_TENSOR_BOOL8:
             case ANEURALNETWORKS_TENSOR_QUANT8_SYMM_PER_CHANNEL:
                 return {.type = dataType,
                         .dimensionCount = 4,
@@ -141,16 +143,16 @@
 TEST_F(OperandExtraParamsTest, TestIgnoring) {
     // Test for operands that are expected to ignore extensions
     for (uint32_t dataType : kOperandCodeIgnoringExt) {
-        testAddingOperand(dataType, createExtNone(), true);
-        testAddingOperand(dataType, createExtChannelQuant(), true);
+        testAddingOperand(dataType, createExtNone(), /*expectSuccess=*/true);
+        testAddingOperand(dataType, createExtChannelQuant(), /*expectSuccess=*/true);
     }
 }
 
 TEST_F(OperandExtraParamsTest, TestChannelQuant) {
     // Test for operands that are expected to see ChannelQuant extension
     for (uint32_t dataType : kOperandCodeChannelQuant) {
-        testAddingOperand(dataType, createExtNone(), false);
-        testAddingOperand(dataType, createExtChannelQuant(), true);
+        testAddingOperand(dataType, createExtNone(), /*expectSuccess=*/false);
+        testAddingOperand(dataType, createExtChannelQuant(), /*expectSuccess=*/true);
     }
 }
 
@@ -163,7 +165,7 @@
                                                         .scaleCount = 4,
                                                 }};
     for (uint32_t dataType : kOperandCodeChannelQuant) {
-        testAddingOperand(dataType, ext, false);
+        testAddingOperand(dataType, ext, /*expectSuccess=*/false);
     }
 }
 
@@ -182,8 +184,8 @@
                                                               }};
 
     for (uint32_t dataType : kOperandCodeChannelQuant) {
-        testAddingOperand(dataType, lowScaleCountExt, false);
-        testAddingOperand(dataType, highScaleCountExt, false);
+        testAddingOperand(dataType, lowScaleCountExt, /*expectSuccess=*/false);
+        testAddingOperand(dataType, highScaleCountExt, /*expectSuccess=*/false);
     }
 }
 
@@ -196,7 +198,7 @@
                                                         .scaleCount = 4,
                                                 }};
     for (uint32_t dataType : kOperandCodeChannelQuant) {
-        testAddingOperand(dataType, ext, false);
+        testAddingOperand(dataType, ext, /*expectSuccess=*/false);
     }
 }
 
@@ -208,7 +210,7 @@
                                                         .scaleCount = 4,
                                                 }};
     for (uint32_t dataType : kOperandCodeChannelQuant) {
-        testAddingOperand(dataType, ext, false);
+        testAddingOperand(dataType, ext, /*expectSuccess=*/false);
     }
 }