Skip to content
Snippets Groups Projects
Commit 32721fbd authored by Josh Brooks's avatar Josh Brooks
Browse files

Resolve MR comments

parent e4656230
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,7 @@ func TestFormatTextMessage(t *testing.T) { ...@@ -55,6 +55,7 @@ func TestFormatTextMessage(t *testing.T) {
t.Logf("message: %q", msg) t.Logf("message: %q", msg)
} }
//Happy path
func TestParsedMessage_GetSender(t *testing.T) { func TestParsedMessage_GetSender(t *testing.T) {
pm := ParsedMessage{} pm := ParsedMessage{}
sndr := pm.GetSender() sndr := pm.GetSender()
...@@ -64,6 +65,7 @@ func TestParsedMessage_GetSender(t *testing.T) { ...@@ -64,6 +65,7 @@ func TestParsedMessage_GetSender(t *testing.T) {
} }
} }
//Happy path
func TestParsedMessage_GetPayload(t *testing.T) { func TestParsedMessage_GetPayload(t *testing.T) {
pm := ParsedMessage{} pm := ParsedMessage{}
payload := []byte{0, 1, 2, 3} payload := []byte{0, 1, 2, 3}
...@@ -75,6 +77,7 @@ func TestParsedMessage_GetPayload(t *testing.T) { ...@@ -75,6 +77,7 @@ func TestParsedMessage_GetPayload(t *testing.T) {
} }
} }
//Happy path
func TestParsedMessage_GetRecipient(t *testing.T) { func TestParsedMessage_GetRecipient(t *testing.T) {
pm := ParsedMessage{} pm := ParsedMessage{}
rcpt := pm.GetRecipient() rcpt := pm.GetRecipient()
...@@ -84,6 +87,7 @@ func TestParsedMessage_GetRecipient(t *testing.T) { ...@@ -84,6 +87,7 @@ func TestParsedMessage_GetRecipient(t *testing.T) {
} }
} }
//Happy path
func TestParsedMessage_GetMessageType(t *testing.T) { func TestParsedMessage_GetMessageType(t *testing.T) {
pm := ParsedMessage{} pm := ParsedMessage{}
var typeTest int32 var typeTest int32
...@@ -96,6 +100,7 @@ func TestParsedMessage_GetMessageType(t *testing.T) { ...@@ -96,6 +100,7 @@ func TestParsedMessage_GetMessageType(t *testing.T) {
} }
} }
//Happy path
func TestParse(t *testing.T) { func TestParse(t *testing.T) {
ms := parse.Message{} ms := parse.Message{}
ms.Body = []byte{0, 1, 2} ms.Body = []byte{0, 1, 2}
......
...@@ -80,7 +80,7 @@ func TestGenerateCmixKeys(t *testing.T) { ...@@ -80,7 +80,7 @@ func TestGenerateCmixKeys(t *testing.T) {
} }
// //Happy/error path: Tests generation of e2e keys
func TestGenerateE2eKeys(t *testing.T) { func TestGenerateE2eKeys(t *testing.T) {
//Test generateCmixKeys //Test generateCmixKeys
cmixGrp, e2eGrp := generateGroups(def) cmixGrp, e2eGrp := generateGroups(def)
......
...@@ -10,6 +10,7 @@ import ( ...@@ -10,6 +10,7 @@ import (
"testing" "testing"
) )
//Test that a registered session may be stored & recovered
func TestRegistrationGob(t *testing.T) { func TestRegistrationGob(t *testing.T) {
// Get a Client // Get a Client
testClient, err := NewClient(&globals.RamStorage{}, "", "", def) testClient, err := NewClient(&globals.RamStorage{}, "", "", def)
...@@ -89,11 +90,11 @@ func TestClient_Register(t *testing.T) { ...@@ -89,11 +90,11 @@ func TestClient_Register(t *testing.T) {
VerifyRegisterGobUser(Session, t) VerifyRegisterGobUser(Session, t)
//Probs can't do this as there is now a sense of randomness?? VerifyRegisterGobKeys(Session, testClient.topology, t)
//VerifyRegisterGobKeys(Session, testClient.topology, t)
disconnectServers() disconnectServers()
} }
//Verify the user from the session make in the registration above matches expected user
func VerifyRegisterGobUser(session user.Session, t *testing.T) { func VerifyRegisterGobUser(session user.Session, t *testing.T) {
expectedUser := id.NewUserFromUint(5, t) expectedUser := id.NewUserFromUint(5, t)
...@@ -104,6 +105,7 @@ func VerifyRegisterGobUser(session user.Session, t *testing.T) { ...@@ -104,6 +105,7 @@ func VerifyRegisterGobUser(session user.Session, t *testing.T) {
} }
} }
//Verify that the keys from the session in the registration above match the expected keys
func VerifyRegisterGobKeys(session user.Session, topology *connect.Circuit, t *testing.T) { func VerifyRegisterGobKeys(session user.Session, topology *connect.Circuit, t *testing.T) {
cmixGrp, _ := getGroups() cmixGrp, _ := getGroups()
h := sha256.New() h := sha256.New()
......
...@@ -85,6 +85,7 @@ func TestNewClientNil(t *testing.T) { ...@@ -85,6 +85,7 @@ func TestNewClientNil(t *testing.T) {
} }
} }
//Happy path: tests creation of valid client
func TestNewClient(t *testing.T) { func TestNewClient(t *testing.T) {
d := DummyStorage{LocationA: "Blah", StoreA: []byte{'a', 'b', 'c'}} d := DummyStorage{LocationA: "Blah", StoreA: []byte{'a', 'b', 'c'}}
...@@ -101,6 +102,7 @@ func TestNewClient(t *testing.T) { ...@@ -101,6 +102,7 @@ func TestNewClient(t *testing.T) {
} }
} }
//Happy Path: Register with permissioning
func TestRegister(t *testing.T) { func TestRegister(t *testing.T) {
ndfStr, pubKey := getNDFJSONStr(def, t) ndfStr, pubKey := getNDFJSONStr(def, t)
...@@ -234,6 +236,7 @@ func TestDeleteUsername_EmptyContactList(t *testing.T) { ...@@ -234,6 +236,7 @@ func TestDeleteUsername_EmptyContactList(t *testing.T) {
"Contact list should be empty") "Contact list should be empty")
} }
//Happy path: Tests regState gets properly updated along the registration codepath
func TestClient_GetRegState(t *testing.T) { func TestClient_GetRegState(t *testing.T) {
ndfStr, pubKey := getNDFJSONStr(def, t) ndfStr, pubKey := getNDFJSONStr(def, t)
......
...@@ -46,9 +46,6 @@ func Register(valueType, value string, publicKey []byte, regStatus func(int), ti ...@@ -46,9 +46,6 @@ func Register(valueType, value string, publicKey []byte, regStatus func(int), ti
keyFP := fingerprint(publicKey) keyFP := fingerprint(publicKey)
regStatus(globals.UDB_REG_PUSHKEY) regStatus(globals.UDB_REG_PUSHKEY)
fmt.Println("keyFp ", keyFP)
fmt.Println("udbId ", UdbID)
fmt.Println("pubLey ", publicKey)
// push key and error if it already exists // push key and error if it already exists
err = pushKey(UdbID, keyFP, publicKey) err = pushKey(UdbID, keyFP, publicKey)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment