Operands impl and assertions

Author: dburriss

src/getter.rs

@@ -556,7 +556,7 @@ impl Getter for JavaCode {
             // | Throws2 | EQ | EQEQ | AMP | AMPAMP | AMPEQ | LT | LTLT | LTEQ | LTLTEQ | BANGEQ
             // | GTEQ | GTGTEQ | GTGTGT | GTGTGTEQ | PLUSEQ | BANG | STAREQ | SLASHEQ | PERCENTEQ
             // | CARET | CARETEQ | LBRACE | RBRACE | QMARK | Instanceof 
-            // Operator: function calls?
+            // Operator: function calls
             MethodInvocation
             // Operator: control flow
             | If | Else | Switch | Case | Try | Catch | Throw | Throws | Throws2 | For | While | Continue | Break | Do | Finally
@@ -570,16 +570,14 @@ impl Getter for JavaCode {
             | PLUS | DASH | STAR | SLASH | AMP | PIPE | CARET | PERCENT| LTLT | GTGT | GTGTGT
             | PLUSEQ | DASHEQ | STAREQ | SLASHEQ | AMPEQ | PIPEEQ | CARETEQ | PERCENTEQ | LTLTEQ | GTGTEQ | GTGTGTEQ
             // type identifier
-            | TypeIdentifier 
-            // Literals
-            | IntegralType | FloatingPointType | BooleanType | NullLiteral
+            | TypeIdentifier | IntegralType | FloatingPointType | BooleanType
             => {
                 println!("operator: {}", node.object().kind().to_string());
                 HalsteadType::Operator
             },
 
-            // variables, constants
-            Identifier | Literal  => {
+            // Operands: variables, constants, literals
+            Identifier | NullLiteral | ClassLiteral | StringLiteral | CharacterLiteral | HexIntegerLiteral | OctalIntegerLiteral | BinaryIntegerLiteral | DecimalIntegerLiteral | HexFloatingPointLiteral | DecimalFloatingPointLiteral  => {
                 println!("operand: {} ", node.object().kind().to_string());
                 HalsteadType::Operand
             },

src/metrics/halstead.rs

@@ -542,7 +542,7 @@ mod tests {
             [
                 (u_operators, 16, usize), // void ; ( String [ ] ) { , int = + / format . }
                 (operators, 33, usize),
-                (u_operands, 11, usize), // main, a, b, c, avg, 3, 5, MessageFormat.format, format, "{}"
+                (u_operands, 11, usize), // main args a b c avg 5 3 MessageFormat format "{0}"
                 (operands, 21, usize)
             ]
         );