APL-CORE: August 2021 Release of APL 1.7 compilant core engine (1.7.1)

For more details on this release refer to CHANGELOG.md To learn about APL see: https://developer.amazon.com/docs/alexa-presentation-language/understand-apl.html
alexa · Aug 17, 2021 · 3fee5eb · 3fee5eb
1 parent 82cce6f
commit 3fee5eb
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.7.1]
+
+### Changed
+
+- Bug fixes
+
 ## [1.7.0]
 
 This release adds support for version 1.7 of the APL specification.

diff --git a/aplcore/src/primitives/object.cpp b/aplcore/src/primitives/object.cpp
@@ -1410,7 +1410,7 @@ Object::serialize(rapidjson::Document::AllocatorType& allocator) const
         case kBoolType:
             return rapidjson::Value(static_cast<bool>(mU.value));
         case kNumberType:
-            return rapidjson::Value(mU.value);
+            return std::isfinite(mU.value) ? rapidjson::Value(mU.value) : rapidjson::Value();
         case kStringType:
             return rapidjson::Value(mU.string.c_str(), allocator);
         case kArrayType: {

diff --git a/unit/primitives/unittest_object.cpp b/unit/primitives/unittest_object.cpp
@@ -658,7 +658,7 @@ TEST(ObjectTest, WhenDimensionIsNotFiniteSerializeReturnsZero)
 
 class DocumentObjectTest : public CommandTest {};
 
-static const char * SEND_EVENT_NEW_NAN = R"apl({
+static const char * SEND_EVENT_DIMENSION_NAN = R"apl({
 	   "type": "APL",
 	   "version": "1.1",
 	   "resources": [
@@ -683,14 +683,55 @@ static const char * SEND_EVENT_NEW_NAN = R"apl({
 
 TEST_F(DocumentObjectTest, WithNewArguments)
 {
-    loadDocument(SEND_EVENT_NEW_NAN);
+    loadDocument(SEND_EVENT_DIMENSION_NAN);
 
     auto expectedObject = Object(0);
 
     performClick(1, 1);
     ASSERT_TRUE(root->hasEvent());
     auto event = root->popEvent();
 
+    ASSERT_EQ(kEventTypeSendEvent, event.getType());
+    auto args = event.getValue(kEventPropertyArguments);
+    ASSERT_TRUE(args.isArray());
+    ASSERT_EQ(args.size(), 1);
+    ASSERT_TRUE(IsEqual(expectedObject, args.at(0)));
+}
+
+
+static const char * SEND_EVENT_NUMBER_NAN = R"apl({
+	   "type": "APL",
+	   "version": "1.1",
+	   "resources": [
+	     {
+	       "number": {
+	         "value": "${100/0}"
+	       }
+	     }
+	   ],
+	   "mainTemplate": {
+	     "item": {
+	       "type": "TouchWrapper",
+	       "onPress": {
+	         "type": "SendEvent",
+	         "arguments": [
+	           "@value"
+	         ]
+	       }
+	     }
+	   }
+	 })apl";
+
+TEST_F(DocumentObjectTest, WhenNumberIsNotFiniteSerializeReturnsNull)
+{
+    loadDocument(SEND_EVENT_NUMBER_NAN);
+
+    auto expectedObject = Object();
+
+    performClick(1, 1);
+    ASSERT_TRUE(root->hasEvent());
+    auto event = root->popEvent();
+
     ASSERT_EQ(kEventTypeSendEvent, event.getType());
     auto args = event.getValue(kEventPropertyArguments);
     ASSERT_TRUE(args.isArray());