refactor test case

pdupub · May 23, 2020 · a167cb4 · a167cb4
1 parent 94b89ac
commit a167cb4
Show file tree

Hide file tree

Showing 3 changed files with 168 additions and 128 deletions.
diff --git a/crypto/bitcoin/btc_crypto_test.go b/crypto/bitcoin/btc_crypto_test.go
@@ -403,7 +403,7 @@ func TestEEngine_EncryptKeyMS(t *testing.T) {
 
 }
 
-func TestMarshal(t *testing.T) {
+func TestMarshalPrivateKey(t *testing.T) {
 	E := New()
 
 	privKey, _, err := E.GenKey(crypto.Signature2PublicKey)
@@ -461,6 +461,10 @@ func TestMarshal(t *testing.T) {
 		}
 	}
 
+}
+func TestMarshalPublicKey(t *testing.T) {
+	E := New()
+	size := 3
 	_, pubKey, err := E.GenKey(crypto.Signature2PublicKey)
 	if err != nil {
 		t.Error(err)
@@ -520,18 +524,21 @@ func TestMarshal(t *testing.T) {
 			t.Error("public key not match")
 		}
 	}
-
-	privKey, pubKey, err = E.GenKey(crypto.MultipleSignatures, size)
+}
+func TestMarshal(t *testing.T) {
+	E := New()
+	size := 3
+	privKey, pubKey, err := E.GenKey(crypto.MultipleSignatures, size)
 	if err != nil {
 		t.Error(err)
 	}
 
-	privKeyBytes, pubKeyBytes, err = E.Marshal(privKey, pubKey)
+	privKeyBytes, pubKeyBytes, err := E.Marshal(privKey, pubKey)
 	if err != nil {
 		t.Error(err)
 	}
 
-	uPrivKey, uPubKey, err = E.Unmarshal(privKeyBytes, pubKeyBytes)
+	uPrivKey, uPubKey, err := E.Unmarshal(privKeyBytes, pubKeyBytes)
 	if err != nil {
 		t.Error(err)
 	}
@@ -552,4 +559,10 @@ func TestMarshal(t *testing.T) {
 		}
 	}
 
+	for i := 0; i < size; i++ {
+		if privKey.PriKey.([]interface{})[i].(*btc.PrivateKey).D.Cmp(uPrivKey.PriKey.([]interface{})[i].(*btc.PrivateKey).D) != 0 {
+			t.Error("private key not match")
+		}
+	}
+
 }
diff --git a/crypto/ethereum/eth_crypto_test.go b/crypto/ethereum/eth_crypto_test.go
@@ -398,7 +398,7 @@ func TestEEngine_EncryptKeyMS(t *testing.T) {
 
 }
 
-func TestMarshal(t *testing.T) {
+func TestMarshalPrivateKey(t *testing.T) {
 	E := New()
 
 	privKey, _, err := E.GenKey(crypto.Signature2PublicKey)
@@ -454,7 +454,11 @@ func TestMarshal(t *testing.T) {
 			t.Error("private key not match")
 		}
 	}
+}
 
+func TestMarshalPublicKey(t *testing.T) {
+	E := New()
+	size := 3
 	_, pubKey, err := E.GenKey(crypto.Signature2PublicKey)
 	if err != nil {
 		t.Error(err)
@@ -514,18 +518,22 @@ func TestMarshal(t *testing.T) {
 			t.Error("public key not match")
 		}
 	}
+}
 
-	privKey, pubKey, err = E.GenKey(crypto.MultipleSignatures, size)
+func TestMarshal(t *testing.T) {
+	E := New()
+	size := 3
+	privKey, pubKey, err := E.GenKey(crypto.MultipleSignatures, size)
 	if err != nil {
 		t.Error(err)
 	}
 
-	privKeyBytes, pubKeyBytes, err = E.Marshal(privKey, pubKey)
+	privKeyBytes, pubKeyBytes, err := E.Marshal(privKey, pubKey)
 	if err != nil {
 		t.Error(err)
 	}
 
-	uPrivKey, uPubKey, err = E.Unmarshal(privKeyBytes, pubKeyBytes)
+	uPrivKey, uPubKey, err := E.Unmarshal(privKeyBytes, pubKeyBytes)
 	if err != nil {
 		t.Error(err)
 	}
@@ -545,5 +553,10 @@ func TestMarshal(t *testing.T) {
 			t.Error("public key not match")
 		}
 	}
+	for i := 0; i < size; i++ {
+		if privKey.PriKey.([]interface{})[i].(*ecdsa.PrivateKey).D.Cmp(uPrivKey.PriKey.([]interface{})[i].(*ecdsa.PrivateKey).D) != 0 {
+			t.Error("private key not match")
+		}
+	}
 
 }