Updated test server to accept fileStore tyoe

Author: kyleklaussconn

Makefile

@@ -31,21 +31,21 @@ lint: linters-install
 build-test-srv:
 	cd _test; go build -o echo_server ./test-server/
 fix40:
-	cd _test; ./runat.sh $@.cfg 5001 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5001 "FILE" "definitions/server/$@/*.def"
 fix41:
-	cd _test; ./runat.sh $@.cfg 5002 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5002 "memory" "definitions/server/$@/*.def"
 fix42:
-	cd _test; ./runat.sh $@.cfg 5003 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5003 "memory" "definitions/server/$@/*.def"
 fix43:
-	cd _test; ./runat.sh $@.cfg 5004 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5004 "memory" "definitions/server/$@/*.def"
 fix44:
-	cd _test; ./runat.sh $@.cfg 5005 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5005 "memory" "definitions/server/$@/*.def"
 fix50:
-	cd _test; ./runat.sh $@.cfg 5006 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5006 "memory" "definitions/server/$@/*.def"
 fix50sp1:
-	cd _test; ./runat.sh $@.cfg 5007 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5007 "memory" "definitions/server/$@/*.def"
 fix50sp2:
-	cd _test; ./runat.sh $@.cfg 5008 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5008 "memory" "definitions/server/$@/*.def"
 
 ACCEPT_SUITE=fix40 fix41 fix42 fix43 fix44 fix50 fix50sp1 fix50sp2 
 accept: $(ACCEPT_SUITE)

_test/runat.sh

@@ -2,9 +2,10 @@
 
 CFG=$1
 PORT=$2
-TESTS=$3
+STORETYPE=$3
+TESTS=$4
 
-./echo_server $CFG &
+./echo_server $CFG $STORETYPE &
 pid=$!
 
 ruby -I. Runner.rb 127.0.0.1 $PORT $TESTS

_test/test-server/main.go

@@ -7,8 +7,12 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"path"
+	"strings"
+	"time"
 
 	"github.com/quickfixgo/quickfix"
+	"github.com/quickfixgo/quickfix/config"
 	field "github.com/quickfixgo/quickfix/gen/field"
 	tag "github.com/quickfixgo/quickfix/gen/tag"
 )
@@ -131,7 +135,21 @@ func main() {
 		return
 	}
 
-	acceptor, err := quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
+	storeType := os.Args[2]
+
+	var acceptor *quickfix.Acceptor
+	switch strings.ToUpper(storeType) {
+	case "FILE":
+		fileStoreRootPath := path.Join(os.TempDir(), fmt.Sprintf("FileStoreTestSuite-%d", os.Getpid()))
+		fileStorePath := path.Join(fileStoreRootPath, fmt.Sprintf("%d", time.Now().UnixNano()))
+		appSettings.GlobalSettings().Set(config.FileStorePath, fileStorePath)
+		acceptor, err = quickfix.NewAcceptor(app, quickfix.NewFileStoreFactory(appSettings), appSettings, fileLogFactory)
+	case "MEMORY":
+		acceptor, err = quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
+	default:
+		acceptor, err = quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
+	}
+
 	if err != nil {
 		fmt.Println("Unable to create Acceptor: ", err)
 		return

acceptor.go

@@ -36,6 +36,7 @@ type Acceptor struct {
 	settings              *Settings
 	logFactory            LogFactory
 	storeFactory          MessageStoreFactory
+	fileFactory           fileStoreFactory
 	globalLog             Log
 	sessions              map[SessionID]*session
 	sessionGroup          sync.WaitGroup

filestore.go

@@ -76,7 +76,10 @@ func (f fileStoreFactory) Create(sessionID SessionID) (msgStore MessageStore, er
 
 	dirname, err := sessionSettings.Setting(config.FileStorePath)
 	if err != nil {
-		return nil, err
+		dirname, err = globalSettings.Setting(config.FileStorePath)
+		if err != nil {
+			return nil, err
+		}
 	}
 	var fsync bool
 	if sessionSettings.HasSetting(config.FileStoreSync) {