[FAB-6146] Move fixture chaincode under testdata

Change-Id: I5ef9a7e8dcb34b2d428da183312651c16e71482d Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Sep 13, 2017 · dab5a98 · dab5a98
1 parent a102eb3
commit dab5a98
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/pkg/fabric-client/packager/golang_test.go b/pkg/fabric-client/packager/golang_test.go
@@ -22,7 +22,7 @@ func TestPackageGoLangCC(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error from os.Getwd %v", err)
 	}
-	os.Setenv("GOPATH", path.Join(pwd, "../../../test/fixtures"))
+	os.Setenv("GOPATH", path.Join(pwd, "../../../test/fixtures/testdata"))
 
 	ccPackage, err := PackageGoLangCC("github.com")
 	if err != nil {

diff --git a/pkg/fabric-client/packager/packager_test.go b/pkg/fabric-client/packager/packager_test.go
@@ -1,3 +1,8 @@
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
 package packager
 
 import (
@@ -16,7 +21,7 @@ func TestPackageCC(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error from os.Getwd %v", err)
 	}
-	os.Setenv("GOPATH", path.Join(pwd, "../../../test/fixtures"))
+	os.Setenv("GOPATH", path.Join(pwd, "../../../test/fixtures/testdata"))
 
 	ccPackage, err := PackageCC("github.com", "")
 	if err != nil {
@@ -69,7 +74,7 @@ func TestUndefinedPackageCC(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error from os.Getwd %v", err)
 	}
-	os.Setenv("GOPATH", path.Join(pwd, "../../../test/fixtures"))
+	os.Setenv("GOPATH", path.Join(pwd, "../../../test/fixtures/testdata"))
 
 	_, err = PackageCC("github.com", "UndefinedCCType")
 	if err == nil {

diff --git a/...res/src/github.com/events_cc/events_cc.go → ...ata/src/github.com/events_cc/events_cc.go b/...res/src/github.com/events_cc/events_cc.go → ...ata/src/github.com/events_cc/events_cc.go
diff --git a/...s/src/github.com/example_cc/example_cc.go → ...a/src/github.com/example_cc/example_cc.go b/...s/src/github.com/example_cc/example_cc.go → ...a/src/github.com/example_cc/example_cc.go
diff --git a/...src/github.com/example_cc1/example_cc1.go → ...src/github.com/example_cc1/example_cc1.go b/...src/github.com/example_cc1/example_cc1.go → ...src/github.com/example_cc1/example_cc1.go
diff --git a/test/integration/base_test_setup.go b/test/integration/base_test_setup.go
@@ -202,7 +202,7 @@ func (setup *BaseSetupImpl) InstallCC(chainCodeID string, chainCodePath string,
 // GetDeployPath ..
 func (setup *BaseSetupImpl) GetDeployPath() string {
 	pwd, _ := os.Getwd()
-	return path.Join(pwd, "../fixtures")
+	return path.Join(pwd, "../fixtures/testdata")
 }
 
 // InstallAndInstantiateExampleCC ..

diff --git a/test/integration/orgs/test_setup.go b/test/integration/orgs/test_setup.go
@@ -137,11 +137,11 @@ func installAndInstantiate(t *testing.T) {
 
 	orgTestClient.SetUserContext(org1AdminUser)
 	admin.SendInstallCC(orgTestClient, "exampleCC",
-		"github.com/example_cc", "0", nil, []fab.Peer{orgTestPeer0}, "../../fixtures")
+		"github.com/example_cc", "0", nil, []fab.Peer{orgTestPeer0}, "../../fixtures/testdata")
 
 	orgTestClient.SetUserContext(org2AdminUser)
 	err := admin.SendInstallCC(orgTestClient, "exampleCC",
-		"github.com/example_cc", "0", nil, []fab.Peer{orgTestPeer1}, "../../fixtures")
+		"github.com/example_cc", "0", nil, []fab.Peer{orgTestPeer1}, "../../fixtures/testdata")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/test/scripts/check_license.sh b/test/scripts/check_license.sh
@@ -22,11 +22,10 @@ if [[ -z "$CHECK" ]]; then
 fi
 
 if [[ -z "$CHECK" ]]; then
-   echo "All files are excluded from having SPDX-License-Identifier headers"
+   echo "All files are excluded from having license headers"
    exit 0
 fi
 
-echo "Checking committed files for SPDX-License-Identifier headers ..."
 missing=`echo "$CHECK" | xargs ls -d 2>/dev/null | xargs grep -L "SPDX-License-Identifier"`
 if [[ -z "$missing" ]]; then
    echo "All files have SPDX-License-Identifier headers"
@@ -37,4 +36,15 @@ echo "$missing"
 echo
 echo "Please replace the Apache license header comment text with:"
 echo "SPDX-License-Identifier: Apache-2.0"
+
+echo
+echo "Checking committed files for traditional Apache License headers ..."
+missing=`echo "$missing" | xargs ls -d 2>/dev/null | xargs grep -L "http://www.apache.org/licenses/LICENSE-2.0"`
+if [[ -z "$missing" ]]; then
+   echo "All remaining files have Apache 2.0 headers"
+   exit 0
+fi
+echo "The following files are missing traditional Apache 2.0 headers:"
+echo "$missing"
+echo "Fatal Error - All files must have a license header"
 exit 1