Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Minor

Rich Turnere797039b603e
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeType.java b/model/src/main/java/org/openremote/model/attribute/AttributeType.java
index 1acf8b222..879f66a6d 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeType.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeType.java
@@ -76,7 +76,7 @@ public enum AttributeType implements AttributeDescriptor {
null)),
TAGS(
- "tags", AttributeValueType.ARRAY,
+ "assetTags", AttributeValueType.ARRAY,
LABEL.withInitialValue(Values.create("Asset Tags")),
DESCRIPTION.withInitialValue(Values.create("List of tags associated with an asset"))
);
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index c4502bc54..6928844f6 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -81,7 +81,7 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
def attributeTypeDescriptors = assetModelResource.getAttributeDescriptors(null)
then: "the default types should be present"
- attributeTypeDescriptors.size() == 12
+ attributeTypeDescriptors.size() == 13
attributeTypeDescriptors.any {it.attributeName == "consoleName"}
attributeTypeDescriptors.any {it.attributeName == "consoleVersion"}
attributeTypeDescriptors.any {it.attributeName == "consolePlatform"}
@@ -93,7 +93,8 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
attributeTypeDescriptors.any {it.attributeName == "street"}
attributeTypeDescriptors.any {it.attributeName == "location"}
attributeTypeDescriptors.any {it.attributeName == "surfaceArea"}
- attributeTypeDescriptors.any {it.attributeName == "status"}
+ attributeTypeDescriptors.any {it.attributeName == "assetStatus"}
+ attributeTypeDescriptors.any {it.attributeName == "assetTags"}
when: "a request for Attribute value types is made"