From 8ace6f95b00ad14de7a4e4c1cfa9882969614fa3 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Fri, 18 Sep 2020 06:19:21 +0000 Subject: [PATCH 1/2] [glsl-in] consolidate tests - remove simple lex test as was covered by others - combine related tests to single function - remove redundant prefix in test names --- src/front/glsl/lex_tests.rs | 66 ++++------------------------------ src/front/glsl/parser_tests.rs | 7 ++-- 2 files changed, 9 insertions(+), 64 deletions(-) diff --git a/src/front/glsl/lex_tests.rs b/src/front/glsl/lex_tests.rs index 7710b4eb9e..527434b28f 100644 --- a/src/front/glsl/lex_tests.rs +++ b/src/front/glsl/lex_tests.rs @@ -1,60 +1,8 @@ use super::{lex::Lexer, parser::Token::*, token::TokenMetadata}; #[test] -fn glsl_lex_simple() { - let source = "void main() {\n}"; - let mut lex = Lexer::new(source); - - assert_eq!( - lex.next().unwrap(), - Void(TokenMetadata { - line: 0, - chars: 0..4 - }) - ); - assert_eq!( - lex.next().unwrap(), - Identifier(( - TokenMetadata { - line: 0, - chars: 5..9 - }, - "main".into() - )) - ); - assert_eq!( - lex.next().unwrap(), - LeftParen(TokenMetadata { - line: 0, - chars: 9..10 - }) - ); - assert_eq!( - lex.next().unwrap(), - RightParen(TokenMetadata { - line: 0, - chars: 10..11 - }) - ); - assert_eq!( - lex.next().unwrap(), - LeftBrace(TokenMetadata { - line: 0, - chars: 12..13 - }) - ); - assert_eq!( - lex.next().unwrap(), - RightBrace(TokenMetadata { - line: 1, - chars: 0..1 - }) - ); - assert_eq!(lex.next(), None); -} - -#[test] -fn glsl_lex_line_comment() { +fn comments() { + // line comments let source = "void main // myfunction\n//()\n{}"; let mut lex = Lexer::new(source); assert_eq!( @@ -89,10 +37,8 @@ fn glsl_lex_line_comment() { }) ); assert_eq!(lex.next(), None); -} -#[test] -fn glsl_lex_multi_line_comment() { + // multi line comment let source = "void main /* comment [] {}\n/**\n{}*/{}"; let mut lex = Lexer::new(source); @@ -131,7 +77,7 @@ fn glsl_lex_multi_line_comment() { } #[test] -fn glsl_lex_identifier() { +fn identifier() { let source = "id123_OK 92No æNoø No¾ No好"; let mut lex = Lexer::new(source); @@ -239,7 +185,7 @@ fn glsl_lex_identifier() { } #[test] -fn glsl_lex_version() { +fn version() { let source = "#version 890 core"; let mut lex = Lexer::new(source); @@ -274,7 +220,7 @@ fn glsl_lex_version() { } #[test] -fn glsl_lex_operators() { +fn operators() { let source = "+ - * | & % / += -= *= |= &= %= /= ++ -- || && ^^"; let mut lex = Lexer::new(source); diff --git a/src/front/glsl/parser_tests.rs b/src/front/glsl/parser_tests.rs index 285df911dc..14db86fda0 100644 --- a/src/front/glsl/parser_tests.rs +++ b/src/front/glsl/parser_tests.rs @@ -17,7 +17,8 @@ fn parse_program(source: &str, stage: ShaderStage) -> Result } #[test] -fn glsl_parser_version_invalid() { +fn version() { + // invalid versions assert_eq!( format!( "{:?}", @@ -47,10 +48,8 @@ fn glsl_parser_version_invalid() { ), "InvalidProfile(TokenMetadata { line: 0, chars: 13..18 }, \"smart\")" ); -} -#[test] -fn glsl_parser_version_valid() { + // valid versions let program = parse_program("#version 450\nvoid main() {}", ShaderStage::Vertex).unwrap(); assert_eq!( format!("{:?}", (program.version, program.profile)), From 0b5b8fd949fb85a13ccf7b1ee0fbfcf1cdffdfb5 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Tue, 22 Sep 2020 05:01:55 +0000 Subject: [PATCH 2/2] [glsl-in] Consolidtae lex tests further --- src/front/glsl/lex_tests.rs | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/src/front/glsl/lex_tests.rs b/src/front/glsl/lex_tests.rs index 527434b28f..584baf302c 100644 --- a/src/front/glsl/lex_tests.rs +++ b/src/front/glsl/lex_tests.rs @@ -1,10 +1,9 @@ use super::{lex::Lexer, parser::Token::*, token::TokenMetadata}; #[test] -fn comments() { +fn tokens() { // line comments - let source = "void main // myfunction\n//()\n{}"; - let mut lex = Lexer::new(source); + let mut lex = Lexer::new("void main // myfunction\n//()\n{}"); assert_eq!( lex.next().unwrap(), Void(TokenMetadata { @@ -39,9 +38,7 @@ fn comments() { assert_eq!(lex.next(), None); // multi line comment - let source = "void main /* comment [] {}\n/**\n{}*/{}"; - let mut lex = Lexer::new(source); - + let mut lex = Lexer::new("void main /* comment [] {}\n/**\n{}*/{}"); assert_eq!( lex.next().unwrap(), Void(TokenMetadata { @@ -74,13 +71,9 @@ fn comments() { }) ); assert_eq!(lex.next(), None); -} - -#[test] -fn identifier() { - let source = "id123_OK 92No æNoø No¾ No好"; - let mut lex = Lexer::new(source); + // identifiers + let mut lex = Lexer::new("id123_OK 92No æNoø No¾ No好"); assert_eq!( lex.next().unwrap(), Identifier(( @@ -182,13 +175,9 @@ fn identifier() { )) ); assert_eq!(lex.next(), None); -} - -#[test] -fn version() { - let source = "#version 890 core"; - let mut lex = Lexer::new(source); + // version + let mut lex = Lexer::new("#version 890 core"); assert_eq!( lex.next().unwrap(), Version(TokenMetadata { @@ -217,13 +206,9 @@ fn version() { )) ); assert_eq!(lex.next(), None); -} - -#[test] -fn operators() { - let source = "+ - * | & % / += -= *= |= &= %= /= ++ -- || && ^^"; - let mut lex = Lexer::new(source); + // operators + let mut lex = Lexer::new("+ - * | & % / += -= *= |= &= %= /= ++ -- || && ^^"); assert_eq!( lex.next().unwrap(), Plus(TokenMetadata {