Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
Yuri Shkuro committed Jan 1, 2018
1 parent 7f62f1c commit b024a6d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 144 deletions.
10 changes: 0 additions & 10 deletions cmd/builder/builder_options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@ import (
"github.com/stretchr/testify/assert"
"go.uber.org/zap"

cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
escfg "github.com/jaegertracing/jaeger/pkg/es/config"
"github.com/jaegertracing/jaeger/storage/spanstore/memory"
"github.com/uber/jaeger-lib/metrics"
)

func TestApplyOptions(t *testing.T) {
opts := ApplyOptions(
Options.CassandraSessionOption(&cascfg.Configuration{}),
Options.LoggerOption(zap.NewNop()),
Options.MetricsFactoryOption(metrics.NullFactory),
Options.MemoryStoreOption(memory.NewStore()),
Options.ElasticClientOption(&escfg.Configuration{
Servers: []string{"127.0.0.1"},
}),
)
assert.NotNil(t, opts.CassandraSessionBuilder)
assert.NotNil(t, opts.ElasticClientBuilder)
assert.NotNil(t, opts.Logger)
assert.NotNil(t, opts.MetricsFactory)
}
Expand Down
138 changes: 4 additions & 134 deletions cmd/collector/app/builder/span_handler_builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,127 +24,23 @@ import (

"github.com/jaegertracing/jaeger/cmd/builder"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/pkg/cassandra"
cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/es"
escfg "github.com/jaegertracing/jaeger/pkg/es/config"
esMocks "github.com/jaegertracing/jaeger/pkg/es/mocks"
"github.com/jaegertracing/jaeger/storage/spanstore/memory"
"github.com/jaegertracing/jaeger/plugin/storage/memory"
)

type mockSessionBuilder struct {
}

func (*mockSessionBuilder) NewSession() (cassandra.Session, error) {
return &mocks.Session{}, nil
}

type mockEsBuilder struct {
escfg.Configuration
}

func (mck *mockEsBuilder) NewClient() (es.Client, error) {
return &esMocks.Client{}, nil
}

func TestNewSpanHandlerBuilder(t *testing.T) {
v, command := config.Viperize(flags.AddFlags)
v, command := config.Viperize(flags.AddFlags, AddFlags)

command.ParseFlags([]string{})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(
cOpts,
sFlags,
builder.Options.LoggerOption(zap.NewNop()),
builder.Options.MetricsFactoryOption(metrics.NullFactory),
builder.Options.CassandraSessionOption(&mockSessionBuilder{}),
)
require.NoError(t, err)
assert.NotNil(t, handler)
zipkin, jaeger := handler.BuildHandlers()
assert.NotNil(t, zipkin)
assert.NotNil(t, jaeger)
}

func TestNewSpanHandlerBuilderCassandraNoSession(t *testing.T) {
v, command := config.Viperize(flags.AddFlags)

command.ParseFlags([]string{})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)
spanWriter := memory.NewStore()

handler, err := NewSpanHandlerBuilder(
cOpts,
sFlags,
spanWriter,
builder.Options.LoggerOption(zap.NewNop()),
builder.Options.MetricsFactoryOption(metrics.NullFactory),
builder.Options.CassandraSessionOption(&cascfg.Configuration{}),
)
require.Error(t, err)
assert.Nil(t, handler)
}

func TestNewSpanHandlerBuilderCassandraNotConfigured(t *testing.T) {
v, _ := config.Viperize(AddFlags, flags.AddFlags)
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(cOpts, sFlags)
assert.Error(t, err)
assert.Nil(t, handler)
}

func TestNewSpanHandlerBuilderBadStorageTypeFailure(t *testing.T) {
v, command := config.Viperize(AddFlags, flags.AddFlags)
command.ParseFlags([]string{"test", "--span-storage.type=sneh"})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(cOpts, sFlags)
assert.Error(t, err)
assert.Nil(t, handler)
}

func TestNewSpanHandlerBuilderMemoryNotSet(t *testing.T) {
v, command := config.Viperize(AddFlags, flags.AddFlags)
command.ParseFlags([]string{"test", "--span-storage.type=memory"})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(cOpts, sFlags)
assert.Error(t, err)
assert.Nil(t, handler)
}

func TestNewSpanHandlerBuilderMemorySet(t *testing.T) {
v, command := config.Viperize(AddFlags, flags.AddFlags)
command.ParseFlags([]string{"test", "--span-storage.type=memory"})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(cOpts, sFlags, builder.Options.MemoryStoreOption(memory.NewStore()))
require.NoError(t, err)
assert.NotNil(t, handler)
jHandler, zHandler := handler.BuildHandlers()
assert.NotNil(t, jHandler)
assert.NotNil(t, zHandler)
}

func TestNewSpanHandlerBuilderElasticSearch(t *testing.T) {
v, command := config.Viperize(AddFlags, flags.AddFlags)
command.ParseFlags([]string{"test", "--span-storage.type=elasticsearch"})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(
cOpts,
sFlags,
builder.Options.LoggerOption(zap.NewNop()),
builder.Options.ElasticClientOption(&mockEsBuilder{}),
)
require.NoError(t, err)
assert.NotNil(t, handler)
Expand All @@ -153,32 +49,6 @@ func TestNewSpanHandlerBuilderElasticSearch(t *testing.T) {
assert.NotNil(t, jaeger)
}

func TestNewSpanHandlerBuilderElasticSearchNoClient(t *testing.T) {
v, command := config.Viperize(AddFlags, flags.AddFlags)
command.ParseFlags([]string{"test", "--span-storage.type=elasticsearch"})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)

handler, err := NewSpanHandlerBuilder(
cOpts,
sFlags,
builder.Options.LoggerOption(zap.NewNop()),
builder.Options.ElasticClientOption(&escfg.Configuration{}),
)
require.Error(t, err)
assert.Nil(t, handler)
}

func TestNewSpanHandlerBuilderElasticSearchFailure(t *testing.T) {
v, command := config.Viperize(AddFlags, flags.AddFlags)
command.ParseFlags([]string{"test", "--span-storage.type=elasticsearch"})
sFlags := new(flags.SharedFlags).InitFromViper(v)
cOpts := new(CollectorOptions).InitFromViper(v)
handler, err := NewSpanHandlerBuilder(cOpts, sFlags)
assert.EqualError(t, err, "ElasticSearch not configured")
assert.Nil(t, handler)
}

func TestDefaultSpanFilter(t *testing.T) {
assert.True(t, defaultSpanFilter(nil))
}

0 comments on commit b024a6d

Please sign in to comment.