test: improve coverage for config/... (#132)

* improve coverage for config/...

* addressing after code review

Author: pawels-optimizely

optimizely/config/datafileprojectconfig/config_test.go

@@ -22,9 +22,28 @@ import (
 	"testing"
 
 	"github.com/optimizely/go-sdk/optimizely/entities"
+
 	"github.com/stretchr/testify/assert"
 )
 
+func TestNewDatafileProjectConfigNil(t *testing.T) {
+	projectConfig, err := NewDatafileProjectConfig(nil)
+	assert.NotNil(t, err)
+	assert.Nil(t, projectConfig)
+}
+
+func TestNewDatafileProjectConfigNotNil(t *testing.T) {
+	dpc := DatafileProjectConfig{accountID: "123", revision: "1", projectID: "12345"}
+	jsonDatafileStr := `{"accountID": "123", "revision": "1", "projectId": "12345"}`
+	jsonDatafile := []byte(jsonDatafileStr)
+	projectConfig, err := NewDatafileProjectConfig(jsonDatafile)
+	assert.Nil(t, err)
+	assert.NotNil(t, projectConfig)
+	assert.Equal(t, dpc.accountID, projectConfig.accountID)
+	assert.Equal(t, dpc.revision, projectConfig.revision)
+	assert.Equal(t, dpc.projectID, projectConfig.projectID)
+}
+
 func TestGetProjectID(t *testing.T) {
 	projectID := "projectID"
 	config := &DatafileProjectConfig{

optimizely/config/datafileprojectconfig/mappers/attribute_test.go

@@ -0,0 +1,51 @@
+/****************************************************************************
+ * Copyright 2019, Optimizely, Inc. and contributors                        *
+ *                                                                          *
+ * Licensed under the Apache License, Version 2.0 (the "License");          *
+ * you may not use this file except in compliance with the License.         *
+ * You may obtain a copy of the License at                                  *
+ *                                                                          *
+ *    http://www.apache.org/licenses/LICENSE-2.0                            *
+ *                                                                          *
+ * Unless required by applicable law or agreed to in writing, software      *
+ * distributed under the License is distributed on an "AS IS" BASIS,        *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
+ * See the License for the specific language governing permissions and      *
+ * limitations under the License.                                           *
+ ***************************************************************************/
+
+package mappers
+
+import (
+	"testing"
+
+	datafileEntities "github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/optimizely/entities"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMapAttributesWithEmptyList(t *testing.T) {
+
+	attributeMap, attributeKeyToIDMap := MapAttributes(nil)
+
+	expectedAttributeMap := map[string]entities.Attribute{}
+	expectedAttributeKeyToIDMap := map[string]string{}
+
+	assert.Equal(t, attributeMap, expectedAttributeMap)
+	assert.Equal(t, attributeKeyToIDMap, expectedAttributeKeyToIDMap)
+}
+func TestMapAttributes(t *testing.T) {
+
+	attrList := []datafileEntities.Attribute{{ID: "1", Key: "one"}, {ID: "2", Key: "two"},
+		{ID: "3", Key: "three"}, {ID: "2", Key: "four"}, {ID: "5", Key: "one"}}
+
+	attributeMap, attributeKeyToIDMap := MapAttributes(attrList)
+
+	expectedAttributeMap := map[string]entities.Attribute{"1": {"1", "one"},
+		"2": {"2", "two"}, "3": {"3", "three"}, "5": {"5", "one"}}
+	expectedAttributeKeyToIDMap := map[string]string{"one": "5", "three": "3", "two": "2"}
+
+	assert.Equal(t, attributeMap, expectedAttributeMap)
+	assert.Equal(t, attributeKeyToIDMap, expectedAttributeKeyToIDMap)
+}

optimizely/config/datafileprojectconfig/mappers/audience_test.go

@@ -14,4 +14,36 @@
  * limitations under the License.                                           *
  ***************************************************************************/
 
+// Package mappers //
 package mappers
+
+import (
+	"testing"
+
+	datafileEntities "github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/optimizely/entities"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMapAudiencesEmptyList(t *testing.T) {
+
+	audienceMap := MapAudiences(nil)
+
+	expectedAudienceMap := map[string]entities.Audience{}
+
+	assert.Equal(t, audienceMap, expectedAudienceMap)
+
+}
+func TestMapAudiences(t *testing.T) {
+
+	audienceList := []datafileEntities.Audience{{ID: "1", Name: "one"}, {ID: "2", Name: "two"},
+		{ID: "3", Name: "three"}, {ID: "2", Name: "four"}, {ID: "5", Name: "one"}}
+
+	audienceMap := MapAudiences(audienceList)
+
+	expectedAudienceMap := map[string]entities.Audience{"1": {ID: "1", Name: "one"}, "2": {ID: "2", Name: "two"},
+		"3": {ID: "3", Name: "three"}, "5": {ID: "5", Name: "one"}}
+
+	assert.Equal(t, audienceMap, expectedAudienceMap)
+}

optimizely/config/datafileprojectconfig/mappers/condition_trees_test.go

@@ -24,6 +24,16 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestBuildAudienceConditionTreeEmpty(t *testing.T) {
+	conditionString := ""
+	var conditions interface{}
+	json.Unmarshal([]byte(conditionString), &conditions)
+	conditionTree, err := buildAudienceConditionTree(conditions)
+
+	assert.NotNil(t, err)
+	assert.Equal(t, (*entities.TreeNode)(nil), conditionTree)
+}
+
 func TestBuildAudienceConditionTreeSimpleAudienceCondition(t *testing.T) {
 	conditionString := "[ \"and\", [ \"or\", [ \"or\",  \"12\", \"123\", \"1234\"] ] ]"
 	var conditions interface{}

optimizely/config/polling_manager_test.go

@@ -18,6 +18,7 @@ package config
 
 import (
 	"testing"
+	"time"
 
 	"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig"
 	"github.com/optimizely/go-sdk/optimizely/notification"
@@ -55,6 +56,7 @@ func TestNewPollingProjectConfigManagerWithOptions(t *testing.T) {
 	assert.Nil(t, err)
 	assert.NotNil(t, actual)
 	assert.Equal(t, projectConfig, actual)
+	exeCtx.TerminateAndWait() // just sending signal and improving coverage
 }
 
 func TestNewPollingProjectConfigManagerWithNull(t *testing.T) {
@@ -155,4 +157,38 @@ func TestNewPollingProjectConfigManagerOnDecision(t *testing.T) {
 
 	err = configManager.RemoveOnProjectConfigUpdate(id)
 	assert.Nil(t, err)
+
+	err = configManager.RemoveOnProjectConfigUpdate(id)
+	assert.Nil(t, err)
+}
+
+func TestDefaultRequester(t *testing.T) {
+
+	sdkKey := "test_sdk_key"
+	DefaultRequester(sdkKey)
+	exeCtx := utils.NewCancelableExecutionCtx()
+	configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, DefaultRequester(sdkKey))
+	requester := configManager.requester
+	assert.NotNil(t, requester)
+	assert.Equal(t, requester.String(), "{url: https://cdn.optimizely.com/datafiles/test_sdk_key.json, timeout: 5s, retries: 1}")
+}
+
+func TestPollingInterval(t *testing.T) {
+
+	sdkKey := "test_sdk_key"
+	DefaultRequester(sdkKey)
+	exeCtx := utils.NewCancelableExecutionCtx()
+	configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, PollingInterval(5*time.Second))
+
+	assert.Equal(t, configManager.pollingInterval, 5*time.Second)
+}
+
+func TestInitialDatafile(t *testing.T) {
+
+	sdkKey := "test_sdk_key"
+	DefaultRequester(sdkKey)
+	exeCtx := utils.NewCancelableExecutionCtx()
+	configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, InitialDatafile([]byte("test")))
+
+	assert.Equal(t, configManager.initDatafile, []byte("test"))
 }

optimizely/config/static_manager.go

@@ -18,16 +18,14 @@
 package config
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
-	"io"
-	"net/http"
 	"sync"
 
 	"github.com/optimizely/go-sdk/optimizely"
 	"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig"
 	"github.com/optimizely/go-sdk/optimizely/notification"
+	"github.com/optimizely/go-sdk/optimizely/utils"
 )
 
 // StaticProjectConfigManager maintains a static copy of the project config
@@ -38,30 +36,14 @@ type StaticProjectConfigManager struct {
 
 // NewStaticProjectConfigManagerFromURL returns new instance of StaticProjectConfigManager for URL
 func NewStaticProjectConfigManagerFromURL(sdkKey string) (*StaticProjectConfigManager, error) {
-	downloadFile := func() ([]byte, error) {
-		response, err := http.Get(fmt.Sprintf(DatafileURLTemplate, sdkKey))
-		if err != nil {
-			return nil, err
-		}
-		defer response.Body.Close()
-		if response.StatusCode != http.StatusOK {
-			return nil, errors.New(response.Status)
-		}
-		var data bytes.Buffer
-		_, err = io.Copy(&data, response.Body)
-		if err != nil {
-			return nil, err
-		}
-		return data.Bytes(), nil
-	}
-
-	body, err := downloadFile()
 
-	if err != nil {
-		return nil, err
+	requester := utils.NewHTTPRequester(fmt.Sprintf(DatafileURLTemplate, sdkKey))
+	datafile, code, e := requester.Get()
+	if e != nil {
+		cmLogger.Error(fmt.Sprintf("request returned with http code=%d", code), e)
 	}
 
-	return NewStaticProjectConfigManagerFromPayload(body)
+	return NewStaticProjectConfigManagerFromPayload(datafile)
 }
 
 // NewStaticProjectConfigManagerFromPayload returns new instance of StaticProjectConfigManager for payload

optimizely/config/static_manager_test.go

@@ -17,6 +17,8 @@
 package config
 
 import (
+	"errors"
+	"github.com/optimizely/go-sdk/optimizely/notification"
 	"testing"
 
 	"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig"
@@ -30,3 +32,44 @@ func TestNewStaticProjectConfigManager(t *testing.T) {
 	actual, _ := configManager.GetConfig()
 	assert.Equal(t, projectConfig, actual)
 }
+
+func TestNewStaticProjectConfigManagerFromPayload(t *testing.T) {
+
+	mockDatafile := []byte(`{"accountId":"42","projectId":"123""}`)
+	configManager, err := NewStaticProjectConfigManagerFromPayload(mockDatafile)
+	assert.NotNil(t, err)
+
+	mockDatafile = []byte(`{"accountId":"42","projectId":"123"}`)
+	configManager, err = NewStaticProjectConfigManagerFromPayload(mockDatafile)
+	assert.Nil(t, err)
+
+	actual, _ := configManager.GetConfig()
+	assert.NotNil(t, actual)
+}
+
+func TestNewStaticProjectConfigManagerFromURL(t *testing.T) {
+
+	configManager, err := NewStaticProjectConfigManagerFromURL("no_key_exists")
+	assert.NotNil(t, err)
+	assert.Nil(t, configManager)
+}
+
+func TestNewStaticProjectConfigManagerOnDecision(t *testing.T) {
+	mockDatafile := []byte(`{"accountId":"42","projectId":"123"}`)
+	configManager, err := NewStaticProjectConfigManagerFromPayload(mockDatafile)
+	assert.Nil(t, err)
+
+	callback := func(notification notification.ProjectConfigUpdateNotification) {
+
+	}
+	id, err := configManager.OnProjectConfigUpdate(callback)
+
+	assert.NotNil(t, err)
+	assert.Equal(t, err, errors.New("method OnProjectConfigUpdate does not have any effect on StaticProjectConfigManager"))
+	assert.Equal(t, id, 0)
+
+	err = configManager.RemoveOnProjectConfigUpdate(id)
+	assert.NotNil(t, err)
+	assert.Equal(t, err, errors.New("method RemoveOnProjectConfigUpdate does not have any effect on StaticProjectConfigManager"))
+
+}

optimizely/utils/requester.go

@@ -43,6 +43,8 @@ type Requester interface {
 
 	Post(body interface{}, headers ...Header) (response []byte, code int, err error)
 	PostObj(body interface{}, result interface{}, headers ...Header) error
+
+	String() string
 }
 
 // Header element to be sent