[ML][Common] Fix issues that came out after TCT tests

- tizen.ml.single and tizen.ml.prototype should be not writable
- TensorsInfo.addTensorsInfo should return newly added tensors info id
- ValidateBufferForTensorsData issue

[Verification] Tested in chromium console

Change-Id: I9ba7e074c79ffc7acb4de32a87a42db6c5f22beb
Signed-off-by: Rafal Walczyna <r.walczyna@samsung.com>

diff --git a/src/ml/js/ml_common.js b/src/ml/js/ml_common.js
index e38f097983e1a5c528af1b55e3a3386d92106260..6872b88a1cb372a84602ca801fbb5de628594b4d 100755 (executable)
--- a/src/ml/js/ml_common.js
+++ b/src/ml/js/ml_common.js
@@ -222,10 +222,7 @@ function ValidateBufferForTensorsData(tensorsData, index, buffer) {
     } else if (false == buffer instanceof ArrayType) {
         throw new WebAPIException(
             WebAPIException.TYPE_MISMATCH_ERR,
-            'buffer array has incompatible type, expected: ' +
-                ArrayType.name +
-                ', got: ' +
-                buffer.constructor.name
+            'buffer has incompatible type, expected: ' + ArrayType.name
         );
     }
     return ret;
@@ -412,6 +409,7 @@ TensorsInfo.prototype.addTensorInfo = function() {
             AbortError
         );
     }
+    return native_.getResultObject(result);
 };
 
 var TensorsInfoGettersSettersValidExceptions = [

diff --git a/src/ml/js/ml_manager.js b/src/ml/js/ml_manager.js
index 69d96a3fdd7f8fecb42c38bc76ae10aab2eb55f5..92167d2a9a09da379d41151fd316cc5018afe5c5 100755 (executable)
--- a/src/ml/js/ml_manager.js
+++ b/src/ml/js/ml_manager.js
@@ -14,11 +14,20 @@
  *    limitations under the License.
  */
 
-var MachineLearningManager = function() {};
-
-MachineLearningManager.prototype.single = new MachineLearningSingle();
-
-MachineLearningManager.prototype.pipeline = new MachineLearningPipeline();
+var MachineLearningManager = function() {
+    Object.defineProperties(this, {
+        single: {
+            enumerable: true,
+            writable: false,
+            value: new MachineLearningSingle()
+        },
+        pipeline: {
+            enumerable: true,
+            writable: false,
+            value: new MachineLearningPipeline()
+        }
+    });
+};
 
 var NNFWType = {
     ANY: 'ANY',

diff --git a/src/ml/ml_instance.cc b/src/ml/ml_instance.cc
index 98dd2851b5f0dc00881ab488d085e9abe0508b02..37e574c031a990712fee25854dff55b647b243e5 100644 (file)
--- a/src/ml/ml_instance.cc
+++ b/src/ml/ml_instance.cc
@@ -266,7 +266,10 @@ void MlInstance::MLTensorsInfoAddTensorInfo(const picojson::value& args, picojso
     return;
   }
 
-  ReportSuccess(out);
+  int count = tensorsInfo->Count() - 1;
+
+  picojson::value val = picojson::value{static_cast<double>(count)};
+  ReportSuccess(val, out);
 }
 
 void MlInstance::MLTensorsInfoGetDimensions(const picojson::value& args, picojson::object& out) {