[FAB-8976] Move fixtures closer to tests

Test fixtures should typically be placed in `testdata` directories to
prevent the go tooling from operating on them by default. There are a
number of these fixtures that live in the incorrectly named top level
`test` directory.

Instead of keeping fixtures in one location, this commit moves the
assets closer to the tests that use them and makes the necessary path
modifications to reference them.

Tests that were relying on fixtures to live on the go path, were
modified to explicitly set the gopath to the testdata directory.

Change-Id: I5dbc0cb5af41c63289aea925b08fea1584ca598f
Signed-off-by: Matthew Sykes <[email protected]>

core/chaincode/platforms/golang/platform_test.go

@@ -23,6 +23,7 @@ import (
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func testerr(err error, succ bool) error {
@@ -257,32 +258,52 @@ func TestValidateSpec(t *testing.T) {
 	}
 }
 
+func updateGopath(t *testing.T, path string) func() {
+	initialGopath, set := os.LookupEnv("GOPATH")
+
+	if path == "" {
+		err := os.Unsetenv("GOPATH")
+		require.NoError(t, err)
+	} else {
+		err := os.Setenv("GOPATH", path)
+		require.NoError(t, err)
+	}
+
+	if !set {
+		return func() { os.Unsetenv("GOPATH") }
+	}
+	return func() { os.Setenv("GOPATH", initialGopath) }
+}
+
 func TestGetDeploymentPayload(t *testing.T) {
-	emptyDir := fmt.Sprintf("pkg%d", os.Getpid())
-	os.Mkdir(emptyDir, os.ModePerm)
-	defer os.Remove(emptyDir)
+	defaultGopath := os.Getenv("GOPATH")
+	testdataPath, err := filepath.Abs("testdata")
+	require.NoError(t, err)
 
 	platform := &Platform{}
 
 	var tests = []struct {
-		spec *pb.ChaincodeSpec
-		succ bool
+		gopath string
+		spec   *pb.ChaincodeSpec
+		succ   bool
 	}{
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/examples/chaincode/go/map"}}, succ: true},
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/examples/bad/go/map"}}, succ: false},
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/test/chaincodes/BadImport"}}, succ: false},
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/test/chaincodes/BadMetadataInvalidIndex"}}, succ: false},
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/test/chaincodes/BadMetadataUnexpectedFolderContent"}}, succ: false},
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/test/chaincodes/BadMetadataIgnoreHiddenFile"}}, succ: true},
-		{spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/core/chaincode/platforms/golang/" + emptyDir}}, succ: false},
+		{gopath: defaultGopath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/examples/chaincode/go/map"}}, succ: true},
+		{gopath: defaultGopath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "github.com/hyperledger/fabric/examples/bad/go/map"}}, succ: false},
+		{gopath: testdataPath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "chaincodes/BadImport"}}, succ: false},
+		{gopath: testdataPath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "chaincodes/BadMetadataInvalidIndex"}}, succ: false},
+		{gopath: testdataPath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "chaincodes/BadMetadataUnexpectedFolderContent"}}, succ: false},
+		{gopath: testdataPath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "chaincodes/BadMetadataIgnoreHiddenFile"}}, succ: true},
+		{gopath: testdataPath, spec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "Test Chaincode", Path: "chaincodes/empty/"}}, succ: false},
 	}
 
 	for _, tst := range tests {
+		reset := updateGopath(t, tst.gopath)
 		_, err := platform.GetDeploymentPayload(tst.spec)
 		t.Log(err)
 		if err = testerr(err, tst.succ); err != nil {
 			t.Errorf("Error validating chaincode spec: %s, %s", tst.spec.ChaincodeId.Path, err)
 		}
+		reset()
 	}
 }
 

core/container/util/testdata/BadMetadataInvalidIndex/META-INF/statedb/couchdb/indexes/bad.json

@@ -0,0 +1 @@
+This test file is expected to contain a json formatted couchdb index, but does not. It should fail golang chaincode packaging tests.

core/container/util/testdata/BadMetadataUnexpectedFolderContent/META-INF/unsupported_metadata_location.json

@@ -0,0 +1 @@
+This test file is located at an unexpected metadata location under META-INF. It should fail golang chaincode packaging tests.

core/container/util/testdata/BadMetadataUnexpectedFolderContent/main.go

@@ -0,0 +1,7 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package main

core/container/util/testdata/sourcefiles/META-INF/.hiddenfile

@@ -0,0 +1 @@
+# this is a hidden file

core/container/util/testdata/sourcefiles/META-INF/statedb/couchdb/indexes/indexOwner.json

@@ -0,0 +1 @@
+{"index":{"fields":["docType","owner"]},"ddoc":"indexOwnerDoc", "name":"indexOwner","type":"json"}

core/container/util/testdata/sourcefiles/artifact.xml

@@ -0,0 +1,6 @@
+<!--
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+-->
+<ignore>true</ignore>

core/container/util/testdata/sourcefiles/src/Hello.class

@@ -0,0 +1 @@
+# This is a file that should not be included in java packages

core/container/util/testdata/sourcefiles/src/Hello.java

@@ -0,0 +1,12 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+ */
+
+public class Hello {
+    public static void main(String []args) {
+        System.out.println("Hello");
+        System.exit(0);
+    }
+}

core/container/util/testdata/sourcefiles/src/main.go

@@ -0,0 +1,7 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package main