regenareted tests expected json output

tests/expected_json/external_function.external-function.json

@@ -11,35 +11,35 @@
         "vuln": "ExternalFunc"
     },
     {
-        "contract": "ContractWithFunctionNotCalled",
+        "contract": "ContractWithFunctionNotCalled2",
         "filename": "tests/external_function.sol",
-        "func": "funcNotCalled2",
+        "func": "funcNotCalled",
         "sourceMapping": {
             "filename": "tests/external_function.sol",
-            "length": 41,
-            "start": 304
+            "length": 304,
+            "start": 552
         },
         "vuln": "ExternalFunc"
     },
     {
         "contract": "ContractWithFunctionNotCalled",
         "filename": "tests/external_function.sol",
-        "func": "funcNotCalled3",
+        "func": "funcNotCalled2",
         "sourceMapping": {
             "filename": "tests/external_function.sol",
             "length": 41,
-            "start": 257
+            "start": 304
         },
         "vuln": "ExternalFunc"
     },
     {
-        "contract": "ContractWithFunctionNotCalled2",
+        "contract": "ContractWithFunctionNotCalled",
         "filename": "tests/external_function.sol",
-        "func": "funcNotCalled",
+        "func": "funcNotCalled3",
         "sourceMapping": {
             "filename": "tests/external_function.sol",
-            "length": 304,
-            "start": 552
+            "length": 41,
+            "start": 257
         },
         "vuln": "ExternalFunc"
     }

tests/expected_json/naming_convention.naming-convention.json

@@ -1,4 +1,15 @@
 [
+    {
+        "constant": "l",
+        "contract": "T",
+        "filename": "tests/naming_convention.sol",
+        "sourceMapping": {
+            "filename": "tests/naming_convention.sol",
+            "length": 10,
+            "start": 847
+        },
+        "vuln": "NamingConvention"
+    },
     {
         "contract": "T",
         "filename": "tests/naming_convention.sol",
@@ -20,13 +31,6 @@
         },
         "vuln": "NamingConvention"
     },
-    {
-        "contract": "naming",
-        "event": "event_",
-        "filename": "tests/naming_convention.sol",
-        "sourceMapping": null,
-        "vuln": "NamingConvention"
-    },
     {
         "contract": "naming",
         "filename": "tests/naming_convention.sol",
@@ -39,69 +43,58 @@
         "vuln": "NamingConvention"
     },
     {
+        "constant": "MY_other_CONSTANT",
         "contract": "naming",
         "filename": "tests/naming_convention.sol",
         "sourceMapping": {
             "filename": "tests/naming_convention.sol",
-            "length": 16,
-            "start": 183
+            "length": 35,
+            "start": 141
         },
-        "variable": "Var_One",
         "vuln": "NamingConvention"
     },
     {
         "contract": "naming",
-        "enum": "numbers",
         "filename": "tests/naming_convention.sol",
         "sourceMapping": {
             "filename": "tests/naming_convention.sol",
-            "length": 23,
-            "start": 77
+            "length": 16,
+            "start": 183
         },
+        "variable": "Var_One",
         "vuln": "NamingConvention"
     },
     {
         "contract": "naming",
         "filename": "tests/naming_convention.sol",
+        "function": "GetOne",
         "sourceMapping": {
             "filename": "tests/naming_convention.sol",
-            "length": 20,
-            "start": 227
+            "length": 71,
+            "start": 405
         },
-        "struct": "test",
         "vuln": "NamingConvention"
     },
     {
-        "constant": "MY_other_CONSTANT",
         "contract": "naming",
+        "enum": "numbers",
         "filename": "tests/naming_convention.sol",
         "sourceMapping": {
             "filename": "tests/naming_convention.sol",
-            "length": 35,
-            "start": 141
-        },
-        "vuln": "NamingConvention"
-    },
-    {
-        "constant": "l",
-        "contract": "T",
-        "filename": "tests/naming_convention.sol",
-        "sourceMapping": {
-            "filename": "tests/naming_convention.sol",
-            "length": 10,
-            "start": 847
+            "length": 23,
+            "start": 77
         },
         "vuln": "NamingConvention"
     },
     {
         "contract": "naming",
         "filename": "tests/naming_convention.sol",
-        "function": "GetOne",
         "sourceMapping": {
             "filename": "tests/naming_convention.sol",
-            "length": 71,
-            "start": 405
+            "length": 20,
+            "start": 227
         },
+        "struct": "test",
         "vuln": "NamingConvention"
     },
     {
@@ -127,5 +120,12 @@
             "start": 748
         },
         "vuln": "NamingConvention"
+    },
+    {
+        "contract": "naming",
+        "event": "event_",
+        "filename": "tests/naming_convention.sol",
+        "sourceMapping": null,
+        "vuln": "NamingConvention"
     }
 ]

tests/expected_json/pragma.0.4.24.pragma.json

@@ -2,13 +2,13 @@
     {
         "sourceMapping": [
             {
-                "filename": "tests/pragma.0.4.24.sol",
-                "length": 23,
+                "filename": "tests/pragma.0.4.23.sol",
+                "length": 24,
                 "start": 0
             },
             {
-                "filename": "tests/pragma.0.4.23.sol",
-                "length": 24,
+                "filename": "tests/pragma.0.4.24.sol",
+                "length": 23,
                 "start": 0
             }
         ],

tests/expected_json/uninitialized.uninitialized-state.json

@@ -21,66 +21,66 @@
         "vuln": "UninitializedStateVars"
     },
     {
-        "contract": "Uninitialized",
+        "contract": "Test2",
         "filename": "tests/uninitialized.sol",
         "functions": [
-            "transfer"
+            "use"
         ],
         "sourceMapping": [
             {
                 "filename": "tests/uninitialized.sol",
-                "length": 19,
-                "start": 55
+                "length": 15,
+                "start": 695
             },
             {
                 "filename": "tests/uninitialized.sol",
-                "length": 82,
-                "start": 81
+                "length": 117,
+                "start": 875
             }
         ],
-        "variable": "destination",
+        "variable": "st",
         "vuln": "UninitializedStateVars"
     },
     {
         "contract": "Test2",
         "filename": "tests/uninitialized.sol",
         "functions": [
-            "use"
+            "init"
         ],
         "sourceMapping": [
             {
                 "filename": "tests/uninitialized.sol",
-                "length": 15,
-                "start": 695
+                "length": 6,
+                "start": 748
             },
             {
                 "filename": "tests/uninitialized.sol",
-                "length": 117,
-                "start": 875
+                "length": 52,
+                "start": 817
             }
         ],
-        "variable": "st",
+        "variable": "v",
         "vuln": "UninitializedStateVars"
     },
     {
-        "contract": "Test2",
+        "contract": "Uninitialized",
         "filename": "tests/uninitialized.sol",
         "functions": [
-            "init"
+            "transfer"
         ],
         "sourceMapping": [
             {
                 "filename": "tests/uninitialized.sol",
-                "length": 6,
-                "start": 748
+                "length": 19,
+                "start": 55
             },
             {
                 "filename": "tests/uninitialized.sol",
-                "length": 52,
-                "start": 817
+                "length": 82,
+                "start": 81
             }
         ],
-        "variable": "v",
+        "variable": "destination",
         "vuln": "UninitializedStateVars"
     }
 ]