PR Comments Review

Author: Eroui

commands/showcases.go

@@ -9,49 +9,60 @@ import (
 	"path"
 )
 
-// print test cases table
-func PrintTestCasesTable(inputFiles, outputFiles map[string]config.IoFile) {
-	t := table.NewWriter()
-	t.SetOutputMirror(os.Stdout)
-	t.AppendHeader(table.Row{"#", "Test Name", "Input Path", "Output Path", "Custon"})
-	for key, inputFile := range inputFiles {
-		id := inputFile.GetId()
-		testName := inputFile.Name
-		inputPath := inputFile.Path
-		outputPath := ""
-		custom := inputFile.Custom
+type TestCaseIO struct {
+	Id int
+	Name string
+	InputPath string
+	OutputPath string
+	Custom bool
+}
 
-		outputFile, ok := outputFiles[key]
-		if ok {
-			outputPath = outputFile.Path
+// parse input and output from egor meta to TestCase
+func GetTestCases(egorMeta config.EgorMeta) []*TestCaseIO {
+	testCasesMap := make(map[string]*TestCaseIO)
+	testCases := make([]*TestCaseIO, 0)
+	for _, input := range egorMeta.Inputs {
+		testCase := &TestCaseIO {
+			Id : input.GetId(),
+			Name : input.Name,
+			InputPath : input.Path,
+			OutputPath: "",
+			Custom: input.Custom,
 		}
-
-		t.AppendRow([]interface{}{id, testName, inputPath, outputPath, custom})
+		testCasesMap[input.Name] = testCase
+		testCases = append(testCases, testCase)
 	}
-	t.SetStyle(table.StyleLight)
-	t.Render()
-}
 
-// construct inputs and outputs maps from an egor meta data where keys are test names.
-func GetIoFilesMaps(egorMeta config.EgorMeta) (map[string]config.IoFile, map[string]config.IoFile) {
-	inputFiles := make(map[string]config.IoFile)
-	for _, inputFile := range egorMeta.Inputs {
-		inputFiles[inputFile.Name] = inputFile
+	for _, output := range egorMeta.Outputs {
+		if testCase, ok := testCasesMap[output.Name]; ok {
+			testCase.OutputPath = output.Path
+		}
 	}
 
-	outputFiles := make(map[string]config.IoFile)
-	for _, outputFile := range egorMeta.Outputs {
-		outputFiles[outputFile.Name] = outputFile
-	}
+	return testCases
+}
 
-	return inputFiles, outputFiles
+// print test cases table
+func PrintTestCasesTable(testCases []*TestCaseIO) {
+	t := table.NewWriter()
+	t.SetOutputMirror(os.Stdout)
+	t.AppendHeader(table.Row{"#", "Test Name", "Input Path", "Output Path", "Custon"})
+	for _, testCase := range testCases {
+		t.AppendRow([]interface{}{
+			testCase.Id,
+			testCase.Name,
+			testCase.InputPath,
+			testCase.OutputPath,
+			testCase.Custom,
+		})
+	}
+	t.SetStyle(table.StyleLight)
+	t.Render()
 }
 
 // print task test cases
-func PrintTestCases(egorMeta config.EgorMeta) error {
-	inputFiles, outputFiles := GetIoFilesMaps(egorMeta)
-	PrintTestCasesTable(inputFiles, outputFiles)
-	return nil
+func PrintTestCases(egorMeta config.EgorMeta) {
+	PrintTestCasesTable(GetTestCases(egorMeta))
 }
 
 // list test cases information command action
@@ -79,11 +90,8 @@ func ShowCasesAction(context *cli.Context) error {
 	color.Green("Listing %d testcase(s)...", metaData.CountTestCases())
 	color.Green("")
 
-	err = PrintTestCases(metaData)
-	if err != nil {
-		color.Red("Error while printing test cases")
-		return err
-	}
+	PrintTestCases(metaData)
+
 	return nil
 }
 
@@ -92,7 +100,7 @@ func ShowCasesAction(context *cli.Context) error {
 // and prints it as an array into the consol.
 var ShowCasesCommand = cli.Command{
 	Name:      "showcases",
-	Aliases:   []string{"listcases"},
+	Aliases:   []string{"sc"},
 	Usage:     "list information about test cases",
 	UsageText: "list meta data about of the tests cases in the current task",
 	Action:    ShowCasesAction,

commands/showcases_test.go

@@ -1,17 +1,45 @@
 package commands
 
 import (
+	"github.com/chermehdi/egor/config"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
-func TestGetIoFilesMaps(t *testing.T) {
-	metaData := createDummyMetaData()
-	inputs, outputs := GetIoFilesMaps(metaData)
+func createSimpleDummyMetaData() config.EgorMeta{
+	meteData := config.EgorMeta {
+		TaskName:	"Dummy Task",
+		TaskLang: 	"cpp",
+		Inputs: 	[]config.IoFile {
+			config.IoFile {
+				Name: 	"test-0",
+				Path: 	"inputs/test-0.in",
+				Custom:	true, 
+			}, 
+		}, 
+		Outputs: 	[]config.IoFile {
+			config.IoFile {
+				Name: 	"test-0",
+				Path: 	"outputs/test-0.ans",
+				Custom:	true,
+			},
+		},
+	}
 
-	assert.Equal(t, len(inputs), len(metaData.Inputs))
-	assert.Equal(t, len(outputs), len(metaData.Outputs))
-	assert.Equal(t, inputs["test-0"], metaData.Inputs[0])
-	assert.Equal(t, inputs["test-1"], metaData.Inputs[1])
-	assert.Equal(t, outputs["test-0"], metaData.Outputs[0])
+	return meteData
 }
+
+func TestGetTestCases(t *testing.T) {
+	metaData := createDummyMetaData()
+	testCases := GetTestCases(metaData)
+	inputs := metaData.Inputs
+	outputs := metaData.Outputs
+
+	assert.Equal(t, len(testCases), len(metaData.Inputs))
+	assert.Equal(t, testCases[0].Id, inputs[0].GetId())
+	assert.Equal(t, testCases[0].Name, inputs[0].Name)
+	assert.Equal(t, testCases[0].Name, outputs[0].Name)
+	assert.Equal(t, testCases[0].InputPath, inputs[0].Path)
+	assert.Equal(t, testCases[0].OutputPath, outputs[0].Path)
+	assert.Equal(t, testCases[0].Custom, inputs[0].Custom)
+}