working commit

app/server/server.go

@@ -1,16 +1,12 @@
 package server
 
 import (
-	//"io/ioutil"
 	"os"
 	"os/signal"
 	"os/user"
-	//"os/user"
 	"path/filepath"
 	"strconv"
-	//"sync"
 	"syscall"
-	//"time"
 
 	"mstore/app/config"
 	"mstore/app/handler"
@@ -42,6 +38,27 @@ func (srv *Server) Handler() *handler.Handler {
 	return srv.hand
 }
 
+func (srv *Server) Service() *service.Service {
+	return srv.svc
+}
+
+func (srv *Server) SetLogdir(dir string) {
+	srv.conf.Logpath = dir
+}
+
+func (srv *Server) SetRundir(dir string) {
+	srv.conf.Runpath = dir
+}
+
+func (srv *Server) SetDatadir(dir string) {
+	srv.conf.Database.Basepath = dir
+	srv.conf.Storage.Basepath = dir
+}
+
+func (srv *Server) SetPort(port int64) {
+	srv.conf.Service.Port = port
+}
+
 func (srv *Server) Configure() error {
 	var err error
 	srv.logg.Infof("Configuration server")

test/file_test.go

@@ -16,46 +16,27 @@ import (
 	"mstore/app/server"
 )
 
-func TestFileLife(t *testing.T) {
-	var tester FileTester
-	tester.MakeServer(t)
-	tester.TestServiceHello(t)
-	tester.TestPutFile(t)
-	tester.TestFileExists(t)
-	tester.TestGetFile(t)
-	tester.TestDeleteFile(t)
-	tester.TestFileNotExists(t)
-}
-
-type FileTester struct {
-	srv *server.Server
-}
-
-func (tester *FileTester) MakeServer(t *testing.T) {
+func TestFileOperations(t *testing.T) {
 	var err error
-
 	fmt.Printf("=== MakeServer ===\n")
-
 	srv, err := server.NewServer()
 	require.NoError(t, err)
 
+	{
 		err = srv.Configure()
 		require.NoError(t, err)
 
+		tmpdir := t.TempDir()
+		srv.SetDatadir(tmpdir)
+		srv.SetLogdir(tmpdir)
+		srv.SetRundir(tmpdir)
+
 		err = srv.Build()
 		require.NoError(t, err)
-
-	tester.srv = srv
 	}
 
-func (tester *FileTester) TestPutFile(t *testing.T) {
-	var err error
-
+	{
 		fmt.Printf("=== PutFile ===\n")
-
-	srv := tester.srv
-	require.NotNil(t, srv)
-
 		reqPath := `/v3/api/file/foo/bare`
 		routePath := `/v3/api/file/{filepath}`
 
@@ -91,15 +72,9 @@ func (tester *FileTester) TestPutFile(t *testing.T) {
 
 		fmt.Printf("Response body: %s\n", string(bodyBytes))
 	}
-
-func (tester *FileTester) TestFileExists(t *testing.T) {
-	var err error
+	{
 		fmt.Printf("=== FileExists ===\n")
 
-	srv := tester.srv
-
-	require.NotNil(t, srv)
-
 		reqPath := `/v3/api/file/foo/bare`
 		routePath := `/v3/api/file/{filepath}`
 
@@ -123,15 +98,8 @@ func (tester *FileTester) TestFileExists(t *testing.T) {
 
 		fmt.Printf("Response body: %s\n", string(bodyBytes))
 	}
-
-func (tester *FileTester) TestGetFile(t *testing.T) {
-	var err error
-
+	{
 		fmt.Printf("=== GetFile ===\n")
-
-	srv := tester.srv
-	require.NotNil(t, srv)
-
 		reqPath := `/v3/api/file/foo/bare`
 		routePath := `/v3/api/file/{filepath}`
 
@@ -155,15 +123,8 @@ func (tester *FileTester) TestGetFile(t *testing.T) {
 
 		fmt.Printf("Response body: %s\n", string(bodyBytes))
 	}
-
-func (tester *FileTester) TestDeleteFile(t *testing.T) {
-	var err error
-
+	{
 		fmt.Printf("=== DeleteFile ===\n")
-
-	srv := tester.srv
-	require.NotNil(t, srv)
-
 		reqPath := `/v3/api/file/foo/bare`
 		routePath := `/v3/api/file/{filepath}`
 
@@ -188,14 +149,9 @@ func (tester *FileTester) TestDeleteFile(t *testing.T) {
 		fmt.Printf("Response body: %s\n", string(bodyBytes))
 	}
 
-func (tester *FileTester) TestFileNotExists(t *testing.T) {
-	var err error
+	{
 		fmt.Printf("=== FileNotExists ===\n")
 
-	srv := tester.srv
-
-	require.NotNil(t, srv)
-
 		reqPath := `/v3/api/file/foo/bare`
 		routePath := `/v3/api/file/{filepath}`
 
@@ -219,15 +175,8 @@ func (tester *FileTester) TestFileNotExists(t *testing.T) {
 
 		fmt.Printf("Response body: %s\n", string(bodyBytes))
 	}
-
-func (tester *FileTester) TestServiceHello(t *testing.T) {
-	var err error
-
+	{
 		fmt.Printf("=== ServiceHello ===\n")
-
-	srv := tester.srv
-	require.NotNil(t, srv)
-
 		reqPath := "/service/hello"
 		routePath := "/service/hello"
 
@@ -249,3 +198,4 @@ func (tester *FileTester) TestServiceHello(t *testing.T) {
 
 		fmt.Printf("Response body: %s\n", string(bodyBytes))
 	}
+}