Merge c387d5f into 0477ee9

src/core/attrsgenerator.cpp

@@ -41,12 +41,17 @@ AttrsGeneratorPtr AttrsGenerator::parse(const AttributesScope& attrsScope,
     int size = cmd.toInt(&sizeIsValid);
     if (sizeIsValid) { // cmd is just an interger
         _cmd = QString("*%1;min").arg(size);
+        cmds.push_back(cmd);
         cmds.push_back("min");
-    } else {
+    } else if (cmd.indexOf(";") != -1){
         cmds = cmd.split(";");
         QString sizeStr = cmds.first();
         size = sizeStr.remove(0,1).toInt(&sizeIsValid);
         _cmd = cmd;
+    } else { // if cmd isn't an integer or semicolon seperated, throw an error
+        error = "the command '" + cmd + "' is invalid!";
+        qWarning() << error;
+        return nullptr;
     }
 
     if (sizeIsValid) {

src/test/tst_attrsgenerator.cpp

@@ -34,6 +34,7 @@ private slots:
     void cleanupTestCase() {}
     void tst_parseStarCmd();
     void tst_parseHashCmd();
+    void tst_parseIntegerCmd();
 
 private:
     void _tst_attrs(const SetOfAttributes& res,
@@ -171,6 +172,23 @@ void TestAttrsGenerator::_tst_parseStarCmd(const QString& func, const Attributes
     }
 }
 
+void TestAttrsGenerator::tst_parseIntegerCmd()
+{
+    const int sizeOfAgen = 1;
+    const QStringList attrRgeStrs = {"int[0,16]"};
+    const QStringList names = {"test0"};
+
+    QString error;
+    QString _cmd = "8";
+    QString _exp_cmd = "*8;min";
+    const QString def_func = "min";
+
+    const AttributesScope attrsScope = _newAttrsScope(names, attrRgeStrs);
+    auto agen = AttrsGenerator::parse(attrsScope, _cmd, error);
+
+    QCOMPARE(agen->command(), _exp_cmd);
+}
+
 void TestAttrsGenerator::tst_parseStarCmd()
 {
     const QStringList names = {"test0", "test1", "test2"};