Improve code quality

This commit is contained in:
Mario
2022-05-14 16:51:00 +02:00
parent 3d020d7548
commit 60cffd6b26
4 changed files with 16 additions and 7 deletions

View File

@ -44,12 +44,12 @@ type configurationsParser struct {
configurationsCorePath string configurationsCorePath string
configurationsServicesDirectory string configurationsServicesDirectory string
readFileBytesByFilePathDependency ReadFileBytesByFilePath readFileBytesByFilePathDependency ReadFileBytesByFilePath
gelAllFinesNameByDirNameDependency GelAllFinesNameByDirName gelAllFilesNameByDirNameDependency GelAllFilesNameByDirName
} }
type ReadFileBytesByFilePath func(filePath string) ([]byte, error) type ReadFileBytesByFilePath func(filePath string) ([]byte, error)
type GelAllFinesNameByDirName func(dirName string) ([]string, error) type GelAllFilesNameByDirName func(dirName string) ([]string, error)
// Init Parser, return a configurationsParser and use the DI Pattern to inject the dependencies // Init Parser, return a configurationsParser and use the DI Pattern to inject the dependencies
func Init(configurationsCorePath, configurationsServicesDirectory string) *configurationsParser { func Init(configurationsCorePath, configurationsServicesDirectory string) *configurationsParser {
@ -57,7 +57,7 @@ func Init(configurationsCorePath, configurationsServicesDirectory string) *confi
configurationsCorePath: configurationsCorePath, configurationsCorePath: configurationsCorePath,
configurationsServicesDirectory: configurationsServicesDirectory, configurationsServicesDirectory: configurationsServicesDirectory,
readFileBytesByFilePathDependency: readFileBytesByFilePath, readFileBytesByFilePathDependency: readFileBytesByFilePath,
gelAllFinesNameByDirNameDependency: gelAllFinesNameByDirName, gelAllFilesNameByDirNameDependency: gelAllFilesNameByDirName,
} }
} }
@ -77,7 +77,7 @@ func (bp configurationsParser) ReadConfigurationsCore() (*BeelzebubCoreConfigura
} }
func (bp configurationsParser) ReadConfigurationsServices() ([]BeelzebubServiceConfiguration, error) { func (bp configurationsParser) ReadConfigurationsServices() ([]BeelzebubServiceConfiguration, error) {
services, err := bp.gelAllFinesNameByDirNameDependency(bp.configurationsServicesDirectory) services, err := bp.gelAllFilesNameByDirNameDependency(bp.configurationsServicesDirectory)
if err != nil { if err != nil {
return nil, fmt.Errorf("in directory %s: %v", bp.configurationsServicesDirectory, err) return nil, fmt.Errorf("in directory %s: %v", bp.configurationsServicesDirectory, err)
} }
@ -101,7 +101,7 @@ func (bp configurationsParser) ReadConfigurationsServices() ([]BeelzebubServiceC
return servicesConfiguration, nil return servicesConfiguration, nil
} }
func gelAllFinesNameByDirName(dirName string) ([]string, error) { func gelAllFilesNameByDirName(dirName string) ([]string, error) {
var filesName []string var filesName []string
files, err := ioutil.ReadDir(dirName) files, err := ioutil.ReadDir(dirName)
if err != nil { if err != nil {

View File

@ -83,7 +83,7 @@ func TestReadConfigurationsServicesFail(t *testing.T) {
configurationsParser := Init("", "") configurationsParser := Init("", "")
configurationsParser.readFileBytesByFilePathDependency = mockReadfilebytesError configurationsParser.readFileBytesByFilePathDependency = mockReadfilebytesError
configurationsParser.gelAllFinesNameByDirNameDependency = mockReadDirError configurationsParser.gelAllFilesNameByDirNameDependency = mockReadDirError
beelzebubServiceConfiguration, err := configurationsParser.ReadConfigurationsServices() beelzebubServiceConfiguration, err := configurationsParser.ReadConfigurationsServices()
assert.Nil(t, beelzebubServiceConfiguration) assert.Nil(t, beelzebubServiceConfiguration)
@ -94,7 +94,7 @@ func TestReadConfigurationsServicesValid(t *testing.T) {
configurationsParser := Init("", "") configurationsParser := Init("", "")
configurationsParser.readFileBytesByFilePathDependency = mockReadfilebytesBeelzebubServiceConfiguration configurationsParser.readFileBytesByFilePathDependency = mockReadfilebytesBeelzebubServiceConfiguration
configurationsParser.gelAllFinesNameByDirNameDependency = mockReadDirValid configurationsParser.gelAllFilesNameByDirNameDependency = mockReadDirValid
beelzebubServicesConfiguration, err := configurationsParser.ReadConfigurationsServices() beelzebubServicesConfiguration, err := configurationsParser.ReadConfigurationsServices()

View File

@ -36,6 +36,8 @@ func TestInitServiceSuccess(t *testing.T) {
protocolManager := InitProtocolManager(mockTraceStrategy, mockServiceStrategyValid{}) protocolManager := InitProtocolManager(mockTraceStrategy, mockServiceStrategyValid{})
protocolManager.SetProtocolStrategy(mockServiceStrategyValid{})
assert.Nil(t, protocolManager.InitService(parser.BeelzebubServiceConfiguration{})) assert.Nil(t, protocolManager.InitService(parser.BeelzebubServiceConfiguration{}))
} }

View File

@ -33,3 +33,10 @@ func TestTraceEvent(t *testing.T) {
assert.Equal(t, eventCalled.Protocol, HTTP) assert.Equal(t, eventCalled.Protocol, HTTP)
assert.Equal(t, eventCalled.Status, Stateless) assert.Equal(t, eventCalled.Status, Stateless)
} }
func TestStringStatus(t *testing.T) {
assert.Equal(t, Start.String(), "Start")
assert.Equal(t, End.String(), "End")
assert.Equal(t, Stateless.String(), "Stateless")
assert.Equal(t, Interaction.String(), "Interaction")
}