From ff1e12f5e43ed2d6e9f9048e260a60bac6e9fc7a Mon Sep 17 00:00:00 2001 From: verytable Date: Wed, 29 Jan 2020 01:41:27 +0300 Subject: [PATCH] Adding testtool - the submission tester. --- README.md | 2 + docs/testtool.md | 26 ++ go.mod | 6 + go.sum | 54 ++++ tools/testtool/commands/root.go | 24 ++ tools/testtool/commands/test_submission.go | 258 ++++++++++++++++++ .../testtool/commands/test_submission_test.go | 77 ++++++ tools/testtool/main.go | 9 + .../submissions/correct/sum/private/go.mod | 9 + .../submissions/correct/sum/private/go.sum | 53 ++++ .../correct/sum/private/sum/sum.go | 7 + .../sum/private/sum/sum_private_test.go | 45 +++ .../correct/sum/private/sum/sum_solution.go | 7 + .../correct/sum/private/sum/sum_test.go | 22 ++ .../sum/private/sum/testdata/tests.csv | 3 + .../submissions/correct/sum/student/go.mod | 9 + .../submissions/correct/sum/student/go.sum | 53 ++++ .../correct/sum/student/sum/sum.go | 7 + .../correct/sum/student/sum/sum_test.go | 23 ++ .../sum/student/sum/testdata/tests.csv | 3 + .../incorrect/brokentest/description.md | 1 + .../brokentest/private/brokentest/sum.go | 7 + .../private/brokentest/sum_private_test.go | 45 +++ .../private/brokentest/sum_solution.go | 7 + .../brokentest/private/brokentest/sum_test.go | 22 ++ .../private/brokentest/testdata/tests.csv | 3 + .../incorrect/brokentest/private/go.mod | 9 + .../incorrect/brokentest/private/go.sum | 53 ++++ .../brokentest/student/brokentest/sum.go | 7 + .../brokentest/student/brokentest/sum_test.go | 23 ++ .../student/brokentest/testdata/tests.csv | 3 + .../incorrect/brokentest/student/go.mod | 9 + .../incorrect/brokentest/student/go.sum | 53 ++++ .../incorrect/newdependency/description.md | 1 + .../incorrect/newdependency/private/go.mod | 9 + .../incorrect/newdependency/private/go.sum | 53 ++++ .../private/newdependency/sum.go | 7 + .../private/newdependency/sum_private_test.go | 45 +++ .../private/newdependency/sum_solution.go | 7 + .../private/newdependency/sum_test.go | 22 ++ .../private/newdependency/testdata/tests.csv | 3 + .../incorrect/newdependency/student/go.mod | 10 + .../incorrect/newdependency/student/go.sum | 60 ++++ .../student/newdependency/sum.go | 10 + .../student/newdependency/sum_test.go | 23 ++ .../student/newdependency/testdata/tests.csv | 3 + 46 files changed, 1192 insertions(+) create mode 100644 docs/testtool.md create mode 100644 go.sum create mode 100644 tools/testtool/commands/root.go create mode 100644 tools/testtool/commands/test_submission.go create mode 100644 tools/testtool/commands/test_submission_test.go create mode 100644 tools/testtool/main.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/go.mod create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/go.sum create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/sum/sum_test.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/private/sum/testdata/tests.csv create mode 100644 tools/testtool/testdata/submissions/correct/sum/student/go.mod create mode 100644 tools/testtool/testdata/submissions/correct/sum/student/go.sum create mode 100644 tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/student/sum/sum_test.go create mode 100644 tools/testtool/testdata/submissions/correct/sum/student/sum/testdata/tests.csv create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/description.md create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_test.go create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/testdata/tests.csv create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/go.mod create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/private/go.sum create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum_test.go create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/testdata/tests.csv create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/student/go.mod create mode 100644 tools/testtool/testdata/submissions/incorrect/brokentest/student/go.sum create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/description.md create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/go.mod create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/go.sum create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_test.go create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/testdata/tests.csv create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/student/go.mod create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/student/go.sum create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum_test.go create mode 100644 tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/testdata/tests.csv diff --git a/README.md b/README.md index a994683..259d922 100644 --- a/README.md +++ b/README.md @@ -104,3 +104,5 @@ go test -tags solution,private ./... ## 4. Скопировать testdata из приватного репозитория. go test -tags private ./... ``` + +Для проверки submission'ов есть testtool (см. docs/testtool.md). diff --git a/docs/testtool.md b/docs/testtool.md new file mode 100644 index 0000000..8377f32 --- /dev/null +++ b/docs/testtool.md @@ -0,0 +1,26 @@ +# testtool - проверка решений + +testtool - cobra-based cli. У всех комманд есть help. +Использование можно начать с такого: +``` +go run ./tools/testtool/main.go --help +``` + +При тестирование посылки выполняются следующие шаги: +0. Создаётся временная директория, в которой будут собраны необходимые файлы. +1. Копируются файлы пакета из посылки. +2. Копируются все файлы тестов из приватного репозитория. +3. Копируются !change файлы из приватного репозитория. +4. Копируются testdata из приватного репозитория. +5. Копируются go.mod и go.sum +6. Запускается go test -mod=readonly -tags private ./... + +## Разработчикам + +Запуск тестов: +``` +go test -v ./tools/testtool/... +``` + +В tools/testtool/testdata/submissions находятся sample проекты, на которых запускаются тесты. +В поддиректории correct - тесты с верным решением студента, в incorrect - c неверным. diff --git a/go.mod b/go.mod index c5780b9..395a3ee 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,9 @@ module gitlab.com/slon/shad-go go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..4234c8c --- /dev/null +++ b/go.sum @@ -0,0 +1,54 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tools/testtool/commands/root.go b/tools/testtool/commands/root.go new file mode 100644 index 0000000..808a0ab --- /dev/null +++ b/tools/testtool/commands/root.go @@ -0,0 +1,24 @@ +package commands + +import ( + "fmt" + "os" + + "github.com/spf13/cobra" +) + +// rootCmd represents the base command when called without any subcommands. +var rootCmd = &cobra.Command{ + Use: "testtool", + Short: "test submissions", + TraverseChildren: true, +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} diff --git a/tools/testtool/commands/test_submission.go b/tools/testtool/commands/test_submission.go new file mode 100644 index 0000000..bbd99ed --- /dev/null +++ b/tools/testtool/commands/test_submission.go @@ -0,0 +1,258 @@ +package commands + +import ( + "io/ioutil" + "log" + "os" + "os/exec" + "path" + "path/filepath" + "strings" + + "github.com/spf13/cobra" + "golang.org/x/tools/go/packages" +) + +const ( + problemFlag = "problem" + studentRepoFlag = "student-repo" + privateRepoFlag = "private-repo" + + testdataDir = "testdata" +) + +var testSubmissionCmd = &cobra.Command{ + Use: "test", + Aliases: []string{"check", "test-submission", "check-submission"}, + Short: "test submission", + Long: `run solution on private and private tests`, + Run: func(cmd *cobra.Command, args []string) { + problem, err := cmd.Flags().GetString(problemFlag) + if err != nil { + log.Fatal(err) + } + + studentRepo := mustParseDirFlag(studentRepoFlag, cmd) + if !problemDirExists(studentRepo, problem) { + log.Fatalf("%s does not have %s directory", studentRepo, problem) + } + + privateRepo := mustParseDirFlag(privateRepoFlag, cmd) + if !problemDirExists(privateRepo, problem) { + log.Fatalf("%s does not have %s directory", privateRepo, problem) + } + + testSubmission(studentRepo, privateRepo, problem) + }, +} + +func init() { + rootCmd.AddCommand(testSubmissionCmd) + + testSubmissionCmd.Flags().String(problemFlag, "", "problem directory name (required)") + _ = testSubmissionCmd.MarkFlagRequired(problemFlag) + + testSubmissionCmd.Flags().String(studentRepoFlag, ".", "path to student repo root") + testSubmissionCmd.Flags().String(privateRepoFlag, ".", "path to shad-go-private repo root") +} + +// mustParseDirFlag parses string directory flag with given name. +// +// Exits on any error. +func mustParseDirFlag(name string, cmd *cobra.Command) string { + dir, err := cmd.Flags().GetString(name) + if err != nil { + log.Fatal(err) + } + dir, err = filepath.Abs(dir) + if err != nil { + log.Fatal(err) + } + return dir +} + +// Check that repo dir contains problem subdir. +func problemDirExists(repo, problem string) bool { + info, err := os.Stat(path.Join(repo, problem)) + if err != nil { + return false + } + return info.IsDir() +} + +func testSubmission(studentRepo, privateRepo, problem string) { + // Create temp directory to store all files required to test the solution. + tmpDir, err := ioutil.TempDir("/tmp", problem+"-") + if err != nil { + log.Fatal(err) + } + defer func() { _ = os.RemoveAll(tmpDir) }() + log.Printf("testing submission in %s", tmpDir) + + // Path to student's problem folder. + studentProblem := path.Join(studentRepo, problem) + // Path to private problem folder. + privateProblem := path.Join(privateRepo, problem) + + // Copy submission files to temp temp dir. + log.Printf("copying student solution") + copyContents(studentProblem, tmpDir) + + // Copy tests from private repo to temp dir. + log.Printf("copying tests") + tests := listTestFiles(privateProblem) + copyFiles(privateProblem, relPaths(privateProblem, tests), tmpDir) + + // Copy !change files from private repo to temp dir. + log.Printf("copying !change files") + protected := listProtectedFiles(privateProblem) + copyFiles(privateProblem, relPaths(privateProblem, protected), tmpDir) + + // Copy testdata directory from private repo to temp dir. + log.Printf("copying testdata directory") + copyDir(path.Join(privateProblem, testdataDir), tmpDir) + + // Copy go.mod and go.sum from private repo to temp dir. + log.Printf("copying go.mod and go.sum") + copyFiles(privateRepo, []string{"go.mod", "go.sum"}, tmpDir) + + // Run tests. + log.Printf("running tests") + runTests(tmpDir) +} + +// copyDir recursively copies src directory to dst. +func copyDir(src, dst string) { + _, err := os.Stat(src) + if os.IsNotExist(err) { + return + } + + cmd := exec.Command("rsync", "-r", src, dst) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + + if err := cmd.Start(); err != nil { + log.Fatalf("error starting rsync command: %s", err) + } + + if err := cmd.Wait(); err != nil { + log.Fatalf("rsync command failed: %s", err) + } +} + +// copyDir recursively copies src contents to dst. +func copyContents(src, dst string) { + copyDir(src+"/", dst) +} + +// List all _test.go files in given directory including the ones with "private" build tag. +// +// Returns absolute paths. +func listTestFiles(problemDir string) []string { + files := getPackageFiles(problemDir, []string{"-tags", "private"}) + var tests []string + for f := range files { + if strings.HasSuffix(f, "_test.go") { + tests = append(tests, f) + } + } + return tests +} + +// List all .go source files in given directory protected by "!change" build tag. +// +// Returns absolute paths. +func listProtectedFiles(problemDir string) []string { + allFiles := getPackageFiles(problemDir, nil) + allFilesWithoutProtected := getPackageFiles(problemDir, []string{"-tags", "change"}) + + var protectedFiles []string + for f := range allFiles { + if _, ok := allFilesWithoutProtected[f]; !ok { + protectedFiles = append(protectedFiles, f) + } + } + + return protectedFiles +} + +// Copy files preserving directory structure relative to baseDir. +// +// Existing files get replaced. +func copyFiles(baseDir string, relPaths []string, dst string) { + for _, p := range relPaths { + cmd := exec.Command("rsync", "-rR", p, dst) + cmd.Dir = baseDir + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + + if err := cmd.Start(); err != nil { + log.Fatalf("error starting file copying: %s", err) + } + + if err := cmd.Wait(); err != nil { + log.Fatalf("file copying failed: %s", err) + } + } +} + +// Run all test in directory with race detector. +func runTests(testDir string) { + cmd := exec.Command("go", "test", "-v", "-mod", "readonly", "-tags", "private", "-race", "./...") + cmd.Dir = testDir + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + + if err := cmd.Start(); err != nil { + log.Fatalf("error starting go test command: %s", err) + } + + if err := cmd.Wait(); err != nil { + log.Fatalf("go test command failed: %s", err) + } +} + +// Get absolute paths for all files in rootPackage and it's subpackages +// including tests and non-go files. +func getPackageFiles(rootPackage string, buildFlags []string) map[string]struct{} { + cfg := &packages.Config{ + Dir: rootPackage, + Mode: packages.NeedFiles, + BuildFlags: buildFlags, + Tests: true, + } + pkgs, err := packages.Load(cfg, "./...") + if err != nil { + log.Fatalf("unable to load packages %s: %s", rootPackage, err) + } + + if packages.PrintErrors(pkgs) > 0 { + os.Exit(1) + } + + files := make(map[string]struct{}) + for _, p := range pkgs { + for _, f := range p.GoFiles { + files[f] = struct{}{} + } + for _, f := range p.OtherFiles { + files[f] = struct{}{} + } + } + + return files +} + +// Convert paths to relative (to the baseDir) ones. +func relPaths(baseDir string, paths []string) []string { + ret := make([]string, len(paths)) + for i, p := range paths { + relPath, err := filepath.Rel(baseDir, p) + if err != nil { + log.Fatal(err) + } + ret[i] = relPath + } + return ret +} diff --git a/tools/testtool/commands/test_submission_test.go b/tools/testtool/commands/test_submission_test.go new file mode 100644 index 0000000..63529aa --- /dev/null +++ b/tools/testtool/commands/test_submission_test.go @@ -0,0 +1,77 @@ +package commands + +import ( + "io/ioutil" + "os" + "os/exec" + "path" + "path/filepath" + "testing" + + "github.com/stretchr/testify/require" +) + +// List directories in given directory. +func listDirs(dir string) ([]string, error) { + files, err := ioutil.ReadDir(dir) + if err != nil { + return nil, err + } + + var dirs []string + for _, f := range files { + if f.IsDir() { + dirs = append(dirs, path.Join(dir, f.Name())) + } + } + + return dirs, nil +} + +func Test_testSubmission_correct(t *testing.T) { + testDirs, err := listDirs("../testdata/submissions/correct") + require.Nil(t, err) + + for _, dir := range testDirs { + dir, err := filepath.Abs(dir) + require.Nil(t, err) + problem := path.Base(dir) + t.Run(problem, func(t *testing.T) { + studentRepo := path.Join(dir, "student") + privateRepo := path.Join(dir, "private") + testSubmission(studentRepo, privateRepo, problem) + }) + } +} + +func Test_testSubmission_incorrect(t *testing.T) { + testDirs, err := listDirs("../testdata/submissions/incorrect") + require.Nil(t, err) + + for _, dir := range testDirs { + dir, err := filepath.Abs(dir) + require.Nil(t, err) + + problem := path.Base(dir) + t.Run(problem, func(t *testing.T) { + if os.Getenv("BE_CRASHER") == "1" { + studentRepo := path.Join(dir, "student") + privateRepo := path.Join(dir, "private") + testSubmission(studentRepo, privateRepo, problem) + return + } + + cmd := exec.Command(os.Args[0], "-test.run=Test_testSubmission_incorrect/"+problem) + cmd.Env = append(os.Environ(), "BE_CRASHER=1") + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + + err := cmd.Run() + if e, ok := err.(*exec.ExitError); ok && !e.Success() { + return + } + + t.Fatalf("process ran with err %v, want exit status != 0", err) + }) + } +} diff --git a/tools/testtool/main.go b/tools/testtool/main.go new file mode 100644 index 0000000..39b4e25 --- /dev/null +++ b/tools/testtool/main.go @@ -0,0 +1,9 @@ +package main + +import ( + "gitlab.com/slon/shad-go/tools/testtool/commands" +) + +func main() { + commands.Execute() +} diff --git a/tools/testtool/testdata/submissions/correct/sum/private/go.mod b/tools/testtool/testdata/submissions/correct/sum/private/go.mod new file mode 100644 index 0000000..395a3ee --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/go.mod @@ -0,0 +1,9 @@ +module gitlab.com/slon/shad-go + +go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 +) diff --git a/tools/testtool/testdata/submissions/correct/sum/private/go.sum b/tools/testtool/testdata/submissions/correct/sum/private/go.sum new file mode 100644 index 0000000..9d8b8ff --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/go.sum @@ -0,0 +1,53 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go new file mode 100644 index 0000000..cfe2f18 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go @@ -0,0 +1,7 @@ +// +build !solution + +package sum + +func Sum(a, b int64) int64 { + return 0 +} diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go new file mode 100644 index 0000000..51d8825 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go @@ -0,0 +1,45 @@ +// + build private + +package sum + +import ( + "encoding/csv" + "os" + "strconv" + "testing" + + "github.com/stretchr/testify/require" +) + +// Read tests from csv file. +func readTestCases(filename string) ([]*testCase, error) { + f, err := os.Open(filename) + if err != nil { + return nil, err + } + + records, err := csv.NewReader(f).ReadAll() + if err != nil { + return nil, err + } + + var tests []*testCase + for _, r := range records { + a, _ := strconv.ParseInt(r[0], 10, 64) + b, _ := strconv.ParseInt(r[1], 10, 64) + sum, _ := strconv.ParseInt(r[2], 10, 64) + tests = append(tests, &testCase{a: a, b: b, sum: sum}) + } + + return tests, nil +} + +func TestSumPrivate(t *testing.T) { + tests, err := readTestCases("./testdata/tests.csv") + require.Nil(t, err) + + for _, tc := range tests { + s := Sum(tc.a, tc.b) + require.Equal(t, tc.sum, s, "%d + %d == %d != %d", tc.a, tc.b, s, tc.sum) + } +} diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go new file mode 100644 index 0000000..45b63b7 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go @@ -0,0 +1,7 @@ +// +build solution + +package sum + +func Sum(a, b int64) int64 { + return a + b +} diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_test.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_test.go new file mode 100644 index 0000000..0a65602 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_test.go @@ -0,0 +1,22 @@ +package sum + +import ( + "math" + "testing" +) + +type testCase struct { + a, b, sum int64 +} + +func TestSum(t *testing.T) { + for _, input := range []testCase{ + {a: 2, b: 2, sum: 4}, + {a: 2, b: -2, sum: 0}, + {a: math.MaxInt64, b: 1, sum: math.MinInt64}, + } { + if out := Sum(input.a, input.b); out != input.sum { + t.Errorf("%d + %d == %d != %d", input.a, input.b, out, input.sum) + } + } +} diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/testdata/tests.csv b/tools/testtool/testdata/submissions/correct/sum/private/sum/testdata/tests.csv new file mode 100644 index 0000000..ed3ada0 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/testdata/tests.csv @@ -0,0 +1,3 @@ +a,b,sum +0,0,0 +1,-1,0 diff --git a/tools/testtool/testdata/submissions/correct/sum/student/go.mod b/tools/testtool/testdata/submissions/correct/sum/student/go.mod new file mode 100644 index 0000000..395a3ee --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/student/go.mod @@ -0,0 +1,9 @@ +module gitlab.com/slon/shad-go + +go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 +) diff --git a/tools/testtool/testdata/submissions/correct/sum/student/go.sum b/tools/testtool/testdata/submissions/correct/sum/student/go.sum new file mode 100644 index 0000000..9d8b8ff --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/student/go.sum @@ -0,0 +1,53 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go b/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go new file mode 100644 index 0000000..635f184 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go @@ -0,0 +1,7 @@ +// +build !solution + +package sum + +func Sum(a, b int64) int64 { + return a + b +} diff --git a/tools/testtool/testdata/submissions/correct/sum/student/sum/sum_test.go b/tools/testtool/testdata/submissions/correct/sum/student/sum/sum_test.go new file mode 100644 index 0000000..8fbf406 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/student/sum/sum_test.go @@ -0,0 +1,23 @@ +package sum + +import ( + "math" + "testing" +) + +type testCase struct { + a, b, sum int64 +} + +func TestSum(t *testing.T) { + for _, input := range []testCase{ + {a: 2, b: 2, sum: 4}, + {a: 2, b: -2, sum: 0}, + {a: math.MaxInt64, b: 1, sum: math.MinInt64}, + {a: -1, b: -1, sum: -2}, + } { + if out := Sum(input.a, input.b); out != input.sum { + t.Errorf("%d + %d == %d != %d", input.a, input.b, out, input.sum) + } + } +} diff --git a/tools/testtool/testdata/submissions/correct/sum/student/sum/testdata/tests.csv b/tools/testtool/testdata/submissions/correct/sum/student/sum/testdata/tests.csv new file mode 100644 index 0000000..ed3ada0 --- /dev/null +++ b/tools/testtool/testdata/submissions/correct/sum/student/sum/testdata/tests.csv @@ -0,0 +1,3 @@ +a,b,sum +0,0,0 +1,-1,0 diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/description.md b/tools/testtool/testdata/submissions/incorrect/brokentest/description.md new file mode 100644 index 0000000..77c9850 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/description.md @@ -0,0 +1 @@ +Student solution compiles but does not pass tests. \ No newline at end of file diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go new file mode 100644 index 0000000..cab97a1 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go @@ -0,0 +1,7 @@ +// +build !solution + +package brokentest + +func Sum(a, b int64) int64 { + return 0 +} diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go new file mode 100644 index 0000000..7878f07 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go @@ -0,0 +1,45 @@ +// +build private + +package brokentest + +import ( + "encoding/csv" + "os" + "strconv" + "testing" + + "github.com/stretchr/testify/require" +) + +// Read tests from csv file. +func readTestCases(filename string) ([]*testCase, error) { + f, err := os.Open(filename) + if err != nil { + return nil, err + } + + records, err := csv.NewReader(f).ReadAll() + if err != nil { + return nil, err + } + + var tests []*testCase + for _, r := range records { + a, _ := strconv.ParseInt(r[0], 10, 64) + b, _ := strconv.ParseInt(r[1], 10, 64) + sum, _ := strconv.ParseInt(r[2], 10, 64) + tests = append(tests, &testCase{a: a, b: b, sum: sum}) + } + + return tests, nil +} + +func TestSumPrivate(t *testing.T) { + tests, err := readTestCases("./testdata/tests.csv") + require.Nil(t, err) + + for _, tc := range tests { + s := Sum(tc.a, tc.b) + require.Equal(t, tc.sum, s, "%d + %d == %d != %d", tc.a, tc.b, s, tc.sum) + } +} diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go new file mode 100644 index 0000000..b0f79d4 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go @@ -0,0 +1,7 @@ +// +build solution + +package brokentest + +func Sum(a, b int64) int64 { + return a + b +} diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_test.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_test.go new file mode 100644 index 0000000..fa6adf3 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_test.go @@ -0,0 +1,22 @@ +package brokentest + +import ( + "math" + "testing" +) + +type testCase struct { + a, b, sum int64 +} + +func TestSum(t *testing.T) { + for _, input := range []testCase{ + {a: 2, b: 2, sum: 4}, + {a: 2, b: -2, sum: 0}, + {a: math.MaxInt64, b: 1, sum: math.MinInt64}, + } { + if out := Sum(input.a, input.b); out != input.sum { + t.Errorf("%d + %d == %d != %d", input.a, input.b, out, input.sum) + } + } +} diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/testdata/tests.csv b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/testdata/tests.csv new file mode 100644 index 0000000..ed3ada0 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/testdata/tests.csv @@ -0,0 +1,3 @@ +a,b,sum +0,0,0 +1,-1,0 diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/go.mod b/tools/testtool/testdata/submissions/incorrect/brokentest/private/go.mod new file mode 100644 index 0000000..395a3ee --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/go.mod @@ -0,0 +1,9 @@ +module gitlab.com/slon/shad-go + +go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 +) diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/go.sum b/tools/testtool/testdata/submissions/incorrect/brokentest/private/go.sum new file mode 100644 index 0000000..9d8b8ff --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/go.sum @@ -0,0 +1,53 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go new file mode 100644 index 0000000..4c57f02 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go @@ -0,0 +1,7 @@ +// +build !solution + +package brokentest + +func Sum(a, b int64) int64 { + return a + 1 +} diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum_test.go b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum_test.go new file mode 100644 index 0000000..a5df94e --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum_test.go @@ -0,0 +1,23 @@ +package brokentest + +import ( + "math" + "testing" +) + +type testCase struct { + a, b, sum int64 +} + +func TestSum(t *testing.T) { + for _, input := range []testCase{ + {a: 2, b: 2, sum: 4}, + {a: 2, b: -2, sum: 0}, + {a: math.MaxInt64, b: 1, sum: math.MinInt64}, + {a: -1, b: -1, sum: -2}, + } { + if out := Sum(input.a, input.b); out != input.sum { + t.Errorf("%d + %d == %d != %d", input.a, input.b, out, input.sum) + } + } +} diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/testdata/tests.csv b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/testdata/tests.csv new file mode 100644 index 0000000..ed3ada0 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/testdata/tests.csv @@ -0,0 +1,3 @@ +a,b,sum +0,0,0 +1,-1,0 diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/student/go.mod b/tools/testtool/testdata/submissions/incorrect/brokentest/student/go.mod new file mode 100644 index 0000000..395a3ee --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/student/go.mod @@ -0,0 +1,9 @@ +module gitlab.com/slon/shad-go + +go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 +) diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/student/go.sum b/tools/testtool/testdata/submissions/incorrect/brokentest/student/go.sum new file mode 100644 index 0000000..9d8b8ff --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/student/go.sum @@ -0,0 +1,53 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/description.md b/tools/testtool/testdata/submissions/incorrect/newdependency/description.md new file mode 100644 index 0000000..d6201aa --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/description.md @@ -0,0 +1 @@ +Student solution is correct but it introduces new dependency not found in root go.mod. \ No newline at end of file diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/go.mod b/tools/testtool/testdata/submissions/incorrect/newdependency/private/go.mod new file mode 100644 index 0000000..395a3ee --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/go.mod @@ -0,0 +1,9 @@ +module gitlab.com/slon/shad-go + +go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 +) diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/go.sum b/tools/testtool/testdata/submissions/incorrect/newdependency/private/go.sum new file mode 100644 index 0000000..9d8b8ff --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/go.sum @@ -0,0 +1,53 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go new file mode 100644 index 0000000..f8ce74b --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go @@ -0,0 +1,7 @@ +// +build !solution + +package newdependency + +func Sum(a, b int64) int64 { + return 0 +} diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go new file mode 100644 index 0000000..e9b2d9a --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go @@ -0,0 +1,45 @@ +// +build private + +package newdependency + +import ( + "encoding/csv" + "os" + "strconv" + "testing" + + "github.com/stretchr/testify/require" +) + +// Read tests from csv file. +func readTestCases(filename string) ([]*testCase, error) { + f, err := os.Open(filename) + if err != nil { + return nil, err + } + + records, err := csv.NewReader(f).ReadAll() + if err != nil { + return nil, err + } + + var tests []*testCase + for _, r := range records { + a, _ := strconv.ParseInt(r[0], 10, 64) + b, _ := strconv.ParseInt(r[1], 10, 64) + sum, _ := strconv.ParseInt(r[2], 10, 64) + tests = append(tests, &testCase{a: a, b: b, sum: sum}) + } + + return tests, nil +} + +func TestSumPrivate(t *testing.T) { + tests, err := readTestCases("./testdata/tests.csv") + require.Nil(t, err) + + for _, tc := range tests { + s := Sum(tc.a, tc.b) + require.Equal(t, tc.sum, s, "%d + %d == %d != %d", tc.a, tc.b, s, tc.sum) + } +} diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go new file mode 100644 index 0000000..eaa3f75 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go @@ -0,0 +1,7 @@ +// +build solution + +package newdependency + +func Sum(a, b int64) int64 { + return a + b +} diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_test.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_test.go new file mode 100644 index 0000000..78d7588 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_test.go @@ -0,0 +1,22 @@ +package newdependency + +import ( + "math" + "testing" +) + +type testCase struct { + a, b, sum int64 +} + +func TestSum(t *testing.T) { + for _, input := range []testCase{ + {a: 2, b: 2, sum: 4}, + {a: 2, b: -2, sum: 0}, + {a: math.MaxInt64, b: 1, sum: math.MinInt64}, + } { + if out := Sum(input.a, input.b); out != input.sum { + t.Errorf("%d + %d == %d != %d", input.a, input.b, out, input.sum) + } + } +} diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/testdata/tests.csv b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/testdata/tests.csv new file mode 100644 index 0000000..ed3ada0 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/testdata/tests.csv @@ -0,0 +1,3 @@ +a,b,sum +0,0,0 +1,-1,0 diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/student/go.mod b/tools/testtool/testdata/submissions/incorrect/newdependency/student/go.mod new file mode 100644 index 0000000..6b02446 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/student/go.mod @@ -0,0 +1,10 @@ +module gitlab.com/slon/shad-go + +go 1.13 + +require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.4.0 + golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 + rsc.io/quote/v3 v3.1.0 +) diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/student/go.sum b/tools/testtool/testdata/submissions/incorrect/newdependency/student/go.sum new file mode 100644 index 0000000..40c397c --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/student/go.sum @@ -0,0 +1,60 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= +golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +rsc.io/quote v1.5.2 h1:w5fcysjrx7yqtD/aO+QwRjYZOKnaM9Uh2b40tElTs3Y= +rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go new file mode 100644 index 0000000..84d88b3 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go @@ -0,0 +1,10 @@ +// +build !solution + +package newdependency + +import "rsc.io/quote/v3" + +func Sum(a, b int64) int64 { + quote.HelloV3() + return a + b +} diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum_test.go b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum_test.go new file mode 100644 index 0000000..4149ac9 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum_test.go @@ -0,0 +1,23 @@ +package newdependency + +import ( + "math" + "testing" +) + +type testCase struct { + a, b, sum int64 +} + +func TestSum(t *testing.T) { + for _, input := range []testCase{ + {a: 2, b: 2, sum: 4}, + {a: 2, b: -2, sum: 0}, + {a: math.MaxInt64, b: 1, sum: math.MinInt64}, + {a: -1, b: -1, sum: -2}, + } { + if out := Sum(input.a, input.b); out != input.sum { + t.Errorf("%d + %d == %d != %d", input.a, input.b, out, input.sum) + } + } +} diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/testdata/tests.csv b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/testdata/tests.csv new file mode 100644 index 0000000..ed3ada0 --- /dev/null +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/testdata/tests.csv @@ -0,0 +1,3 @@ +a,b,sum +0,0,0 +1,-1,0