Merge remote-tracking branch 'origin/dev' into dev

internal/communicator/deviceclass/device_class.go

@@ -265,7 +265,7 @@ type yamlComponentsOID struct {
 
 // GetHierarchy returns the hierarchy of device classes merged with their corresponding code communicator.
 func GetHierarchy() (hierarchy.Hierarchy, error) {
-	genericDeviceClassDir := "device-classes"
+	genericDeviceClassDir := "deviceclass"
 	genericDeviceClassFile, err := config.FileSystem.Open(filepath.Join(genericDeviceClassDir, "generic.yaml"))
 	if err != nil {
 		return hierarchy.Hierarchy{}, errors.Wrap(err, "failed to open generic device class file")

internal/communicator/deviceclass/device_class_test.go

@@ -0,0 +1,11 @@
+package deviceclass
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestDeviceClass_GetHierarchy(t *testing.T) {
+	_, err := GetHierarchy()
+	assert.NoError(t, err, "hierarchy building failed")
+}

internal/mapping/mappings.go

@@ -27,7 +27,7 @@ func (m mapping) get(key string) (string, error) {
 }
 
 func readMapping(file string) (mapping, error) {
-	f, err := config.FileSystem.Open(filepath.Join("mappings", file))
+	f, err := config.FileSystem.Open(filepath.Join("mapping", file))
 	if err != nil {
 		return nil, errors.New("failed to open mappings file")
 	}

internal/mapping/mappings_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestMappings(t *testing.T) {
 	fileName := "ifType.yaml"
-	f, err := config.FileSystem.Open(filepath.Join("mappings", fileName))
+	f, err := config.FileSystem.Open(filepath.Join("mapping", fileName))
 	if !assert.NoError(t, err, "failed to open mappings file from virtual file system") {
 		return
 	}