From 897abdfb59c2db117067fc1c399e0ed7371ae026 Mon Sep 17 00:00:00 2001
From: Nick Sullivan <nick@cloudflare.com>
Date: Tue, 19 Nov 2013 09:56:38 -0800
Subject: [PATCH] Use the correct testing framework and JSON.

---
 src/redoctober/core/core_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redoctober/core/core_test.go b/src/redoctober/core/core_test.go
index aa251d1..aac5e71 100644
--- a/src/redoctober/core/core_test.go
+++ b/src/redoctober/core/core_test.go
@@ -3,9 +3,9 @@ package core
 import (
 	"os"
 	"encoding/json"
+	"testing"
 	"redoctober/passvault"
 	"redoctober/keycache"
-	"redoctober/testing"
 )
 
 func TestCreate(t *testing.T) {
@@ -312,7 +312,7 @@ func TestEncryptDecrypt(t *testing.T) {
 
 
 	// decrypt file
-	decryptJson, err := json.Marshal(decrypt{Name:"Alice", Password:"Hello", In:s.Response})
+	decryptJson, err := json.Marshal(decrypt{Name:"Alice", Password:"Hello", Data:s.Response})
 	if err != nil {
 		t.Fatalf("Error in marshalling decryption,", err)
 	}