add makefile

Makefile

@@ -4,17 +4,29 @@ SERVER_BIN = server
 CLIENT_PATH = ./src/client
 CLIENT_BIN = client
 
-SEARCH_GOFILES =  find -not -path '*/vendor/*' -type f -name "*.go"
+SEARCH_GOFILES := $(shell find -type f -name "*.go")
 
-all: check client server docker run
+build: clean client server docker
 
-clean:
-	rm -rf $(SERVER_PATH)/server
-	rm -rf $(CLIENT_PATH)/client
+.PHONY: test
+test:
+	go test $(SERVER_PATH)
+	go test $(CLIENT_PATH)
 
 .PHONY: check
-check:
-	$(SEARCH_GOFILES) -exec go vet -s -l {} \;
+check: 
+	goimports -e -l $(SEARCH_GOFILES)
+	golint -set_exit_status $(SEARCH_GOFILES)
+	go vet $(SERVER_PATH)
+	go vet $(CLIENT_PATH)
+
+.PHONY: run
+run: build
+	sudo docker run -d gohomework
+
+clean:
+	rm -rf $(SERVER_PATH)/$(SERVER_BIN)
+	rm -rf $(CLIENT_PATH)/$(CLIENT_BIN)
 
 client:
 	go build -o $(CLIENT_PATH)/$(CLIENT_BIN) $(CLIENT_PATH)/client.go
@@ -24,8 +36,4 @@ server:
 
 .PHONY: docker
 docker: server client 
-	sudo docker build -t gohomework .
-
-.PHONY: run
-run:
-	sudo docker run gohomework
+	sudo docker build -t gohomework .

src/client/client.go

@@ -1,4 +1,3 @@
-//server
 package main
 
 import (

src/server/server.go

@@ -1,4 +1,3 @@
-//serve
 package main
 
 import (
@@ -30,6 +29,7 @@ func main() {
 		if err != nil {
 			log.Fatalln(err)
 		}
+		log.Println("Connection from", conn.RemoteAddr())
 		go handleConnection(conn)
 	}
 }
@@ -39,7 +39,6 @@ func handleConnection(conn net.Conn) {
 	dataBase := make(map[string]string)
 	clientReader := bufio.NewReader(conn)
 	clientWriter := bufio.NewWriter(conn)
-	log.Println("Connection from", conn.RemoteAddr())
 	for {
 		command, err := clientReader.ReadString('\n')
 		if err != nil {

src/server/server_test.go

@@ -0,0 +1,105 @@
+package main
+
+import (
+	"testing"
+	"time"
+	"net"
+	"bufio"
+	"fmt"
+)
+
+type fakeConn struct{
+	lenBufer int
+	bufer [1024*10]byte
+}
+
+func (f *fakeConn) Read(b []byte) (int, error) {
+	copy(b, f.bufer[0:f.lenBufer])
+	n := f.lenBufer
+	f.lenBufer = 0
+	fmt.Println("Прочитанно ", n, " байт,", string(b[:n]))
+	var err error
+	err = nil
+	return n, err
+}
+
+func (f *fakeConn) Write(b []byte) (int, error) {
+	n := len(b)
+	copy(f.bufer[f.lenBufer:n+f.lenBufer], b)
+	fmt.Println("Записанно ", n, " байт,", string(f.bufer[f.lenBufer:n+f.lenBufer]))
+	f.lenBufer += n
+	var err error
+	err = nil
+	return n, err
+}
+
+func (f *fakeConn) Close() error {
+
+	return nil
+
+}
+
+func (f *fakeConn) LocalAddr() net.Addr {
+
+	return nil
+
+}
+
+func (f *fakeConn) RemoteAddr() net.Addr {
+
+	return nil
+
+}
+
+func (f *fakeConn) SetDeadline(t time.Time) error {
+
+	return nil
+
+}
+
+func (f *fakeConn) SetReadDeadline(t time.Time) error {
+
+	return nil
+
+}
+
+func (f *fakeConn) SetWriteDeadline(t time.Time) error {
+
+	return nil
+
+}
+
+func (f *fakeConn) SetReadBuffer(bytes int) error {
+
+	return nil
+
+}
+
+func (f *fakeConn) SetWriteBuffer(bytes int) error {
+
+	return nil
+
+}
+
+
+func TestHandleConnection(t *testing.T){
+	fConn := fakeConn{}
+	go handleConnection(&fConn)
+	serverWriter := bufio.NewWriter(&fConn)
+	serverReader := bufio.NewReader(&fConn)
+
+	//set test
+	n, err := serverWriter.WriteString("set a b\n")
+	if n == 0 || err != nil {
+			fmt.Println(err)
+			return
+	}
+	serverWriter.Flush()
+	reply, err := serverReader.ReadString('\n')
+	if err != nil {
+		fmt.Println(err)
+	}
+	if reply != "Ok\n" {
+		t.Error("Set test. Excepted Ok, got ", reply)
+	}
+}