replace myersDiffbyLinebyChar with just diff

bmcutler · bmcutler · commit 677c51b4ade7 · 2017-08-25T16:05:12.000-04:00
diff --git a/examples/01_simple_python/config/config.json b/examples/01_simple_python/config/config.json
@@ -16,7 +16,7 @@
           {
               // Grade by "diffing" the student output with an
               // instructor-provided file.
-              "method" : "myersDiffbyLinebyChar",
+              "method" : "diff",
               // The student's output. Corresponds to the position
               // of a command in the "command" list above: since
               // "python *.py" is the first command, it's output
diff --git a/examples/02_simple_cpp/config/config.json b/examples/02_simple_cpp/config/config.json
@@ -19,7 +19,7 @@
       "points" : 15, 
       "validation" : [
         {
-          "method" : "myersDiffbyLinebyChar",
+          "method" : "diff",
           "actual_file" : "STDOUT.txt",
           "description" : "Program Output",
           "expected_file" : "test1_output.txt"
diff --git a/examples/03_multipart/config/config.json b/examples/03_multipart/config/config.json
@@ -13,7 +13,7 @@
             "points" : 3,
             "validation" : [
                 { 
-                    "method" : "myersDiffbyLinebyChar",
+                    "method" : "diff",
                     "actual_file" : "STDOUT.txt",
                     "description" : "Program Output",
                     "expected_file" : "part1_sol.txt"
@@ -26,7 +26,7 @@
             "points" : 4,
             "validation" : [
                 { 
-                    "method" : "myersDiffbyLinebyChar",
+                    "method" : "diff",
                     "actual_file" : "STDOUT.txt",
                     "description" : "Program Output",
                     "expected_file" : "part2_sol.txt"
@@ -39,7 +39,7 @@
             "points" : 3,
             "validation" : [
                 { 
-                    "method" : "myersDiffbyLinebyChar",
+                    "method" : "diff",
                     "actual_file" : "STDOUT.txt",
                     "description" : "Program Output",
                     "expected_file" : "part3_sol.txt"
diff --git a/examples/04_python_static_analysis/config/config.json b/examples/04_python_static_analysis/config/config.json
@@ -14,7 +14,7 @@
       "validation" : [
         // First, ensure that the student received the correct answer.
         {
-          "method" : "myersDiffbyLinebyChar",
+          "method" : "diff",
 	  "actual_file" : "STDOUT_0.txt",
 	  "description" : "Program Output",
 	  "expected_file" : "output.txt"
diff --git a/examples/11_resources/config/config.json b/examples/11_resources/config/config.json
@@ -18,7 +18,7 @@
       "points" : 4,
       "validation" : [
         {
-            "method" : "myersDiffbyLinebyChar",
+            "method" : "diff",
             "actual_file" : "STDOUT.txt",
             "description" : "Program Output",
             "expected_file" : "simple_out.txt"
diff --git a/examples/13_cmake_compilation/config/config.json b/examples/13_cmake_compilation/config/config.json
@@ -21,7 +21,7 @@
             "validation" : 
             [
                 {
-                    "method" : "myersDiffbyLinebyChar",
+                    "method" : "diff",
                     "actual_file" : "STDOUT.txt",
                     "description" : "Program Output",
                     "expected_file" : "output.txt"

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`{`
`17`	`17`	`// Grade by "diffing" the student output with an`
`18`	`18`	`// instructor-provided file.`
`19`		`- "method" : "myersDiffbyLinebyChar",`
	`19`	`+ "method" : "diff",`
`20`	`20`	`// The student's output. Corresponds to the position`
`21`	`21`	`// of a command in the "command" list above: since`
`22`	`22`	`// "python *.py" is the first command, it's output`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"points" : 15,`
`20`	`20`	`"validation" : [`
`21`	`21`	`{`
`22`		`- "method" : "myersDiffbyLinebyChar",`
	`22`	`+ "method" : "diff",`
`23`	`23`	`"actual_file" : "STDOUT.txt",`
`24`	`24`	`"description" : "Program Output",`
`25`	`25`	`"expected_file" : "test1_output.txt"`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"validation" : [`
`15`	`15`	`// First, ensure that the student received the correct answer.`
`16`	`16`	`{`
`17`		`- "method" : "myersDiffbyLinebyChar",`
	`17`	`+ "method" : "diff",`
`18`	`18`	`"actual_file" : "STDOUT_0.txt",`
`19`	`19`	`"description" : "Program Output",`
`20`	`20`	`"expected_file" : "output.txt"`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"points" : 4,`
`19`	`19`	`"validation" : [`
`20`	`20`	`{`
`21`		`- "method" : "myersDiffbyLinebyChar",`
	`21`	`+ "method" : "diff",`
`22`	`22`	`"actual_file" : "STDOUT.txt",`
`23`	`23`	`"description" : "Program Output",`
`24`	`24`	`"expected_file" : "simple_out.txt"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"validation" :`
`22`	`22`	`[`
`23`	`23`	`{`
`24`		`- "method" : "myersDiffbyLinebyChar",`
	`24`	`+ "method" : "diff",`
`25`	`25`	`"actual_file" : "STDOUT.txt",`
`26`	`26`	`"description" : "Program Output",`
`27`	`27`	`"expected_file" : "output.txt"`