Add unsupported type to Load (#27)

* Added new test * Load in filter to return unsupported type error * Ignore vscode and html (coverage) files
grafadruid · Feb 19, 2021 · 0d9ff2b · 0d9ff2b
1 parent c860257
commit 0d9ff2b
Show file tree

Hide file tree

Showing 35 changed files with 359 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 *.dll
 *.so
 *.dylib
+*.html
+.vscode/*
 
 # Test binary, built with `go test -c`
 *.test

diff --git a/builder/aggregation/aggregation.go b/builder/aggregation/aggregation.go
@@ -2,6 +2,7 @@ package aggregation
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -94,6 +95,8 @@ func Load(data []byte) (builder.Aggregator, error) {
 		a = NewStringLastFolding()
 	case "stringLast":
 		a = NewStringLast()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return a, json.Unmarshal(data, &a)
 }
diff --git a/builder/aggregation/aggregation_test.go b/builder/aggregation/aggregation_test.go
@@ -0,0 +1,17 @@
+package aggregation
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/bound/bound.go b/builder/bound/bound.go
@@ -2,6 +2,7 @@ package bound
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -34,6 +35,8 @@ func Load(data []byte) (builder.Aggregator, error) {
 		b = NewRadius()
 	case "rectangular":
 		b = NewRectangular()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return b, json.Unmarshal(data, &b)
 }
diff --git a/builder/bound/bound_test.go b/builder/bound/bound_test.go
@@ -0,0 +1,17 @@
+package bound
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/datasource/data_source.go b/builder/datasource/data_source.go
@@ -2,6 +2,7 @@ package datasource
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -42,6 +43,8 @@ func Load(data []byte) (builder.DataSource, error) {
 		d = NewTable()
 	case "union":
 		d = NewUnion()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return d, json.Unmarshal(data, &d)
 }
diff --git a/builder/datasource/data_source_test.go b/builder/datasource/data_source_test.go
@@ -0,0 +1,17 @@
+package datasource
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/dimension/dimension.go b/builder/dimension/dimension.go
@@ -2,6 +2,7 @@ package dimension
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 	"github.com/grafadruid/go-druid/builder/types"
@@ -59,6 +60,8 @@ func Load(data []byte) (builder.Dimension, error) {
 		d = NewPrefixFiltered()
 	case "regexFiltered":
 		d = NewRegexFiltered()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return d, json.Unmarshal(data, &d)
 }
diff --git a/builder/dimension/dimension_test.go b/builder/dimension/dimension_test.go
@@ -0,0 +1,17 @@
+package dimension
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/extractionfn/extraction_fn.go b/builder/extractionfn/extraction_fn.go
@@ -2,6 +2,7 @@ package extractionfn
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -58,6 +59,8 @@ func Load(data []byte) (builder.ExtractionFn, error) {
 		e = NewTimeFormat()
 	case "upper":
 		e = NewUpper()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return e, json.Unmarshal(data, &e)
 }
diff --git a/builder/extractionfn/extraction_fn_test.go b/builder/extractionfn/extraction_fn_test.go
@@ -0,0 +1,17 @@
+package extractionfn
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/filter/filter.go b/builder/filter/filter.go
@@ -2,6 +2,7 @@ package filter
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -64,6 +65,8 @@ func Load(data []byte) (builder.Filter, error) {
 		f = NewSpatial()
 	case "true":
 		f = NewTrue()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return f, json.Unmarshal(data, &f)
 }
diff --git a/builder/filter/filter_test.go b/builder/filter/filter_test.go
@@ -0,0 +1,17 @@
+package filter
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/granularity/granularity_test.go b/builder/granularity/granularity_test.go
@@ -0,0 +1,17 @@
+package granularity
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/havingspec/having_spec.go b/builder/havingspec/having_spec.go
@@ -2,6 +2,7 @@ package havingspec
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -46,6 +47,8 @@ func Load(data []byte) (builder.Dimension, error) {
 		d = NewNot()
 	case "or":
 		d = NewOr()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return d, json.Unmarshal(data, &d)
 }
diff --git a/builder/havingspec/having_spec_test.go b/builder/havingspec/having_spec_test.go
@@ -0,0 +1,17 @@
+package havingspec
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/intervals/intervals.go b/builder/intervals/intervals.go
@@ -2,6 +2,8 @@ package intervals
 
 import (
 	"encoding/json"
+	"errors"
+
 	"github.com/grafadruid/go-druid/builder"
 )
 
@@ -29,6 +31,8 @@ func Load(data []byte) (builder.Intervals, error) {
 	switch t.Typ {
 	case "intervals":
 		i = NewIntervals()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return i, json.Unmarshal(data, &i)
 }
diff --git a/builder/intervals/intervals_test.go b/builder/intervals/intervals_test.go
@@ -0,0 +1,17 @@
+package intervals
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/limitspec/limit_spec.go b/builder/limitspec/limit_spec.go
@@ -2,6 +2,7 @@ package limitspec
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -30,6 +31,8 @@ func Load(data []byte) (builder.Dimension, error) {
 	switch t.Typ {
 	case "default":
 		d = NewDefault()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return d, json.Unmarshal(data, &d)
 }
diff --git a/builder/limitspec/limit_spec_test.go b/builder/limitspec/limit_spec_test.go
@@ -0,0 +1,17 @@
+package limitspec
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/lookup/lookup.go b/builder/lookup/lookup.go
@@ -2,6 +2,7 @@ package lookup
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -30,6 +31,8 @@ func Load(data []byte) (builder.LookupExtractor, error) {
 	switch t.Typ {
 	case "map":
 		l = NewMap()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return l, json.Unmarshal(data, &l)
 }
diff --git a/builder/lookup/lookup_test.go b/builder/lookup/lookup_test.go
@@ -0,0 +1,17 @@
+package lookup
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadUnsupportedType(t *testing.T) {
+	assert := assert.New(t)
+
+	f, err := Load([]byte("{\"type\": \"blahblahType\"}"))
+
+	assert.Nil(f, "filter should be nil")
+	assert.NotNil(err, "error should not be nil")
+	assert.Error(err, "unsupported type")
+}
diff --git a/builder/postaggregation/post_aggregator.go b/builder/postaggregation/post_aggregator.go
@@ -2,6 +2,7 @@ package postaggregation
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/grafadruid/go-druid/builder"
 )
@@ -56,6 +57,8 @@ func Load(data []byte) (builder.PostAggregator, error) {
 		p = NewLongGreatest()
 	case "longLeast":
 		p = NewLongLeast()
+	default:
+		return nil, errors.New("unsupported type")
 	}
 	return p, json.Unmarshal(data, &p)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
     *.dll
     *.so
     *.dylib
+    *.html
+    .vscode/*
     # Test binary, built with `go test -c`
     *.test
@@ Expand Down @@