[glsl-in] consolidate tests (#206)

* [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 * [glsl-in] Consolidtae lex tests further
gfx-rs · Sep 22, 2020 · 8c48ae5 · 8c48ae5
1 parent 0651eb8
commit 8c48ae5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 84 deletions.
diff --git a/src/front/glsl/lex_tests.rs b/src/front/glsl/lex_tests.rs
@@ -1,62 +1,9 @@
 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() {
-    let source = "void main // myfunction\n//()\n{}";
-    let mut lex = Lexer::new(source);
+fn tokens() {
+    // line comments
+    let mut lex = Lexer::new("void main // myfunction\n//()\n{}");
     assert_eq!(
         lex.next().unwrap(),
         Void(TokenMetadata {
@@ -89,13 +36,9 @@ fn glsl_lex_line_comment() {
         })
     );
     assert_eq!(lex.next(), None);
-}
-
-#[test]
-fn glsl_lex_multi_line_comment() {
-    let source = "void main /* comment [] {}\n/**\n{}*/{}";
-    let mut lex = Lexer::new(source);
 
+    // multi line comment
+    let mut lex = Lexer::new("void main /* comment [] {}\n/**\n{}*/{}");
     assert_eq!(
         lex.next().unwrap(),
         Void(TokenMetadata {
@@ -128,13 +71,9 @@ fn glsl_lex_multi_line_comment() {
         })
     );
     assert_eq!(lex.next(), None);
-}
-
-#[test]
-fn glsl_lex_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((
@@ -236,13 +175,9 @@ fn glsl_lex_identifier() {
         ))
     );
     assert_eq!(lex.next(), None);
-}
-
-#[test]
-fn glsl_lex_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 {
@@ -271,13 +206,9 @@ fn glsl_lex_version() {
         ))
     );
     assert_eq!(lex.next(), None);
-}
-
-#[test]
-fn glsl_lex_operators() {
-    let source = "+ - * | & % / += -= *= |= &= %= /= ++ -- || && ^^";
-    let mut lex = Lexer::new(source);
 
+    // operators
+    let mut lex = Lexer::new("+ - * | & % / += -= *= |= &= %= /= ++ -- || && ^^");
     assert_eq!(
         lex.next().unwrap(),
         Plus(TokenMetadata {

diff --git 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<Program, ErrorKind>
 }
 
 #[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)),