move testdata to internal

Author: phbnf

ctlog_test.go

@@ -43,95 +43,95 @@ func TestNewCertValidationOpts(t *testing.T) {
 			desc:    "missing-root-cert",
 			wantErr: "failed to read trusted roots",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/bogus.cert",
+				RootsPEMFile: "./internal/testdata/bogus.cert",
 			},
 		},
 		{
 			desc:    "rejecting-all",
 			wantErr: "configuration would reject all certificates",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:    "./testdata/fake-ca.cert",
+				RootsPEMFile:    "./internal/testdata/fake-ca.cert",
 				RejectExpired:   true,
 				RejectUnexpired: true},
 		},
 		{
 			desc:    "unknown-ext-key-usage-1",
 			wantErr: "unknown extended key usage",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/fake-ca.cert",
+				RootsPEMFile: "./internal/testdata/fake-ca.cert",
 				ExtKeyUsages: "wrong_usage"},
 		},
 		{
 			desc:    "unknown-ext-key-usage-2",
 			wantErr: "unknown extended key usage",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/fake-ca.cert",
+				RootsPEMFile: "./internal/testdata/fake-ca.cert",
 				ExtKeyUsages: "ClientAuth,ServerAuth,TimeStomping",
 			},
 		},
 		{
 			desc:    "unknown-ext-key-usage-3",
 			wantErr: "unknown extended key usage",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/fake-ca.cert",
+				RootsPEMFile: "./internal/testdata/fake-ca.cert",
 				ExtKeyUsages: "Any ",
 			},
 		},
 		{
 			desc:    "unknown-reject-ext",
 			wantErr: "failed to parse RejectExtensions",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:     "./testdata/fake-ca.cert",
+				RootsPEMFile:     "./internal/testdata/fake-ca.cert",
 				RejectExtensions: "1.2.3.4,one.banana.two.bananas",
 			},
 		},
 		{
 			desc:    "limit-before-start",
 			wantErr: "before start",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:  "./testdata/fake-ca.cert",
+				RootsPEMFile:  "./internal/testdata/fake-ca.cert",
 				NotAfterStart: &t200,
 				NotAfterLimit: &t100,
 			},
 		},
 		{
 			desc: "ok",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/fake-ca.cert",
+				RootsPEMFile: "./internal/testdata/fake-ca.cert",
 			},
 		},
 		{
 			desc: "ok-ext-key-usages",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/fake-ca.cert",
+				RootsPEMFile: "./internal/testdata/fake-ca.cert",
 				ExtKeyUsages: "ServerAuth,ClientAuth,OCSPSigning",
 			},
 		},
 		{
 			desc: "ok-reject-ext",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:     "./testdata/fake-ca.cert",
+				RootsPEMFile:     "./internal/testdata/fake-ca.cert",
 				RejectExtensions: "1.2.3.4,5.6.7.8",
 			},
 		},
 		{
 			desc: "ok-start-timestamp",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:  "./testdata/fake-ca.cert",
+				RootsPEMFile:  "./internal/testdata/fake-ca.cert",
 				NotAfterStart: &t100,
 			},
 		},
 		{
 			desc: "ok-limit-timestamp",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:  "./testdata/fake-ca.cert",
+				RootsPEMFile:  "./internal/testdata/fake-ca.cert",
 				NotAfterStart: &t200,
 			},
 		},
 		{
 			desc: "ok-range-timestamp",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile:  "./testdata/fake-ca.cert",
+				RootsPEMFile:  "./internal/testdata/fake-ca.cert",
 				NotAfterStart: &t100,
 				NotAfterLimit: &t200,
 			},
@@ -154,7 +154,7 @@ func TestNewCertValidationOpts(t *testing.T) {
 
 func TestNewLog(t *testing.T) {
 	ctx := context.Background()
-	signer, err := pem.ReadPrivateKeyFile("./testdata/ct-http-server.privkey.pem", "dirk")
+	signer, err := pem.ReadPrivateKeyFile("./internal/testdata/ct-http-server.privkey.pem", "dirk")
 	if err != nil {
 		t.Fatalf("Can't open key: %v", err)
 	}
@@ -175,7 +175,7 @@ func TestNewLog(t *testing.T) {
 			desc:   "ok",
 			origin: "testlog",
 			cvcfg: ChainValidationConfig{
-				RootsPEMFile: "./testdata/fake-ca.cert",
+				RootsPEMFile: "./internal/testdata/fake-ca.cert",
 			},
 			signer: signer,
 		},

internal/scti/chain_validation_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/certificate-transparency-go/x509/pkix"
 	"github.com/google/certificate-transparency-go/x509util"
-	"github.com/transparency-dev/static-ct/testdata"
+	"github.com/transparency-dev/static-ct/internal/testdata"
 )
 
 func wipeExtensions(cert *x509.Certificate) *x509.Certificate {
@@ -172,12 +172,12 @@ func TestValidateChain(t *testing.T) {
 		},
 		{
 			desc:        "chain-of-len-4",
-			chain:       pemFileToDERChain(t, "./testdata/subleaf.chain"),
+			chain:       pemFileToDERChain(t, "../testdata/subleaf.chain"),
 			wantPathLen: 4,
 		},
 		{
 			desc:    "misordered-chain-of-len-4",
-			chain:   pemFileToDERChain(t, "./testdata/subleaf.misordered.chain"),
+			chain:   pemFileToDERChain(t, "../testdata/subleaf.misordered.chain"),
 			wantErr: true,
 		},
 		{

internal/scti/handlers_test.go

@@ -35,9 +35,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/trillian/monitoring"
+	"github.com/transparency-dev/static-ct/internal/testdata"
 	"github.com/transparency-dev/static-ct/mockstorage"
 	"github.com/transparency-dev/static-ct/modules/dedup"
-	"github.com/transparency-dev/static-ct/testdata"
 	"github.com/transparency-dev/trillian-tessera/ctonly"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

internal/scti/signatures_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/certificate-transparency-go/x509util"
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/transparency-dev/static-ct/testdata"
+	"github.com/transparency-dev/static-ct/internal/testdata"
 
 	ct "github.com/google/certificate-transparency-go"
 )