Browse Source

Fix compilation errors in revel tests

Recent changes to the revel framework broke our revel tests.  (Our code
seems to depend on whatever is in the master branch of revel's github
repository at the moment that we run the tests, so I guess problems
like this are inevitable.)

Specifically, the changes that broke us are:

 - controller.RenderJson was renamed to RenderJSON
 - controller.RenderArgs was renamed to ViewArgs

https://github.com/revel/revel/commit/6ac1603a23df162d22b6e0f5412f94ed8e427e33
https://github.com/revel/revel/commit/0e454f2ce7674994c9fdaa4683bac5a4e383b0e1
Michael Hixson 8 years ago
parent
commit
020c80574f

+ 5 - 5
frameworks/Go/revel/src/benchmark/app/controllers/app.go

@@ -70,7 +70,7 @@ type App struct {
 }
 
 func (c App) Json() revel.Result {
-	return c.RenderJson(MessageStruct{"Hello, World!"})
+	return c.RenderJSON(MessageStruct{"Hello, World!"})
 }
 
 func (c App) Plaintext() revel.Result {
@@ -85,7 +85,7 @@ func (c App) Db(queries int) revel.Result {
 		if err != nil {
 			revel.ERROR.Fatalf("Error scanning world row: %v", err)
 		}
-		return c.RenderJson(w)
+		return c.RenderJSON(w)
 	}
 
 	ww := make([]World, queries)
@@ -96,7 +96,7 @@ func (c App) Db(queries int) revel.Result {
 			revel.ERROR.Fatalf("Error scanning world row: %v", err)
 		}
 	}
-	return c.RenderJson(ww)
+	return c.RenderJSON(ww)
 }
 
 func (c App) Update(queries int) revel.Result {
@@ -112,7 +112,7 @@ func (c App) Update(queries int) revel.Result {
 		if err != nil {
 			revel.ERROR.Fatalf("Error updating row: %v", err)
 		}
-		return c.RenderJson(&w)
+		return c.RenderJSON(&w)
 	}
 
 	ww := make([]World, queries)
@@ -125,7 +125,7 @@ func (c App) Update(queries int) revel.Result {
 		ww[i].RandomNumber = uint16(rand.Intn(WorldRowCount) + 1)
 		updateStatement.Exec(ww[i].RandomNumber, ww[i].Id)
 	}
-	return c.RenderJson(ww)
+	return c.RenderJSON(ww)
 }
 
 func (c App) Fortune() revel.Result {

+ 5 - 5
frameworks/Go/revel/src/benchmark/app/controllers/jet.go

@@ -16,7 +16,7 @@ func (c App) JetDb(queries int) revel.Result {
 		if err != nil {
 			revel.ERROR.Fatalf("Db/WorldSelect error: %v", err)
 		}
-		return c.RenderJson(w)
+		return c.RenderJSON(w)
 	}
 
 	ww := make([]World, queries)
@@ -26,7 +26,7 @@ func (c App) JetDb(queries int) revel.Result {
 			revel.ERROR.Fatalf("Db/WorldSelect2 error: %v", err)
 		}
 	}
-	return c.RenderJson(ww)
+	return c.RenderJSON(ww)
 }
 
 func (c App) JetUpdate(queries int) revel.Result {
@@ -40,7 +40,7 @@ func (c App) JetUpdate(queries int) revel.Result {
 		if err = db.Jet.Query(WorldUpdate, w.RandomNumber, w.Id).Run(); err != nil {
 			revel.ERROR.Fatalf("Update/WorldUpdate error: %v", err)
 		}
-		return c.RenderJson(&w)
+		return c.RenderJSON(&w)
 	}
 
 	ww := make([]World, queries)
@@ -54,7 +54,7 @@ func (c App) JetUpdate(queries int) revel.Result {
 			revel.ERROR.Fatalf("Update/WorldUpdate2 error: %v", err)
 		}
 	}
-	return c.RenderJson(ww)
+	return c.RenderJSON(ww)
 }
 
 func (c App) JetFortune() revel.Result {
@@ -65,6 +65,6 @@ func (c App) JetFortune() revel.Result {
 	}
 	fortunes = append(fortunes, &Fortune{Message: "Additional fortune added at request time."})
 	sort.Sort(ByMessage{fortunes})
-	c.RenderArgs["fortunes"] = fortunes
+	c.ViewArgs["fortunes"] = fortunes
 	return c.RenderTemplate("App/Fortune.html")
 }

+ 5 - 5
frameworks/Go/revel/src/benchmark/app/controllers/qbs.go

@@ -19,7 +19,7 @@ func (c App) QbsDb(queries int) revel.Result {
 		if err != nil {
 			revel.ERROR.Fatalf("Error scanning world row: %v", err)
 		}
-		return c.RenderJson(w)
+		return c.RenderJSON(w)
 	}
 
 	ww := make([]World, queries)
@@ -29,7 +29,7 @@ func (c App) QbsDb(queries int) revel.Result {
 			revel.ERROR.Fatalf("Error scanning world row: %v", err)
 		}
 	}
-	return c.RenderJson(ww)
+	return c.RenderJSON(ww)
 }
 
 func (c App) QbsUpdate(queries int) revel.Result {
@@ -46,7 +46,7 @@ func (c App) QbsUpdate(queries int) revel.Result {
 		if _, err := qbs.Save(&w); err != nil {
 			revel.ERROR.Fatalf("Error updating world row: %v", err)
 		}
-		return c.RenderJson(&w)
+		return c.RenderJSON(&w)
 	}
 
 	ww := make([]World, queries)
@@ -60,7 +60,7 @@ func (c App) QbsUpdate(queries int) revel.Result {
 			revel.ERROR.Fatalf("Error scanning world row: %v", err)
 		}
 	}
-	return c.RenderJson(ww)
+	return c.RenderJSON(ww)
 }
 
 func (c App) QbsFortune() revel.Result {
@@ -72,6 +72,6 @@ func (c App) QbsFortune() revel.Result {
 	fortunes = append(fortunes,
 		&Fortune{Message: "Additional fortune added at request time."})
 	sort.Sort(ByMessage{fortunes})
-	c.RenderArgs["fortunes"] = fortunes
+	c.ViewArgs["fortunes"] = fortunes
 	return c.RenderTemplate("App/Fortune.html")
 }