From 2b668a7a4fd31bb36608ffa2da9b53c7d810d5e0 Mon Sep 17 00:00:00 2001
From: Nikhil Parasaram <tommycjniko@gmail.com>
Date: Fri, 4 Jan 2019 00:12:54 +0530
Subject: [PATCH] fix merge conflicts with tests

---
 tests/testdata/outputs_expected/overflow.sol.o.json  |  4 ++--
 .../testdata/outputs_expected/overflow.sol.o.jsonv2  | 12 ++++++------
 tests/testdata/outputs_expected/underflow.sol.o.json |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/testdata/outputs_expected/overflow.sol.o.json b/tests/testdata/outputs_expected/overflow.sol.o.json
index 1a2e7fbf..091b2bb6 100644
--- a/tests/testdata/outputs_expected/overflow.sol.o.json
+++ b/tests/testdata/outputs_expected/overflow.sol.o.json
@@ -1,7 +1,6 @@
 {
 	"error": null,
 	"issues": [{
-		"SourceMap": null,
 		"address": 567,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -10,10 +9,10 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}, {
-		"SourceMap": null,
 		"address": 649,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -22,6 +21,7 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}],
diff --git a/tests/testdata/outputs_expected/overflow.sol.o.jsonv2 b/tests/testdata/outputs_expected/overflow.sol.o.jsonv2
index 002059f8..2ff9c7a0 100644
--- a/tests/testdata/outputs_expected/overflow.sol.o.jsonv2
+++ b/tests/testdata/outputs_expected/overflow.sol.o.jsonv2
@@ -1,27 +1,27 @@
 {
 	"issues": [{
 		"description": {
-			"head": ["The subtraction can underflow."],
-			"tail": ["The binary subtraction operation can result in an integer underflow.\n"]
+			"head": "The subtraction can underflow.",
+			"tail": "The binary subtraction operation can result in an integer underflow.\n"
 		},
 		"extra": {},
 		"locations": [{
 			"sourceMap": "567:1:0"
 		}],
 		"severity": "High",
-		"swcID": "101",
+		"swcID": "SWC-101",
 		"swcTitle": "Integer Overflow and Underflow"
 	}, {
 		"description": {
-			"head": ["The subtraction can underflow."],
-			"tail": ["The binary subtraction operation can result in an integer underflow.\n"]
+			"head": "The subtraction can underflow.",
+			"tail": "The binary subtraction operation can result in an integer underflow.\n"
 		},
 		"extra": {},
 		"locations": [{
 			"sourceMap": "649:1:0"
 		}],
 		"severity": "High",
-		"swcID": "101",
+		"swcID": "SWC-101",
 		"swcTitle": "Integer Overflow and Underflow"
 	}],
 	"meta": {},
diff --git a/tests/testdata/outputs_expected/underflow.sol.o.json b/tests/testdata/outputs_expected/underflow.sol.o.json
index 1a2e7fbf..091b2bb6 100644
--- a/tests/testdata/outputs_expected/underflow.sol.o.json
+++ b/tests/testdata/outputs_expected/underflow.sol.o.json
@@ -1,7 +1,6 @@
 {
 	"error": null,
 	"issues": [{
-		"SourceMap": null,
 		"address": 567,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -10,10 +9,10 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}, {
-		"SourceMap": null,
 		"address": 649,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -22,6 +21,7 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}],