✅ Create more tests and correct leftovers from existing ones

hyperledger-labs · Jan 30, 2023 · b09b3a6 · b09b3a6
1 parent 6cdaa3b
commit b09b3a6
Show file tree

Hide file tree

Showing 9 changed files with 257 additions and 83 deletions.
diff --git a/assets/dynamicAssetTypeFuncs.go b/assets/dynamicAssetTypeFuncs.go
@@ -167,12 +167,12 @@ func CheckDataType(dataType string) errors.ICCError {
 
 		assetType := FetchAssetType(trimDataType)
 		if assetType == nil {
-			return errors.NewCCError(fmt.Sprintf("invalid dataType value %s", dataType), http.StatusBadRequest)
+			return errors.NewCCError(fmt.Sprintf("invalid dataType value '%s'", dataType), http.StatusBadRequest)
 		}
 	} else {
 		dataTypeObj := FetchDataType(trimDataType)
 		if dataTypeObj == nil {
-			return errors.NewCCError(fmt.Sprintf("invalid dataType value %s", dataType), http.StatusBadRequest)
+			return errors.NewCCError(fmt.Sprintf("invalid dataType value '%s'", dataType), http.StatusBadRequest)
 		}
 	}
 

diff --git a/test/assets_dynamicAssetType_test.go b/test/assets_dynamicAssetType_test.go
@@ -0,0 +1,111 @@
+package test
+
+import (
+	"log"
+	"reflect"
+	"testing"
+
+	"github.com/goledgerdev/cc-tools/assets"
+)
+
+func TestBuildAssetPropValid(t *testing.T) {
+	propMap := map[string]interface{}{
+		"tag":          "id",
+		"label":        "CPF (Brazilian ID)",
+		"description":  "",
+		"isKey":        true,
+		"required":     true,
+		"readOnly":     false,
+		"defaultValue": nil,
+		"dataType":     "cpf",
+		"writers":      []interface{}{"org1MSP"},
+	}
+	prop, err := assets.BuildAssetProp(propMap)
+
+	expectedProp := assets.AssetProp{
+		Tag:          "id",
+		Label:        "CPF (Brazilian ID)",
+		Description:  "",
+		IsKey:        true,
+		Required:     true,
+		ReadOnly:     false,
+		DefaultValue: nil,
+		DataType:     "cpf",
+		Writers:      []string{"org1MSP"},
+	}
+
+	if err != nil {
+		log.Println("an error should not have occurred")
+		log.Println(err)
+		t.FailNow()
+	}
+
+	if !reflect.DeepEqual(prop, expectedProp) {
+		log.Println("these should be deeply equal")
+		log.Println(prop)
+		log.Println(expectedProp)
+		t.FailNow()
+	}
+}
+
+func TestBuildAssetPropInvalid(t *testing.T) {
+	propMap := map[string]interface{}{
+		"tag":          "id",
+		"label":        "CPF (Brazilian ID)",
+		"description":  "",
+		"isKey":        true,
+		"required":     true,
+		"readOnly":     false,
+		"defaultValue": nil,
+		"dataType":     "inexistant",
+		"writers":      []interface{}{"org1MSP"},
+	}
+	_, err := assets.BuildAssetProp(propMap)
+
+	err.Status()
+	if err.Status() != 400 {
+		log.Println(err)
+		t.FailNow()
+	}
+
+	if err.Message() != "failed checking data type: invalid dataType value 'inexistant'" {
+		log.Printf("error message different from expected: %s", err.Message())
+		t.FailNow()
+	}
+}
+
+func TestHandlePropUpdate(t *testing.T) {
+	prop := assets.AssetProp{
+		Tag:          "id",
+		Label:        "CPF (Brazilian ID)",
+		Description:  "",
+		IsKey:        true,
+		Required:     true,
+		ReadOnly:     false,
+		DefaultValue: nil,
+		DataType:     "cpf",
+	}
+
+	propUpdateMap := map[string]interface{}{
+		"writers":      []interface{}{"org1MSP"},
+		"defaultValue": "12345678901",
+	}
+
+	updatedProp, err := assets.HandlePropUpdate(prop, propUpdateMap)
+
+	if err != nil {
+		log.Println("an error should not have occurred")
+		log.Println(err)
+		t.FailNow()
+	}
+
+	prop.DefaultValue = "12345678901"
+	prop.Writers = []string{"org1MSP"}
+
+	if !reflect.DeepEqual(updatedProp, prop) {
+		log.Println("these should be deeply equal")
+		log.Println(updatedProp)
+		log.Println(prop)
+		t.FailNow()
+	}
+}
diff --git a/test/chaincode_test.go b/test/chaincode_test.go
@@ -21,6 +21,7 @@ var testTxList = []tx.Transaction{
 	tx.CreateAssetType,
 	tx.UpdateAssetType,
 	tx.DeleteAssetType,
+	tx.LoadAssetTypeList,
 }
 
 var testAssetList = []assets.AssetType{

diff --git a/test/tx_createAssetType_test.go b/test/tx_createAssetType_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 // TODO: Lista de assets com referencia
-// TODO: Verify is there is at least one isKey
 
 func TestCreateAssetType(t *testing.T) {
 	stub := mock.NewMockStub("org1MSP", new(testCC))
@@ -245,3 +244,42 @@ func TestCreateExistingAssetType(t *testing.T) {
 		t.FailNow()
 	}
 }
+
+func TestCreateAssetTypeWithoutKey(t *testing.T) {
+	stub := mock.NewMockStub("org1MSP", new(testCC))
+	newType := map[string]interface{}{
+		"tag":         "library",
+		"label":       "Library",
+		"description": "Library definition",
+		"props": []map[string]interface{}{
+			{
+				"tag":      "name",
+				"label":    "Name",
+				"dataType": "string",
+				"required": true,
+			},
+		},
+	}
+	req := map[string]interface{}{
+		"assetTypes": []map[string]interface{}{newType},
+	}
+	reqBytes, err := json.Marshal(req)
+	if err != nil {
+		t.FailNow()
+	}
+
+	res := stub.MockInvoke("createAssetType", [][]byte{
+		[]byte("createAssetType"),
+		reqBytes,
+	})
+
+	if res.GetStatus() != 400 {
+		log.Println(res)
+		t.FailNow()
+	}
+
+	if res.GetMessage() != "failed to build asset type: asset type must have a key" {
+		log.Printf("error message different from expected: %s", res.GetMessage())
+		t.FailNow()
+	}
+}
diff --git a/test/tx_deleteAssetType_test.go b/test/tx_deleteAssetType_test.go
@@ -45,59 +45,12 @@ func TestDeleteAssetType(t *testing.T) {
 		[]byte("createAssetType"),
 		reqBytes,
 	})
-	expectedResponse := map[string]interface{}{
-		"description": "Magazine definition",
-		"dynamic":     true,
-		"label":       "Magazine",
-		"props": []interface{}{
-			map[string]interface{}{
-				"dataType":    "string",
-				"description": "",
-				"isKey":       true,
-				"label":       "Name",
-				"readOnly":    false,
-				"required":    true,
-				"tag":         "name",
-				"writers":     []interface{}{"org1MSP"},
-			},
-			map[string]interface{}{
-				"dataType":    "[]string",
-				"description": "",
-				"isKey":       false,
-				"label":       "Images",
-				"readOnly":    false,
-				"required":    false,
-				"tag":         "images",
-				"writers":     nil,
-			},
-		},
-		"tag": "magazine",
-	}
 
 	if res.GetStatus() != 200 {
 		log.Println(res)
 		t.FailNow()
 	}
 
-	var resPayload []map[string]interface{}
-	err = json.Unmarshal(res.GetPayload(), &resPayload)
-	if err != nil {
-		log.Println(err)
-		t.FailNow()
-	}
-
-	if len(resPayload) != 1 {
-		log.Println("response length should be 1")
-		t.FailNow()
-	}
-
-	if !reflect.DeepEqual(resPayload[0], expectedResponse) {
-		log.Println("these should be equal")
-		log.Printf("%#v\n", resPayload[0])
-		log.Printf("%#v\n", expectedResponse)
-		t.FailNow()
-	}
-
 	// Delete Type
 	deleteReq := map[string]interface{}{
 		"tag":   "magazine",
@@ -115,7 +68,7 @@ func TestDeleteAssetType(t *testing.T) {
 		[]byte("deleteAssetType"),
 		reqBytes,
 	})
-	expectedResponse = map[string]interface{}{
+	expectedResponse := map[string]interface{}{
 		"assetType": map[string]interface{}{
 			"description": "Magazine definition",
 			"dynamic":     true,
@@ -182,8 +135,8 @@ func TestDeleteAssetTypeEmptyList(t *testing.T) {
 		t.FailNow()
 	}
 
-	res := stub.MockInvoke("createAssetType", [][]byte{
-		[]byte("createAssetType"),
+	res := stub.MockInvoke("deleteAssetType", [][]byte{
+		[]byte("deleteAssetType"),
 		reqBytes,
 	})
 
@@ -198,49 +151,32 @@ func TestDeleteAssetTypeEmptyList(t *testing.T) {
 	}
 }
 
-func TestDeleteExistingAssetType(t *testing.T) {
+func TestDeleteNonExistingAssetType(t *testing.T) {
 	stub := mock.NewMockStub("org1MSP", new(testCC))
-	newType := map[string]interface{}{
-		"tag":         "library",
-		"label":       "Library",
-		"description": "Library definition",
-		"props": []map[string]interface{}{
-			{
-				"tag":      "name",
-				"label":    "Name",
-				"dataType": "string",
-				"required": true,
-				"isKey":    true,
-			},
-		},
+	deleteTag := map[string]interface{}{
+		"tag":   "inexistent",
+		"force": true,
 	}
 	req := map[string]interface{}{
-		"assetTypes": []map[string]interface{}{newType},
+		"assetTypes": []map[string]interface{}{deleteTag},
 	}
 	reqBytes, err := json.Marshal(req)
 	if err != nil {
 		t.FailNow()
 	}
 
-	res := stub.MockInvoke("createAssetType", [][]byte{
-		[]byte("createAssetType"),
+	res := stub.MockInvoke("deleteAssetType", [][]byte{
+		[]byte("deleteAssetType"),
 		reqBytes,
 	})
 
-	if res.GetStatus() != 200 {
+	if res.GetStatus() != 400 {
 		log.Println(res)
 		t.FailNow()
 	}
 
-	var resPayload []map[string]interface{}
-	err = json.Unmarshal(res.GetPayload(), &resPayload)
-	if err != nil {
-		log.Println(err)
-		t.FailNow()
-	}
-
-	if len(resPayload) != 0 {
-		log.Println("response length should be 0")
+	if res.GetMessage() != "asset type 'inexistent' not found" {
+		log.Printf("error message different from expected: %s", res.GetMessage())
 		t.FailNow()
 	}
 }
diff --git a/test/tx_getTx_test.go b/test/tx_getTx_test.go
@@ -41,6 +41,11 @@ func TestGetTx(t *testing.T) {
 			"label":       "Delete Asset Type",
 			"tag":         "deleteAssetType",
 		},
+		map[string]interface{}{
+			"description": "",
+			"label":       "Load Asset Type List from blockchain",
+			"tag":         "loadAssetTypeList",
+		},
 		map[string]interface{}{
 			"description": "",
 			"label":       "Get Tx",