diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..444078f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pro.user + diff --git a/CommandDetector.pro b/CommandDetector.pro index f3c3fe8..948a5a6 100644 --- a/CommandDetector.pro +++ b/CommandDetector.pro @@ -2,6 +2,8 @@ TEMPLATE = subdirs SUBDIRS += \ logic \ - test + test \ + ui test.depends += logic +ui.depends += logic diff --git a/CommandDetector.pro.user b/CommandDetector.pro.user index 230aa97..41c494c 100644 --- a/CommandDetector.pro.user +++ b/CommandDetector.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -65,9 +65,9 @@ Desktop Qt 5.13.1 GCC 64bit Desktop Qt 5.13.1 GCC 64bit qt.qt5.5131.gcc_64_kit - 1 + 0 0 - 0 + 1 /home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug @@ -315,9 +315,76 @@ false true - /home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Release/test + /home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug/test - 1 + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + ui + + Qt4ProjectManager.Qt4RunConfiguration:/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/CommandDetector/ui/ui.pro + -node 22 -f -g 33 + 3768 + false + true + false + false + false + true + false + + /home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug/ui + + 2 diff --git a/logic/include/CommandDecoder.h b/logic/include/CommandDecoder.h index 27aa47b..93ef30c 100644 --- a/logic/include/CommandDecoder.h +++ b/logic/include/CommandDecoder.h @@ -7,12 +7,21 @@ class CommandDecoder { private: - bool isStartWithDash(char* argv); + QList decodedList; + bool isNextItemValue = true; + int j = 0; + int _argc; + + bool isCommand(char* argv); + void checkIfEnoughArgsAreProvided(int argc); + QList CommandValueDecoder(char* argv[]); + void initCommandStrcut(char* argv, CommandsType& sample); + void checkIfNextItemShallBeValue(char* argv); public: CommandDecoder(); - QList decodeStrintg(int argc, char* argv[]); + QList decoderString(int argc, char* argv[]); }; #endif //COMMANDDECODER_H diff --git a/logic/include/CommandsType.h b/logic/include/CommandsType.h index 7545f6d..2e3ad5a 100644 --- a/logic/include/CommandsType.h +++ b/logic/include/CommandsType.h @@ -6,32 +6,43 @@ #include -struct CommandsType2 +struct CommandsType { char* command; char* value; - bool operator==(const CommandsType2& com) const + bool operator==(const CommandsType& rhs) const { - for(size_t i = 0; i < strlen(com.command); i++) + for(size_t i = 0; i < strlen(rhs.command); i++) { - if(com.command[i] != command[i]) + if(rhs.command[i] != command[i]) { return false; } } - for(size_t i = 0; i < strlen(com.value); i++) + if(value != Q_NULLPTR && rhs.value != Q_NULLPTR) { - if(com.value[i] != value[i]) + for(size_t i = 0; i < strlen(rhs.value); i++) { - return false; + if(rhs.value[i] != value[i]) + { + return false; + } } } + else if(value == Q_NULLPTR && rhs.value == Q_NULLPTR) + { + return true; + } + else + { + return false; + } return true; } }; -Q_DECLARE_METATYPE(CommandsType2); +Q_DECLARE_METATYPE(CommandsType); #endif //COMMANDSTYPE_H diff --git a/logic/src/CommandDecoder.cpp b/logic/src/CommandDecoder.cpp index 28c86a4..33ff758 100644 --- a/logic/src/CommandDecoder.cpp +++ b/logic/src/CommandDecoder.cpp @@ -1,55 +1,70 @@ #include "../include/CommandDecoder.h" -QList CommandDecoder::decodeStrintg(int argc, char* argv[]) +QList CommandDecoder::decoderString(int argc, char* argv[]) +{ + _argc = argc; + checkIfEnoughArgsAreProvided(_argc); + + return CommandValueDecoder(argv); +} + +//**************************************************************** +bool CommandDecoder::isCommand(char* argv) +{ + return ('-' == argv[0]); +} + +//**************************************************************** +void CommandDecoder::checkIfEnoughArgsAreProvided(int argc) { if(argc < 2) { - throw" the usage should lookLike this Sin "; + throw"the usage should lookLike this Sin "; } - else - { - QList test; - bool checkIsValue; - auto count = argc - 1; - uint8_t j = 1; - checkIsValue = false; +} - while(j <= count) +//**************************************************************** +QList CommandDecoder::CommandValueDecoder(char* argv[]) +{ + while(j < _argc) + { + CommandsType sample; + if(isCommand(argv[j])) + { + initCommandStrcut(argv[j], sample); + } + else { - auto sample1 = new CommandsType2(); - if(isStartWithDash(argv[j])) - { - sample1->command = argv[j]; - checkIsValue = true; - test.append(*sample1); - } - else - { - if(!checkIsValue) - { - throw" error hasValue "; - } - test.last().value = argv[j]; - checkIsValue = false; - } - - j++; + checkIfNextItemShallBeValue(argv[j]); } - return test; + j++; } + + return decodedList; } -bool CommandDecoder::isStartWithDash(char* argv) +//**************************************************************** +void CommandDecoder::checkIfNextItemShallBeValue(char* argv) { - if('-' == argv[0]) + if(!isNextItemValue) { - return true; + throw"duplicated Value and its wrong"; } + decodedList.last().value = argv; + isNextItemValue = false; +} - return false; +//**************************************************************** +void CommandDecoder::initCommandStrcut(char* argv, CommandsType& sample) +{ + sample.command = argv; + sample.value = Q_NULLPTR; + isNextItemValue = true; + decodedList.append(sample); } +//**************************************************************** CommandDecoder::CommandDecoder() { } diff --git a/test/include/CommandDecoderTest.h b/test/include/CommandDecoderTest.h index 07761da..d3b55b0 100644 --- a/test/include/CommandDecoderTest.h +++ b/test/include/CommandDecoderTest.h @@ -10,7 +10,8 @@ class CommandDecoderTest : public QObject Q_OBJECT private: - QList handiResult(); + QList create2CommandSample(); + QList createCorrectOrderOfCommand(); public: CommandDecoderTest(); @@ -19,7 +20,9 @@ public: //uncrustify off private slots: //uncrustify on - void testDecoder(); + void normalOrderTestCase(); + void twoCommandOrderTestCase(); + void morethanOneValueTestCase(); }; #endif //COMMANDDECODERTEST_H diff --git a/test/src/CommandDecoderTest.cpp b/test/src/CommandDecoderTest.cpp index 8220ce3..bf7c2e7 100644 --- a/test/src/CommandDecoderTest.cpp +++ b/test/src/CommandDecoderTest.cpp @@ -1,18 +1,44 @@ -#include "include/CommandDecoderTest.h" +#include "include/CommandDecoderTest.h" #include "CommandDecoder.h" -QList CommandDecoderTest::handiResult() +QList CommandDecoderTest::create2CommandSample() { - QList blist; - auto b1 = new CommandsType2(); - auto b2 = new CommandsType2(); - b1->command = "-node"; - b1->value = "3"; - blist.append(*b1); - b2->command = "-f"; - b2->value = "7"; - blist.append(*b2); + //-node 3 -g -f 11 -o filetext.txt + QList blist; + CommandsType b1; + CommandsType b2; + CommandsType b3; + CommandsType b4; + b1.command = "-node"; + b1.value = "3"; + blist.append(b1); + b2.command = "-g"; + b2.value = Q_NULLPTR; + blist.append(b2); + b3.command = "-f"; + b3.value = "11"; + blist.append(b3); + b4.command = "-o"; + b4.value = "filetext.txt"; + blist.append(b4); + + return blist; +} + +//**************************************************************** +QList CommandDecoderTest::createCorrectOrderOfCommand() +{ + //-node 3 -f 7 + QList blist; + CommandsType b1; + CommandsType b2; + b1.command = "-node"; + b1.value = "3"; + blist.append(b1); + b2.command = "-f"; + b2.value = "7"; + blist.append(b2); return blist; } @@ -28,27 +54,80 @@ CommandDecoderTest::~CommandDecoderTest() } //**************************************************************** -void CommandDecoderTest::testDecoder() +void CommandDecoderTest::normalOrderTestCase() { - CommandDecoder comTest; + CommandDecoder temp; - char* ptr_array[5]; - char array[5][20] = {{0}}; - strcpy(array[0], "order"); - strcpy(array[1], "-node"); - strcpy(array[2], "3"); - strcpy(array[3], "-f"); - strcpy(array[4], "7"); - for(int i = 0; i < 5; i++) + char* ptr_array[4]; + + char array[4][20] = {{0}}; + strcpy(array[0], "-node"); + strcpy(array[1], "3"); + strcpy(array[2], "-f"); + strcpy(array[3], "7"); + for(int i = 0; i < 4; i++) { ptr_array[i] = array[i]; } - QList c1 = comTest.decodeStrintg(5, ptr_array); - auto c2 = handiResult(); + QList c1 = temp.decoderString(4, ptr_array); + auto c2 = createCorrectOrderOfCommand(); - //QVERIFY(c1 == c2); + QCOMPARE(c1, c2); +} + +//**************************************************************** +void CommandDecoderTest::twoCommandOrderTestCase() +{ + //-node 3 -g -f 11 -o filetext.txt + CommandDecoder temp; + + char* ptr_array[7]; + + char array[7][20] = {{0}}; + strcpy(array[0], "-node"); + strcpy(array[1], "3"); + strcpy(array[2], "-g"); + strcpy(array[3], "-f"); + strcpy(array[4], "11"); + strcpy(array[5], "-o"); + strcpy(array[6], "filetext.txt"); + for(int i = 0; i < 7; i++) + { + ptr_array[i] = array[i]; + } + + QList c1 = temp.decoderString(7, ptr_array); + auto c2 = create2CommandSample(); QCOMPARE(c1, c2); - //QCOMPARE(c, c1); +} + +//**************************************************************** +void CommandDecoderTest::morethanOneValueTestCase() +{ + //-node 3 -g 15 16 -h 22 + CommandDecoder temp; + char* ptr_array[7]; + char array[7][20] = {{0}}; + strcpy(array[0], "-node"); + strcpy(array[1], "3"); + strcpy(array[2], "-g"); + strcpy(array[3], "15"); + strcpy(array[4], "11"); + strcpy(array[5], "-h"); + strcpy(array[6], "22"); + for(int i = 0; i < 7; i++) + { + ptr_array[i] = array[i]; + } + try + { + QList c1 = temp.decoderString(7, ptr_array); + QVERIFY(false); + } + catch(...) + { + QVERIFY(true); + } } diff --git a/test/src/main.cpp b/test/src/main.cpp index 6a67e88..fb76c34 100644 --- a/test/src/main.cpp +++ b/test/src/main.cpp @@ -4,7 +4,13 @@ int main() { - QTest::qExec(new CommandDecoderTest); + try { + QTest::qExec(new CommandDecoderTest); + } + catch(...) + { + qDebug() << "some error in test \n"; + } return 0; } diff --git a/ui/main.cpp b/ui/main.cpp new file mode 100644 index 0000000..ef51a9a --- /dev/null +++ b/ui/main.cpp @@ -0,0 +1,37 @@ +#include +#include +#include + +int main(int argc, char* argv[]) +{ + QCoreApplication a(argc, argv); + + try { + CommandDecoder dr; + char* arrayCopy[argc - 1]; + + //delete 1 (index 0) + for(int i = 0; i < argc; ++i) + { + arrayCopy[i] = argv[i + 1]; //copy next element left + } + + auto result = dr.decoderString(argc - 1, arrayCopy); + + for(int i = 0; i < result.length(); i++) + { + qDebug() << "command: " << result[i].command << " --- Value: " << result[i].value << + endl; + } + } + catch(char* excp) + { + qDebug() << "Caught some error in ui " << excp; + } + catch(...) + { + qDebug() << "some error in ui \n"; + } + + return a.exec(); +} diff --git a/ui/ui.pro b/ui/ui.pro new file mode 100644 index 0000000..107b6c4 --- /dev/null +++ b/ui/ui.pro @@ -0,0 +1,31 @@ +QT -= gui + +CONFIG += c++11 console +CONFIG -= app_bundle + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target + + +unix:!macx: LIBS += -L$$OUT_PWD/../logic/ -llogic + +INCLUDEPATH += $$PWD/../logic/include +DEPENDPATH += $$PWD/../logic/include + +unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../logic/liblogic.a