From da74d350d628dca19c9ac2b6c057e518203eb3f3 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Thu, 22 Nov 2018 16:57:29 -0500 Subject: Add cpplint (#90) Add cpplint --- src/amberscript/parser_test.cc | 106 +++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 46 deletions(-) (limited to 'src/amberscript/parser_test.cc') diff --git a/src/amberscript/parser_test.cc b/src/amberscript/parser_test.cc index c697718..276ac4b 100644 --- a/src/amberscript/parser_test.cc +++ b/src/amberscript/parser_test.cc @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/amberscript/parser.h" +#include + #include "gtest/gtest.h" +#include "src/amberscript/parser.h" namespace amber { namespace amberscript { @@ -140,13 +142,14 @@ TEST_P(AmberScriptParserShaderPassThroughTest, ShaderPassThroughWithoutVertex) { "allowed", r.Error()); } -INSTANTIATE_TEST_CASE_P(AmberScriptParserShaderPassThroughTests, - AmberScriptParserShaderPassThroughTest, - testing::Values(NameData{"fragment"}, - NameData{"geometry"}, - NameData{"tessellation_evaluation"}, - NameData{"tessellation_control"}, - NameData{"compute"}), ); +INSTANTIATE_TEST_CASE_P( + AmberScriptParserShaderPassThroughTests, + AmberScriptParserShaderPassThroughTest, + testing::Values(NameData{"fragment"}, + NameData{"geometry"}, + NameData{"tessellation_evaluation"}, + NameData{"tessellation_control"}, + NameData{"compute"}), ); // NOLINT(whitespace/parens) TEST_F(AmberScriptParserTest, ShaderPassThroughUnknownShaderType) { std::string in = "SHADER UNKNOWN my_shader PASSTHROUGH"; @@ -326,7 +329,9 @@ INSTANTIATE_TEST_CASE_P( ShaderType::kTessellationEvaluation}, ShaderTypeData{"tessellation_control", ShaderType::kTessellationControl}, - ShaderTypeData{"compute", ShaderType::kCompute}), ); + ShaderTypeData{ + "compute", + ShaderType::kCompute}), ); // NOLINT(whitespace/parens) using AmberScriptParserShaderFormatTest = testing::TestWithParam; @@ -358,9 +363,12 @@ TEST_P(AmberScriptParserShaderFormatTest, ShaderFormats) { INSTANTIATE_TEST_CASE_P( AmberScriptParserTestsShaderFormat, AmberScriptParserShaderFormatTest, - testing::Values(ShaderFormatData{"GLSL", ShaderFormat::kGlsl}, - ShaderFormatData{"SPIRV-ASM", ShaderFormat::kSpirvAsm}, - ShaderFormatData{"SPIRV-HEX", ShaderFormat::kSpirvHex}), ); + testing::Values( + ShaderFormatData{"GLSL", ShaderFormat::kGlsl}, + ShaderFormatData{"SPIRV-ASM", ShaderFormat::kSpirvAsm}, + ShaderFormatData{ + "SPIRV-HEX", + ShaderFormat::kSpirvHex}), ); // NOLINT(whitespace/parens) TEST_F(AmberScriptParserTest, DuplicateShaderName) { std::string in = R"( @@ -629,13 +637,15 @@ END)"; INSTANTIATE_TEST_CASE_P( AmberScriptParserPipelineAttachTests, AmberScriptParserPipelineAttachTest, - testing::Values(ShaderTypeData{"vertex", ShaderType::kVertex}, - ShaderTypeData{"fragment", ShaderType::kFragment}, - ShaderTypeData{"geometry", ShaderType::kGeometry}, - ShaderTypeData{"tessellation_evaluation", - ShaderType::kTessellationEvaluation}, - ShaderTypeData{"tessellation_control", - ShaderType::kTessellationControl}), ); + testing::Values( + ShaderTypeData{"vertex", ShaderType::kVertex}, + ShaderTypeData{"fragment", ShaderType::kFragment}, + ShaderTypeData{"geometry", ShaderType::kGeometry}, + ShaderTypeData{"tessellation_evaluation", + ShaderType::kTessellationEvaluation}, + ShaderTypeData{ + "tessellation_control", + ShaderType::kTessellationControl}), ); // NOLINT(whitespace/parens) TEST_F(AmberScriptParserTest, PipelineEntryPoint) { std::string in = R"( @@ -1598,7 +1608,9 @@ INSTANTIATE_TEST_CASE_P( BufferTypeData{"index", BufferType::kIndex}, BufferTypeData{"sampled", BufferType::kSampled}, BufferTypeData{"color", BufferType::kColor}, - BufferTypeData{"depth", BufferType::kDepth}), ); + BufferTypeData{ + "depth", + BufferType::kDepth}), ); // NOLINT(whitespace/parens) using AmberScriptParserBufferDataTypeTest = testing::TestWithParam; TEST_P(AmberScriptParserBufferDataTypeTest, BufferTypes) { @@ -1639,7 +1651,8 @@ INSTANTIATE_TEST_CASE_P( BufferData{"vec4", DataType::kUint32, 4, 1}, BufferData{"mat2x4", DataType::kInt32, 2, 4}, BufferData{"mat3x3", DataType::kFloat, 3, 3}, - BufferData{"mat4x2", DataType::kUint16, 4, 2}), ); + BufferData{"mat4x2", DataType::kUint16, 4, + 2}), ); // NOLINT(whitespace/parens) using AmberScriptParserBufferDataTypeInvalidTest = testing::TestWithParam; @@ -1654,31 +1667,32 @@ TEST_P(AmberScriptParserBufferDataTypeInvalidTest, BufferTypes) { ASSERT_FALSE(r.IsSuccess()) << test_data.name; EXPECT_EQ("1: invalid data_type provided", r.Error()) << test_data.name; } -INSTANTIATE_TEST_CASE_P(AmberScriptParserBufferDataTypeInvalidTest, - AmberScriptParserBufferDataTypeInvalidTest, - testing::Values(NameData{"int17"}, - NameData{"uintt0"}, - NameData{"vec7"}, - NameData{"vec27"}, - NameData{"vec2>"}, - NameData{"vec2>"}, - NameData{"vec2float>"}, - NameData{"vec2"}, - NameData{"vec2<>"}, - NameData{"vec2"}, - NameData{"mat1x1"}, - NameData{"mat5x2"}, - NameData{"mat2x5"}, - NameData{"mat22x22"}, - NameData{"matx5"}, - NameData{"mat2"}, - NameData{"mat2x"}, - NameData{"mat2x2>"}, - NameData{"mat2x2>"}, - NameData{"mat2x2"}, - NameData{"mat2x2"}, - NameData{"mat2x2<>"}), ); +INSTANTIATE_TEST_CASE_P( + AmberScriptParserBufferDataTypeInvalidTest, + AmberScriptParserBufferDataTypeInvalidTest, + testing::Values(NameData{"int17"}, + NameData{"uintt0"}, + NameData{"vec7"}, + NameData{"vec27"}, + NameData{"vec2>"}, + NameData{"vec2>"}, + NameData{"vec2float>"}, + NameData{"vec2"}, + NameData{"vec2<>"}, + NameData{"vec2"}, + NameData{"mat1x1"}, + NameData{"mat5x2"}, + NameData{"mat2x5"}, + NameData{"mat22x22"}, + NameData{"matx5"}, + NameData{"mat2"}, + NameData{"mat2x"}, + NameData{"mat2x2>"}, + NameData{"mat2x2>"}, + NameData{"mat2x2"}, + NameData{"mat2x2"}, + NameData{"mat2x2<>"}), ); // NOLINT(whitespace/parens) } // namespace amberscript } // namespace amber -- cgit v1.2.3