Rename tests for nsp_inparen and sp_braces to follow convention

Author: jvsqzj

src/lint/rules/tests/spacing/nsp_inparen.rs

@@ -2,14 +2,14 @@ use crate::lint::rules::tests::common::{set_up, assert_snippet};
 use crate::lint::rules::RuleType;
 
 //  NSP.inparen immediately inside parentheses or brackets
-static NO_SPACE_INPAREN_METHOD_FUNC_INDEX_INCORRECT: &str = "
+static METHOD_FUNC_INDEX_INCORRECT: &str = "
 method this_is_some_method( conf_object_t *dummy_obj ) {
     if ( !dummy_obj[ 0 ] )
         return;
 }
 ";
 #[test]
-fn no_space_inparen_method_func_index_incorrect() {
+fn method_func_index_incorrect() {
     let mut rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::NspInparen,
@@ -20,27 +20,27 @@ fn no_space_inparen_method_func_index_incorrect() {
         (2, 2, 20, 21),
         (2, 2, 22, 23),
     );
-    assert_snippet(NO_SPACE_INPAREN_METHOD_FUNC_INDEX_INCORRECT, expected_errors, &rules);
+    assert_snippet(METHOD_FUNC_INDEX_INCORRECT, expected_errors, &rules);
     // Test rule disable
     rules.nsp_inparen.enabled = false;
-    assert_snippet(NO_SPACE_INPAREN_METHOD_FUNC_INDEX_INCORRECT, vec![], &rules);
+    assert_snippet(METHOD_FUNC_INDEX_INCORRECT, vec![], &rules);
 }
 
 //  NSP.inparen immediately inside parentheses or brackets
-static NO_SPACE_INPAREN_METHOD_FUNC_INDEX_CORRECT: &str = "
+static METHOD_FUNC_INDEX_CORRECT: &str = "
 method this_is_some_method(conf_object_t *dummy_obj) {
     if (!dummy_obj[0])
         return;
 }
 ";
 #[test]
-fn no_space_inparen_method_func_index_correct() {
+fn method_func_index_correct() {
     let rules = set_up();
-    assert_snippet(NO_SPACE_INPAREN_METHOD_FUNC_INDEX_CORRECT, vec![], &rules);
+    assert_snippet(METHOD_FUNC_INDEX_CORRECT, vec![], &rules);
 }
 
 
-pub static NSP_INPAREN_02: &str = "
+pub static COMPOSITE_ARRAY_DECLARATION_AND_TEMPLATES_INCORRECT: &str = "
 bank some_bank {
     group some_group[ i < ( GROUP_COUNT ) ] {
         register some_reg is ( some_template, another_template ) {
@@ -49,14 +49,20 @@ bank some_bank {
     }
 }
 ";
-    #[test]
-    fn style_check_nsp_inparen_02() {
-        // let mut cfg = LintCfg::default();
-        // let mut rules = instantiate_rules(&cfg);
-        // assert_snippet(NSP_INPAREN_02, 6, &rules);
-        // Test rule disable
-        // cfg.nsp_inparen = None;
-        // rules = instantiate_rules(&cfg);
-        // assert_snippet(NSP_INPAREN_02, 0, &rules);
-
-    }
+#[test]
+fn composite_array_declaration_and_templates_incorrect() {
+    let mut rules = set_up();
+    let expected_errors = define_expected_errors!(
+        RuleType::NspInparen,
+        (2, 2, 21, 22),
+        (2, 2, 27, 28),
+        (2, 2, 39, 40),
+        (2, 2, 41, 42),
+        (3, 3, 30, 31),
+        (3, 3, 62, 63),            
+    );
+    assert_snippet(COMPOSITE_ARRAY_DECLARATION_AND_TEMPLATES_INCORRECT, expected_errors, &rules);
+    // Test rule disable
+    rules.nsp_inparen.enabled = false;
+    assert_snippet(COMPOSITE_ARRAY_DECLARATION_AND_TEMPLATES_INCORRECT, vec![], &rules);
+}

src/lint/rules/tests/spacing/sp_braces.rs

@@ -2,7 +2,7 @@ use crate::lint::rules::tests::common::{set_up, assert_snippet};
 use crate::lint::rules::RuleType;
 
 //  SP.braces around braces ({ and })
-static SPACE_BRACES_METHOD_BANK_REGISTER_FIELD_INCORRECT: &str = "
+static METHOD_BANK_REGISTER_FIELD_INCORRECT: &str = "
 method this_is_some_method() {return 0;}
 
 method this_is_empty_method() { }
@@ -18,7 +18,7 @@ bank pcie_config {register command {field mem {
 }
 ";
 #[test]
-fn space_braces_method_bank_register_field_incorrect() {
+fn method_bank_register_field_incorrect() {
     let mut rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::SpBraces,
@@ -29,13 +29,13 @@ fn space_braces_method_bank_register_field_incorrect() {
         (7, 7, 24, 25),
         (7, 7, 43, 44),
     );
-    assert_snippet(SPACE_BRACES_METHOD_BANK_REGISTER_FIELD_INCORRECT, expected_errors, &rules);
+    assert_snippet(METHOD_BANK_REGISTER_FIELD_INCORRECT, expected_errors, &rules);
     // Test rule disable
     rules.sp_brace.enabled = false;
-    assert_snippet(SPACE_BRACES_METHOD_BANK_REGISTER_FIELD_INCORRECT, vec![], &rules);
+    assert_snippet(METHOD_BANK_REGISTER_FIELD_INCORRECT, vec![], &rules);
 }
 
-static SPACE_BRACES_METHOD_BANK_REGISTER_FIELD_CORRECT: &str = "
+static METHOD_BANK_REGISTER_FIELD_CORRECT: &str = "
 method this_is_some_method() { return 0; }
 
 method this_is_empty_method() { }
@@ -51,18 +51,18 @@ bank pcie_config { register command { field mem {
 }
 ";
 #[test]
-fn space_braces_method_bank_register_field_correct() {
+fn method_bank_register_field_correct() {
     let rules = set_up();
-    assert_snippet(SPACE_BRACES_METHOD_BANK_REGISTER_FIELD_CORRECT, vec![], &rules);
+    assert_snippet(METHOD_BANK_REGISTER_FIELD_CORRECT, vec![], &rules);
 }
 
-static SPACE_BRACES_STRUCT_LAYOUT_BITF_INCORRECT: &str = "
+static STRUCT_LAYOUT_BITF_INCORRECT: &str = "
 typedef struct {uint16 idx;} hqm_cq_list_release_ctx_t;
 
 typedef layout \"little-endian\" {bitfields 1 {uint1 cq @ [0:0];} byte;} q_t;
 ";
 #[test]
-fn space_braces_struct_layout_bitf_incorrect() {
+fn struct_layout_bitf_incorrect() {
     let mut rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::SpBraces,
@@ -73,27 +73,27 @@ fn space_braces_struct_layout_bitf_incorrect() {
         (3, 3, 44, 45),
         (3, 3, 62, 63),
     );
-    assert_snippet(SPACE_BRACES_STRUCT_LAYOUT_BITF_INCORRECT, expected_errors, &rules);
+    assert_snippet(STRUCT_LAYOUT_BITF_INCORRECT, expected_errors, &rules);
     // Test rule disable
     rules.sp_brace.enabled = false;
-    assert_snippet(SPACE_BRACES_STRUCT_LAYOUT_BITF_INCORRECT, vec![], &rules);
+    assert_snippet(STRUCT_LAYOUT_BITF_INCORRECT, vec![], &rules);
 }
 
-static SPACE_BRACES_STRUCT_LAYOUT_BITF_CORRECT: &str = "
+static STRUCT_LAYOUT_BITF_CORRECT: &str = "
 typedef struct { uint16 idx; } hqm_cq_list_release_ctx_t;
 
 typedef layout \"little-endian\" { bitfields 1 { uint1 cq @ [0:0]; } byte; } q_t;
 ";
 #[test]
-fn space_braces_struct_layout_bitf_correct() {
+fn struct_layout_bitf_correct() {
     let mut rules = set_up();
-    assert_snippet(SPACE_BRACES_STRUCT_LAYOUT_BITF_CORRECT, vec![], &rules);
+    assert_snippet(STRUCT_LAYOUT_BITF_CORRECT, vec![], &rules);
     // Test rule disable
     rules.sp_brace.enabled = false;
-    assert_snippet(SPACE_BRACES_STRUCT_LAYOUT_BITF_CORRECT, vec![], &rules);
+    assert_snippet(STRUCT_LAYOUT_BITF_CORRECT, vec![], &rules);
 }
 
-pub static SP_BRACES_SWITCHES: &str = "
+pub static SWITCHES_INCORRECT: &str = "
 method test_switch(int some_var) {
     switch (some_var){
     case 1:
@@ -117,15 +117,15 @@ method test_switch(int some_var) {
 }
 ";
 #[test]
-fn style_check_sp_braces_switches() {
+fn switches_incorrect() {
     let mut rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::SpBraces,
         (2, 2, 52, 53),
         (11, 11, 18, 19),
     );
-    assert_snippet(SP_BRACES_SWITCHES, expected_errors, &rules);
+    assert_snippet(SWITCHES_INCORRECT, expected_errors, &rules);
     // Test rule disable
     rules.sp_brace.enabled = false;
-    assert_snippet(SP_BRACES_SWITCHES, vec![], &rules);
+    assert_snippet(SWITCHES_INCORRECT, vec![], &rules);
 }