Init tests

Author: Eroui

commands/case.go

@@ -1,17 +1,17 @@
-package commands 
+package commands
 
 import (
 	"bufio"
+	"fmt"
+	"github.com/chermehdi/egor/config"
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
-	"fmt"
 	"os"
-	"github.com/chermehdi/egor/config"
 	"path"
 	"strconv"
 )
 
-func readFromStdin() ([]string, error) {
+func readFromStdin() []string {
 	scn := bufio.NewScanner(os.Stdin)
 	var lines []string
 	for scn.Scan() {
@@ -24,32 +24,54 @@ func readFromStdin() ([]string, error) {
 		}
 		lines = append(lines, line)
 	}
-	
-	// TODO(Eroui) add check for errors
-	return lines, nil
+	return lines
 }
 
 func writeLinesToFile(filename string, lines []string) {
 	f, err := os.Create(filename)
 	if err != nil {
-        fmt.Println(err)
-        return
+		fmt.Println(err)
+		return
 	}
 
 	for _, line := range lines {
-        fmt.Fprintln(f, line)
-        if err != nil {
-            fmt.Println(err)
-            return
-        }
-    }
+		fmt.Fprintln(f, line)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+	}
+}
+
+func AddNewCaseInput(input_lines []string,
+	case_name string,
+	meta_data config.EgorMeta) (config.EgorMeta, error) {
+
+	input_file_name := case_name + ".in"
+	writeLinesToFile("inputs/"+input_file_name, input_lines)
+	input_file := config.NewIoFile(input_file_name, "inputs/"+input_file_name, true)
+	meta_data.Inputs = append(meta_data.Inputs, input_file)
+
+	return meta_data, nil
+}
+
+func AddNewCaseOutput(output_lines []string,
+	case_name string,
+	meta_data config.EgorMeta) (config.EgorMeta, error) {
+
+	output_file_name := case_name + ".ans"
+	writeLinesToFile("outputs/"+output_file_name, output_lines)
+	output_file := config.NewIoFile(output_file_name, "outputs/"+output_file_name, true)
+	meta_data.Outputs = append(meta_data.Outputs, output_file)
+
+	return meta_data, nil
 }
 
 // TODO(Eroui): add checks on errors
 func CustomCaseAction(context *cli.Context) error {
 	color.Green("Creating Custom Test Case...")
-	
-	// Load meta data 
+
+	// Load meta data
 	cwd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -60,41 +82,39 @@ func CustomCaseAction(context *cli.Context) error {
 		return err
 	}
 
-	color.Green("Provide your input:")
-	input_lines, _ := readFromStdin()
-
-	color.Green("Provide your output:")
-	output_lines, _ := readFromStdin()
-	
 	case_name := "test-" + strconv.Itoa(len(meta_data.Inputs))
+	color.Green("Provide your input:")
+	input_lines := readFromStdin()
+	meta_data, err = AddNewCaseInput(input_lines, case_name, meta_data)
 
-	input_file_name := case_name + ".in"
-	output_file_name := case_name + ".out"
-
-	writeLinesToFile("inputs/" + input_file_name, input_lines)
-	writeLinesToFile("outputs/" + output_file_name, output_lines)
-
-	input_file := config.NewIoFile(input_file_name, "inputs/" + input_file_name, true)
-	output_file := config.NewIoFile(input_file_name, "outputs/" + output_file_name, true)
-
-	meta_data.Inputs = append(meta_data.Inputs, input_file)
-	meta_data.Outputs = append(meta_data.Outputs, output_file)
+	if !context.Bool("no-output") {
+		color.Green("Provide your output:")
+		output_lines := readFromStdin()
+		meta_data, err = AddNewCaseOutput(output_lines, case_name, meta_data)
+	}
 
 	meta_data.SaveToFile(path.Join(cwd, "egor-meta.json"))
-	
+
 	if err != nil {
-		fmt.Println(err)
+		color.Red("Failed to Generate Custom Case")
+		return err
 	}
-	
+
 	color.Green("Created Custom Test Case...")
 	return nil
 }
 
 var CaseCommand = cli.Command{
-	Name:		"case",
-	Aliases:	[]string{"c"},
-	Usage:		"Create a custom test case.",
-	UsageText:	"Add custom test cases to egor task.",
-	Action: 	CustomCaseAction,
-	// TODO(Eroui): add necessary flags
+	Name:      "case",
+	Aliases:   []string{"c"},
+	Usage:     "Create a custom test case.",
+	UsageText: "Add custom test cases to egor task.",
+	Action:    CustomCaseAction,
+	Flags: []cli.Flag{
+		&cli.BoolFlag{
+			Name:  "no-output",
+			Usage: "This test case doesnt have output",
+			Value: false,
+		},
+	},
 }

commands/case_test.go

@@ -0,0 +1,78 @@
+package commands
+
+import (
+	"github.com/chermehdi/egor/config"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"path"
+	"testing"
+	
+)
+
+func DeleteDir(dirPath string) {
+	_ = os.RemoveAll(dirPath)
+}
+
+func createDummyMetaData() (config.EgorMeta) {
+	meta_data := config.EgorMeta {
+		TaskName:	"Dummy Task",
+		TaskLang: 	"cpp",
+		Inputs: 	[]config.IoFile {
+			config.IoFile {
+				Name: 	"test-0",
+				Path: 	"inputs/test-0.in",
+				Custom:	false, 
+			}, 
+			config.IoFile {
+				Name: 	"test-1",
+				Path: 	"inputs/test-1.in",
+				Custom:	true,
+			}, 
+		}, 
+		Outputs: 	[]config.IoFile {
+			config.IoFile {
+				Name: 	"test-0",
+				Path: 	"outputs/test-0.ans",
+				Custom:	false,
+			},
+		},
+	}
+
+	return meta_data
+}
+
+
+func TestAddNewCaseInput(t *testing.T) {
+	meta_data := createDummyMetaData()
+
+	// create temp inputs directory
+	_ = os.Mkdir("inputs", 0777)
+
+	input_lines := [2]string{"Hello", "World"}
+	case_name := "test-2"
+	meta_data = AddNewCaseInput(input_lines, case_name, meta_data)
+
+	assert.Equal(t, len(meta_data.Inputs), 3)
+	assert.Equal(t, meta_data.Inputs[2].Name, case_name + ".in")
+	assert.Equal(t, meta_data.Inputs[2].Custom, true)
+	
+	DeleteDir("inputs")
+}
+
+
+func TestAddNewCaseInput(t *testing.T) {
+	meta_data := createDummyMetaData()
+
+	// create temp outputs directory
+	_ = os.Mkdir("outputs", 0777)
+
+	input_lines := [2]string{"Hello", "World"}
+	case_name := "test-2"
+	meta_data = AddNewCaseOutput(input_lines, case_name, meta_data)
+
+	assert.Equal(t, len(meta_data.Inputs), 2)
+	assert.Equal(t, meta_data.Outputs[1].Name, case_name + ".ans")
+	assert.Equal(t, meta_data.Outputs[1].Custom, true)
+
+	DeleteDir("outputs")
+}

config/meta.go

@@ -6,20 +6,20 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"path"
 	"os"
+	"path"
 )
 
 type IoFile struct {
-	Name string
-	Path string
+	Name   string
+	Path   string
 	Custom bool
 }
 
 func NewIoFile(fileName, filePath string, custom_case bool) IoFile {
 	return IoFile{
-		Name: fileName,
-		Path: filePath,
+		Name:   fileName,
+		Path:   filePath,
 		Custom: custom_case,
 	}
 }
@@ -56,7 +56,7 @@ func NewEgorMeta(task Task, config Config) EgorMeta {
 	outputs := make([]IoFile, testCount)
 	for i := 0; i < testCount; i++ {
 		fileName := fmt.Sprintf("test-%d", i)
-		inputs[i] = NewIoFile(fileName, path.Join("inputs", fileName+".in",), false)
+		inputs[i] = NewIoFile(fileName, path.Join("inputs", fileName+".in"), false)
 		outputs[i] = NewIoFile(fileName, path.Join("outputs", fileName+".ans"), false)
 	}
 	taskFile, err := GetTaskName(config)
@@ -102,10 +102,10 @@ func (egor *EgorMeta) Load(r io.Reader) error {
 }
 
 func LoadMeta(r io.Reader) (EgorMeta, error) {
-  var egor_meta EgorMeta
-  decoder := json2.NewDecoder(r)
-  err := decoder.Decode(&egor_meta)
-  return egor_meta, err
+	var egor_meta EgorMeta
+	decoder := json2.NewDecoder(r)
+	err := decoder.Decode(&egor_meta)
+	return egor_meta, err
 }
 
 func LoadMetaFromPath(file_path string) (EgorMeta, error) {
@@ -122,4 +122,4 @@ func CreateFile(filePath string) (*os.File, error) {
 func OpenFileFromPath(filePath string) (*os.File, error) {
 	file, err := os.Open(filePath)
 	return file, err
-}
+}