[RFC 0/5] Add few conformance test cases to phonesim

[RFC 0/5] Add few conformance test cases to phonesim

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

Hi,

 Following set of patches adds Display Text, Get Inkey, Get Input and 
MoreTime conformance test cases as specificed in ETSI TS 102 384 to
phonesim. Logging of the result in a file can be done but it is not
part of this patch.

Regards,
Jeevaka

badrjee (5):
  phonesim: Add conformance test to main menu
  phonesim: Add DisplayText conformance test cases
  phonesim: Add GetInkey conformance test cases
  phonesim: Add GetInput conformance test cases
  phonesim: Add MoreTime conformance test case

 src/simapplication.cpp | 1734 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/simapplication.h   |   21 +
 2 files changed, 1755 insertions(+), 0 deletions(-)

[RFC 1/5] phonesim: Add conformance test to main menu

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]

From: badrjee <badrjee@badrjee-laptop.(none)>

---
 src/simapplication.cpp |   50 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/simapplication.h   |    2 +
 2 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/src/simapplication.cpp b/src/simapplication.cpp
index 14fa8c0..47b33b0 100644
--- a/src/simapplication.cpp
+++ b/src/simapplication.cpp
@@ -291,6 +291,7 @@ const QString DemoSimApplication::getName()
 #define MainMenu_Timers     16
 #define MainMenu_Refresh    17
 #define MainMenu_LocalInfo  18
+#define MainMenu_Conformance 19
 
 #define SportsMenu_Chess        1
 #define SportsMenu_Painting     2
@@ -349,6 +350,8 @@ const QString DemoSimApplication::getName()
 #define LocalInfoMenu_Time  1
 #define LocalInfoMenu_Lang  2
 
+#define ConformanceMenu_Main        20
+
 enum SendSMSMenuItems {
 	SendSMS_Unpacked = 1,
 	SendSMS_Packed,
@@ -448,6 +451,10 @@ void DemoSimApplication::mainMenu()
     item.setLabel( "Provide Local Information" );
     items += item;
 
+    item.setIdentifier( MainMenu_Conformance );
+    item.setLabel( "Conformance Test Cases" );
+    items += item;
+
     cmd.setMenuItems( items );
 
     command( cmd, 0, 0 );
@@ -590,6 +597,12 @@ void DemoSimApplication::mainMenuSelection( int id )
         }
         break;
 
+        case MainMenu_Conformance:
+        {
+            sendConformanceMenu();
+        }
+        break;
+
         default:
         {
             // Don't know what this item is, so just re-display the main menu.
@@ -2351,3 +2364,40 @@ void DemoSimApplication::localInfoMenu( const QSimTerminalResponse& resp )
         endSession();
     }
 }
+
+void DemoSimApplication::sendConformanceMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Conformance Test Cases" );
+
+    item.setIdentifier( ConformanceMenu_Main );
+    item.setLabel( "Return to main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(ConformanceMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::ConformanceMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        default:
+            endSession();
+        break;
+    }
+}
diff --git a/src/simapplication.h b/src/simapplication.h
index cd93f7e..ab6a134 100644
--- a/src/simapplication.h
+++ b/src/simapplication.h
@@ -130,6 +130,8 @@ protected slots:
     void refreshMenuResp( const QSimTerminalResponse& resp );
     void sendLocalInfoMenu();
     void localInfoMenu( const QSimTerminalResponse& resp );
+    void sendConformanceMenu();
+    void ConformanceMenu( const QSimTerminalResponse& resp );
 
 private:
     int sticksLeft;
-- 
1.7.0.4

[RFC 2/5] phonesim: Add DisplayText conformance test cases

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 18753 bytes --]

From: badrjee <badrjee@badrjee-laptop.(none)>

---
 src/simapplication.cpp |  524 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/simapplication.h   |    6 +
 2 files changed, 530 insertions(+), 0 deletions(-)

diff --git a/src/simapplication.cpp b/src/simapplication.cpp
index 47b33b0..8e71127 100644
--- a/src/simapplication.cpp
+++ b/src/simapplication.cpp
@@ -350,8 +350,42 @@ const QString DemoSimApplication::getName()
 #define LocalInfoMenu_Time  1
 #define LocalInfoMenu_Lang  2
 
+#define ConformanceMenu_DisplayText 1
 #define ConformanceMenu_Main        20
 
+#define NormalMenu_1_1    1
+#define NormalMenu_1_2    2
+#define NormalMenu_1_3    3
+#define NormalMenu_1_4    4
+#define NormalMenu_1_5    5
+#define NormalMenu_1_6    6
+#define NormalMenu_1_7    7
+#define NormalMenu_1_8    8
+#define NormalMenu_1_9    9
+#define NormalMenu_1_10   10
+#define NormalMenu_1_11   11
+#define NormalMenu_Main   12
+
+#define IconMenu_1A     1
+#define IconMenu_2A     2
+#define IconMenu_3A     3
+#define IconMenu_4A     4
+#define IconMenu_5A     5
+#define IconMenu_6A     6
+#define IconMenu_Main   7
+
+#define Display_Text_Normal              1
+#define Display_Text_No_Response         2
+#define Display_Text_Extension_Text      3
+#define Display_Text_Sustained_Text_1    4
+#define Display_Text_Sustained_Text_2    5
+#define Display_Text_Sustained_Text_3    6
+#define Display_Text_Icon                7
+#define Display_Text_UCS2_Cyrillic       8
+#define Display_Text_Variable_Time_Out   9
+#define Display_Text_Attribute          10
+#define Display_Text_Main               11
+
 enum SendSMSMenuItems {
 	SendSMS_Unpacked = 1,
 	SendSMS_Packed,
@@ -2374,6 +2408,10 @@ void DemoSimApplication::sendConformanceMenu()
     cmd.setType( QSimCommand::SelectItem );
     cmd.setTitle( "Conformance Test Cases" );
 
+    item.setIdentifier( ConformanceMenu_DisplayText );
+    item.setLabel( "Display Text" );
+    items += item;
+
     item.setIdentifier( ConformanceMenu_Main );
     item.setLabel( "Return to main menu" );
     items += item;
@@ -2396,6 +2434,492 @@ void DemoSimApplication::ConformanceMenu( const QSimTerminalResponse& resp )
 
     /* Item selected. */
     switch ( resp.menuItem() ) {
+        case ConformanceMenu_DisplayText:
+        {
+            sendDisplayTextMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::sendDisplayTextMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Display Text" );
+
+    item.setIdentifier( Display_Text_Normal );
+    item.setLabel( "Normal" );
+    items += item;
+
+    item.setIdentifier( Display_Text_No_Response );
+    item.setLabel( "Support of No response from user" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Extension_Text );
+    item.setLabel( "Display of the extension text" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Sustained_Text_1 );
+    item.setLabel( "Sustained text, unpacked 8-bit data" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Sustained_Text_2 );
+    item.setLabel( "Sustained text, clear message after delay" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Sustained_Text_3 );
+    item.setLabel( "Sustained text, wait for user MMI to clear" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Icon );
+    item.setLabel( "Display of icon" );
+    items += item;
+
+    item.setIdentifier( Display_Text_UCS2_Cyrillic );
+    item.setLabel( "UCS2 display supported in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Variable_Time_Out );
+    item.setLabel( "Variable Time out" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Attribute );
+    item.setLabel( "Support of Text Attribute" );
+    items += item;
+
+    item.setIdentifier( Display_Text_Main );
+    item.setLabel( "Return to main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(DisplayTextMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendDisplayTextNormalMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Display Text (Normal)" );
+
+    item.setIdentifier( NormalMenu_1_1 );
+    item.setLabel( "normal priority, Unpacked 8 bit data,successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_2 );
+    item.setLabel( "Unpacked 8 bit data,screen busy" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_3 );
+    item.setLabel( "high priority, Unpacked 8 bit data,successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_4 );
+    item.setLabel( "Packed, SMS default alphabet,successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_5 );
+    item.setLabel( "Clear message after delay,successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_6 );
+    item.setLabel( "Text string with 160 bytes,successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_7 );
+    item.setLabel( "Backward move, successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_8 );
+    item.setLabel( "session terminated by user" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_9 );
+    item.setLabel( "Null text string, successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_10 );
+    item.setLabel( "Empty text string, successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_Main );
+    item.setLabel( "Return to Display Text main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(DisplayTextNormalMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendDisplayTextIconMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Display Text (Icon support)" );
+
+    item.setIdentifier( IconMenu_1A );
+    item.setLabel( "basic icon, self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_2A );
+    item.setLabel( "display of colour icon, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_3A );
+    item.setLabel( "basic icon, not self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_4A );
+    item.setLabel( "basic icon, empty text string, unsuccessful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_Main );
+    item.setLabel( "Return to Display Text main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(DisplayTextIconMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::DisplayTextMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case Display_Text_Normal:
+        {
+            sendDisplayTextNormalMenu();
+        }
+        break;
+
+        case Display_Text_No_Response:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "<TIME-OUT>" );
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Extension_Text:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "This command instructs the ME to display a"
+                    " text message and/or an icon (see 6.5.4). "
+                    "It allows the SIM to define the priority"
+                    " of that message, and the text string format."
+                    " Two types of priority are defined:- display "
+                    " normal priority text and/");
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Sustained_Text_1:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Toolkit Test 1" );
+            cmd.setImmediateResponse( true );
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Sustained_Text_2:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( true );
+            cmd.setText( "Toolkit Test 2" );
+            cmd.setImmediateResponse( true );
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Sustained_Text_3:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Toolkit Test 3" );
+            cmd.setImmediateResponse( true );
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Icon:
+        {
+            sendDisplayTextIconMenu();
+        }
+        break;
+
+        case Display_Text_UCS2_Cyrillic:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            QTextCodec *codec = QTextCodec::codecForName( "utf8" );
+            cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+            command( cmd, this, SLOT(sendDisplayTextMenu()),
+                    QSimCommand::UCS2Strings );
+        }
+        break;
+
+        case Display_Text_Variable_Time_Out:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "10 Second" );
+            cmd.setDuration( 10000 );
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Attribute:
+        {
+            QByteArray ba;
+            ba.resize( 4 );
+            ba[0] = 0x00;
+            ba[1] = 0x10;
+            ba[2] = 0x00;
+            ba[3] = 0xB4;
+
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Text Attribute 1" );
+            cmd.setTextAttribute( ba );
+            command( cmd, this, SLOT(sendDisplayTextMenu()) );
+        }
+        break;
+
+        case Display_Text_Main:
+        {
+            sendConformanceMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::DisplayTextNormalMenu(
+                    const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case NormalMenu_1_1:
+        case NormalMenu_1_2:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Toolkit Test 1" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_3:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setHighPriority( true );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Toolkit Test 2" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_4:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Toolkit Test 3" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()),
+                    QSimCommand::PackedStrings );
+        }
+        break;
+
+        case NormalMenu_1_5:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( true );
+            cmd.setText( "Toolkit Test 4" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_6:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "This command instructs the ME to display a"
+                    " text message. It allows the SIM to define"
+                    " the priority of that message, and the text"
+                    " string format. Two types of prio" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_7:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "<GO-BACKWARDS>" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_8:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "<ABORT>" );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_9:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText("");
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_10:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( QString() );
+            command( cmd, this, SLOT(sendDisplayTextNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_Main:
+        {
+            sendDisplayTextMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::DisplayTextIconMenu(
+                    const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case IconMenu_1A:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Basic Icon" );
+            cmd.setIconId( 1 );
+            cmd.setIconSelfExplanatory( true );
+            command( cmd, this, SLOT(sendDisplayTextIconMenu()) );
+        }
+        break;
+
+        case IconMenu_2A:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Colour Icon" );
+            cmd.setIconId( 2 );
+            cmd.setIconSelfExplanatory( true );
+            command( cmd, this, SLOT(sendDisplayTextIconMenu()) );
+        }
+        break;
+
+        case IconMenu_3A:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Basic Icon" );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendDisplayTextIconMenu()) );
+        }
+        break;
+
+        case IconMenu_4A:
+        {
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( QString() );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendDisplayTextIconMenu()) );
+        }
+        break;
+
+        case IconMenu_Main:
+        {
+            sendDisplayTextMenu();
+        }
+        break;
+
         default:
             endSession();
         break;
diff --git a/src/simapplication.h b/src/simapplication.h
index ab6a134..ce7dfe3 100644
--- a/src/simapplication.h
+++ b/src/simapplication.h
@@ -132,6 +132,12 @@ protected slots:
     void localInfoMenu( const QSimTerminalResponse& resp );
     void sendConformanceMenu();
     void ConformanceMenu( const QSimTerminalResponse& resp );
+    void sendDisplayTextMenu();
+    void DisplayTextMenu( const QSimTerminalResponse& resp );
+    void DisplayTextNormalMenu( const QSimTerminalResponse& resp );
+    void sendDisplayTextNormalMenu();
+    void sendDisplayTextIconMenu();
+    void DisplayTextIconMenu( const QSimTerminalResponse& resp );
 
 private:
     int sticksLeft;
-- 
1.7.0.4

[RFC 3/5] phonesim: Add GetInkey conformance test cases

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 18343 bytes --]

From: badrjee <badrjee@badrjee-laptop.(none)>

---
 src/simapplication.cpp |  505 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/simapplication.h   |    7 +
 2 files changed, 512 insertions(+), 0 deletions(-)

diff --git a/src/simapplication.cpp b/src/simapplication.cpp
index 8e71127..3f90203 100644
--- a/src/simapplication.cpp
+++ b/src/simapplication.cpp
@@ -351,6 +351,7 @@ const QString DemoSimApplication::getName()
 #define LocalInfoMenu_Lang  2
 
 #define ConformanceMenu_DisplayText 1
+#define ConformanceMenu_GetInkey    2
 #define ConformanceMenu_Main        20
 
 #define NormalMenu_1_1    1
@@ -386,6 +387,18 @@ const QString DemoSimApplication::getName()
 #define Display_Text_Attribute          10
 #define Display_Text_Main               11
 
+#define GetInkeyMenu_Normal              1
+#define GetInkeyMenu_No_Response         2
+#define GetInkeyMenu_Cyrillic_Display_1  3
+#define GetInkeyMenu_Cyrillic_Display_2  4
+#define GetInkeyMenu_Cyrillic_Entry      5
+#define GetInkeyMenu_YesNo_Response      6
+#define GetInkeyMenu_Icon                7
+#define GetInkeyMenu_Help                8
+#define GetInkeyMenu_Variable_Timeout    9
+#define GetInkeyMenu_Text_Attribute     10
+#define GetInkeyMenu_Main               11
+
 enum SendSMSMenuItems {
 	SendSMS_Unpacked = 1,
 	SendSMS_Packed,
@@ -2412,6 +2425,10 @@ void DemoSimApplication::sendConformanceMenu()
     item.setLabel( "Display Text" );
     items += item;
 
+    item.setIdentifier( ConformanceMenu_GetInkey );
+    item.setLabel( "Get Inkey" );
+    items += item;
+
     item.setIdentifier( ConformanceMenu_Main );
     item.setLabel( "Return to main menu" );
     items += item;
@@ -2440,6 +2457,12 @@ void DemoSimApplication::ConformanceMenu( const QSimTerminalResponse& resp )
         }
         break;
 
+        case ConformanceMenu_GetInkey:
+        {
+            sendGetInkeyMenu();
+        }
+        break;
+
         default:
             endSession();
         break;
@@ -2925,3 +2948,485 @@ void DemoSimApplication::DisplayTextIconMenu(
         break;
     }
 }
+
+void DemoSimApplication::sendGetInkeyMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Get Inkey" );
+
+    item.setIdentifier( GetInkeyMenu_Normal );
+    item.setLabel( "Normal" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_No_Response );
+    item.setLabel( "No response from user" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Cyrillic_Display_1 );
+    item.setLabel( "UCS2 display in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Cyrillic_Display_2 );
+    item.setLabel( "max. length UCS2 display in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Cyrillic_Entry );
+    item.setLabel( "UCS2 entry in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_YesNo_Response );
+    item.setLabel( "Yes/No response for the input" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Icon );
+    item.setLabel( "Display of icon" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Help );
+    item.setLabel( "Help Information" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Variable_Timeout );
+    item.setLabel( "Variable Time out" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Text_Attribute );
+    item.setLabel( "Support of Text Attribute" );
+    items += item;
+
+    item.setIdentifier( GetInkeyMenu_Main );
+    item.setLabel( "Return to main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(GetInkeyMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendGetInkeyNormalMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Get Inkey (Normal)" );
+
+    item.setIdentifier( NormalMenu_1_1 );
+    item.setLabel( "Digits only for character set, unpacked 8-bit" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_2 );
+    item.setLabel( "Digits only for character set, packed text string" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_3 );
+    item.setLabel( "Backward move" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_4 );
+    item.setLabel( "Abort" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_5 );
+    item.setLabel( "SMS default alphabet for character set, unpacked 8-bit" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_6 );
+    item.setLabel( "Max length for the Text String, successful" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_Main );
+    item.setLabel( "Return to Get Inkey main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(GetInkeyNormalMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendGetInkeyIconMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Get Inkey (Icon support)" );
+
+    item.setIdentifier( IconMenu_1A );
+    item.setLabel( "basic icon, self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_2A );
+    item.setLabel( "display of colour icon, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_3A );
+    item.setLabel( "basic icon, not self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_4A );
+    item.setLabel( "Colour icon, non self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_5A );
+    item.setLabel( "basic icon, null text string, unsuccessful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_6A );
+    item.setLabel( "basic icon, empty text string, unsuccessful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_Main );
+    item.setLabel( "Return to Get Inkey main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(GetInkeyIconMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendHelpInfo( const QSimTerminalResponse& resp )
+{
+    if ( resp.result() == QSimTerminalResponse::HelpInformationRequested ) {
+            QSimCommand cmd;
+
+            cmd.setType( QSimCommand::DisplayText );
+            cmd.setDestinationDevice( QSimCommand::Display );
+            cmd.setClearAfterDelay( false );
+            cmd.setText( "Help information" );
+            command( cmd, this, SLOT(GetInkeyMenu(QSimTerminalResponse)) );
+    } else
+            endSession();
+}
+
+void DemoSimApplication::GetInkeyMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.command().type() == QSimCommand::DisplayText &&
+                resp.result() == QSimTerminalResponse::Success ) {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setHasHelp( true );
+            cmd.setText( "Enter \"+\"" );
+            command( cmd, this, SLOT(sendGetInkeyMenu()) );
+            return;
+    }
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case GetInkeyMenu_Normal:
+        {
+            sendGetInkeyNormalMenu();
+        }
+        break;
+
+        case GetInkeyMenu_No_Response:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<TIME-OUT>" );
+            command( cmd, this, SLOT(sendGetInkeyMenu()) );
+        }
+        break;
+
+        case GetInkeyMenu_Cyrillic_Display_1:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            QTextCodec *codec = QTextCodec::codecForName( "utf8" );
+            cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+            command( cmd, this, SLOT(sendGetInkeyMenu()),
+                    QSimCommand::UCS2Strings );
+        }
+        break;
+
+        case GetInkeyMenu_Cyrillic_Display_2:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            QTextCodec *codec = QTextCodec::codecForName( "utf8" );
+            cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
+                                "ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
+                                "ЗДРАВСТВУЙТЕЗДРАВСТВУЙ" ) );
+            command( cmd, this, SLOT(sendGetInkeyMenu()),
+                    QSimCommand::UCS2Strings );
+        }
+        break;
+
+        case GetInkeyMenu_Cyrillic_Entry:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits( false );
+            cmd.setUcs2Input( true );
+            cmd.setText( "Enter" );
+            command( cmd, this, SLOT(sendGetInkeyMenu()) );
+        }
+        break;
+
+        case GetInkeyMenu_YesNo_Response:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantYesNo( true );
+            cmd.setText( "Enter YES" );
+            command( cmd, this, SLOT(sendGetInkeyMenu()) );
+        }
+        break;
+
+        case GetInkeyMenu_Icon:
+        {
+            sendGetInkeyIconMenu();
+        }
+        break;
+
+        case GetInkeyMenu_Help:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setHasHelp( true );
+            cmd.setText( "Enter \"+\"" );
+            command( cmd, this, SLOT(sendHelpInfo(QSimTerminalResponse)) );
+        }
+        break;
+
+        case GetInkeyMenu_Variable_Timeout:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "Enter \"+\"" );
+            cmd.setDuration( 10000 );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()) );
+        }
+        break;
+
+        case GetInkeyMenu_Text_Attribute:
+        {
+            QByteArray ba;
+            ba.resize( 4 );
+            ba[0] = 0x00;
+            ba[1] = 0x09;
+            ba[2] = 0x00;
+            ba[3] = 0xB4;
+
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "Enter \"+\"" );
+            cmd.setTextAttribute( ba );
+            command( cmd, this, SLOT(sendGetInkeyMenu()) );
+        }
+        break;
+
+        case GetInkeyMenu_Main:
+        {
+            sendConformanceMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::GetInkeyNormalMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case NormalMenu_1_1:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "Enter \"+\"" );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_2:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "Enter \"0\"" );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()),
+                    QSimCommand::PackedStrings );
+        }
+        break;
+
+        case NormalMenu_1_3:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<GO-BACKWARDS>" );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_4:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<ABORT>" );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_5:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(false);
+            cmd.setText( "Enter \"q\"" );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_6:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(false);
+            cmd.setText( "Enter \"x\". This command instructs the ME to display "
+                         "text, and to expect the user to enter a single character."
+                         " Any response entered by the user shall be passed t" );
+            command( cmd, this, SLOT(sendGetInkeyNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_Main:
+        {
+            sendGetInkeyMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::GetInkeyIconMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case IconMenu_1A:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<NO-ICON>" );
+            cmd.setIconId( 1 );
+            cmd.setIconSelfExplanatory( true );
+            command( cmd, this, SLOT(sendGetInkeyIconMenu()) );
+        }
+        break;
+
+        case IconMenu_2A:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<BASIC-ICON>" );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendGetInkeyIconMenu()) );
+        }
+        break;
+
+        case IconMenu_3A:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<NO-ICON>" );
+            cmd.setIconId( 2 );
+            cmd.setIconSelfExplanatory( true );
+            command( cmd, this, SLOT(sendGetInkeyIconMenu()) );
+        }
+        break;
+
+        case IconMenu_4A:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<COLOUR-ICON>" );
+            cmd.setIconId( 2 );
+            command( cmd, this, SLOT(sendGetInkeyIconMenu()) );
+        }
+        break;
+
+        case IconMenu_5A:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "" );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendGetInkeyIconMenu()) );
+        }
+        break;
+
+        case IconMenu_6A:
+        {
+            cmd.setType( QSimCommand::GetInkey );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( QString() );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendGetInkeyIconMenu()) );
+        }
+        break;
+
+        case IconMenu_Main:
+        {
+            sendGetInkeyMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
\ No newline at end of file
diff --git a/src/simapplication.h b/src/simapplication.h
index ce7dfe3..f8545fc 100644
--- a/src/simapplication.h
+++ b/src/simapplication.h
@@ -138,6 +138,13 @@ protected slots:
     void sendDisplayTextNormalMenu();
     void sendDisplayTextIconMenu();
     void DisplayTextIconMenu( const QSimTerminalResponse& resp );
+    void sendGetInkeyMenu();
+    void GetInkeyMenu( const QSimTerminalResponse& resp );
+    void GetInkeyNormalMenu( const QSimTerminalResponse& resp );
+    void sendGetInkeyNormalMenu();
+    void sendGetInkeyIconMenu();
+    void GetInkeyIconMenu( const QSimTerminalResponse& resp );
+    void sendHelpInfo( const QSimTerminalResponse& resp );
 
 private:
     int sticksLeft;
-- 
1.7.0.4

[RFC 4/5] phonesim: Add GetInput conformance test cases

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 23424 bytes --]

From: badrjee <badrjee@badrjee-laptop.(none)>

---
 src/simapplication.cpp |  642 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/simapplication.h   |    6 +
 2 files changed, 648 insertions(+), 0 deletions(-)

diff --git a/src/simapplication.cpp b/src/simapplication.cpp
index 3f90203..befe358 100644
--- a/src/simapplication.cpp
+++ b/src/simapplication.cpp
@@ -352,6 +352,7 @@ const QString DemoSimApplication::getName()
 
 #define ConformanceMenu_DisplayText 1
 #define ConformanceMenu_GetInkey    2
+#define ConformanceMenu_GetInput    3
 #define ConformanceMenu_Main        20
 
 #define NormalMenu_1_1    1
@@ -399,6 +400,19 @@ const QString DemoSimApplication::getName()
 #define GetInkeyMenu_Text_Attribute     10
 #define GetInkeyMenu_Main               11
 
+#define GetInputMenu_Normal              1
+#define GetInputMenu_No_Response         2
+#define GetInputMenu_Cyrillic_Display_1  3
+#define GetInputMenu_Cyrillic_Display_2  4
+#define GetInputMenu_Cyrillic_Entry_1    5
+#define GetInputMenu_Cyrillic_Entry_2    6
+#define GetInputMenu_Default_Text_1      7
+#define GetInputMenu_Default_Text_2      8
+#define GetInputMenu_Icon                9
+#define GetInputMenu_Help               10
+#define GetInputMenu_Text_Attribute     11
+#define GetInputMenu_Main               12
+
 enum SendSMSMenuItems {
 	SendSMS_Unpacked = 1,
 	SendSMS_Packed,
@@ -2429,6 +2443,10 @@ void DemoSimApplication::sendConformanceMenu()
     item.setLabel( "Get Inkey" );
     items += item;
 
+    item.setIdentifier( ConformanceMenu_GetInput );
+    item.setLabel( "Get Input" );
+    items += item;
+
     item.setIdentifier( ConformanceMenu_Main );
     item.setLabel( "Return to main menu" );
     items += item;
@@ -2463,6 +2481,12 @@ void DemoSimApplication::ConformanceMenu( const QSimTerminalResponse& resp )
         }
         break;
 
+        case ConformanceMenu_GetInput:
+        {
+            sendGetInputMenu();
+        }
+        break;
+
         default:
             endSession();
         break;
@@ -3429,4 +3453,622 @@ void DemoSimApplication::GetInkeyIconMenu( const QSimTerminalResponse& resp )
             endSession();
         break;
     }
+}
+
+void DemoSimApplication::sendGetInputMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Get Input" );
+
+    item.setIdentifier( GetInputMenu_Normal );
+    item.setLabel( "Normal" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_No_Response );
+    item.setLabel( "No response from user" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Cyrillic_Display_1 );
+    item.setLabel( "UCS2 display in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Cyrillic_Display_2 );
+    item.setLabel( "max.length UCS2 display in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Cyrillic_Entry_1 );
+    item.setLabel( "UCS2 entry in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Cyrillic_Entry_2 );
+    item.setLabel( "max.length UCS2 entry in Cyrillic" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Default_Text_1 );
+    item.setLabel( "Default Text" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Default_Text_2 );
+    item.setLabel( "Default Text with max. length" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Icon );
+    item.setLabel( "Display of icon" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Help );
+    item.setLabel( "Help Information" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Text_Attribute );
+    item.setLabel( "Support of Text Attribute" );
+    items += item;
+
+    item.setIdentifier( GetInputMenu_Main );
+    item.setLabel( "Return to main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(GetInputMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendGetInputNormalMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Get Input (Normal)" );
+
+    item.setIdentifier( NormalMenu_1_1 );
+    item.setLabel( "digits only, SMS default alphabet, echo text" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_2 );
+    item.setLabel( "digits only, SMS default alphabet, echo text, packed SMS" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_3 );
+    item.setLabel( "character set, SMS default alphabet, echo text" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_4 );
+    item.setLabel( "digits only, SMS default alphabet, hide text" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_5 );
+    item.setLabel( "digits only, SMS default alphabet, echo text" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_6 );
+    item.setLabel( "backwards move" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_7 );
+    item.setLabel( "abort" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_8 );
+    item.setLabel( "response length range 160-160" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_9 );
+    item.setLabel( "response length range 0-1" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_10 );
+    item.setLabel( "null length for the text string" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_1_11 );
+    item.setLabel( "empty text string" );
+    items += item;
+
+    item.setIdentifier( NormalMenu_Main );
+    item.setLabel( "Return to Get Input main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(GetInputNormalMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::sendGetInputIconMenu()
+{
+    QSimCommand cmd;
+    QSimMenuItem item;
+    QList<QSimMenuItem> items;
+
+    cmd.setType( QSimCommand::SelectItem );
+    cmd.setTitle( "Get Input (Icon support)" );
+
+    item.setIdentifier( IconMenu_1A );
+    item.setLabel( "basic icon, self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_2A );
+    item.setLabel( "basic icon, non self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_3A );
+    item.setLabel( "Colour icon, self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_4A );
+    item.setLabel( "Colour icon, non self-explanatory, successful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_5A );
+    item.setLabel( "basic icon, null text string, unsuccessful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_6A );
+    item.setLabel( "basic icon, empty text string, unsuccessful" );
+    items += item;
+
+    item.setIdentifier( IconMenu_Main );
+    item.setLabel( "Return to Get Input main menu" );
+    items += item;
+
+    cmd.setMenuItems( items );
+
+    command( cmd, this, SLOT(GetInputIconMenu(QSimTerminalResponse)) );
+}
+
+void DemoSimApplication::GetInputMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case GetInputMenu_Normal:
+        {
+            sendGetInputNormalMenu();
+        }
+        break;
+
+        case GetInputMenu_No_Response:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "<TIME-OUT>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Cyrillic_Display_1:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setEcho( true );
+            cmd.setWantDigits( false );
+            QTextCodec *codec = QTextCodec::codecForName( "utf8" );
+            cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputMenu()),
+                    QSimCommand::UCS2Strings );
+        }
+        break;
+
+        case GetInputMenu_Cyrillic_Display_2:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setEcho( true );
+            cmd.setWantDigits( false );
+            QTextCodec *codec = QTextCodec::codecForName( "utf8" );
+            cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
+                                "ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
+                                "ЗДРАВСТВУЙТЕЗДРАВСТВУЙ" ) );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputMenu()),
+                    QSimCommand::UCS2Strings );
+        }
+        break;
+
+        case GetInputMenu_Cyrillic_Entry_1:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits( false );
+            cmd.setUcs2Input( true );
+            cmd.setText( "Enter Hello" );
+            cmd.setMinimumLength( 12 );
+            cmd.setMaximumLength( 12 );
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Cyrillic_Entry_2:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits( false );
+            cmd.setUcs2Input( true );
+            cmd.setText( "Enter Hello" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength(0xFF);
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Default_Text_1:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "Enter 12345" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            cmd.setDefaultText( "12345" );
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Default_Text_2:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "Enter:" );
+            cmd.setMinimumLength( 160 );
+            cmd.setMaximumLength( 160 );
+            cmd.setDefaultText( "***1111111111###***2222222222###***3333333333"
+                                "###***4444444444###***5555555555###***6666666"
+                                "666###***7777777777###***8888888888###***9999"
+                                "999999###***0000000000###" );
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Icon:
+        {
+            sendGetInputIconMenu();
+        }
+        break;
+
+        case GetInputMenu_Help:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setHasHelp( true );
+            cmd.setText( "Enter 12345" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Text_Attribute:
+        {
+            QByteArray ba;
+            ba.resize( 4 );
+            ba[0] = 0x00;
+            ba[1] = 0x0B;
+            ba[2] = 0x00;
+            ba[3] = 0xB4;
+
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "Enter 12345" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            cmd.setTextAttribute( ba );
+            command( cmd, this, SLOT(sendGetInputMenu()) );
+        }
+        break;
+
+        case GetInputMenu_Main:
+        {
+            sendConformanceMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::GetInputNormalMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case NormalMenu_1_1:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "Enter 12345" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_2:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setPackedInput( true );
+            cmd.setText( "Enter 67*#+" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()),
+                    QSimCommand::PackedStrings );
+        }
+        break;
+
+        case NormalMenu_1_3:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits( false );
+            cmd.setEcho( true );
+            cmd.setText( "Enter AbCdE" );
+            cmd.setMinimumLength( 5 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_4:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setUcs2Input( false );
+            cmd.setEcho( false );
+            cmd.setText( "Password 1<SEND>2345678" );
+            cmd.setMinimumLength( 4 );
+            cmd.setMaximumLength( 8 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_5:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "Enter 1..9,0..9,0(1)" );
+            cmd.setMinimumLength( 1 );
+            cmd.setMaximumLength( 20 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_6:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "<GO-BACKWARDS>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 8 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_7:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "<ABORT>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 8 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_8:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "***1111111111###***2222222222###***3333333333###***44"
+                         "44444444###***5555555555###***6666666666###***7777777"
+                         "777###***8888888888###***9999999999###***0000000000###" );
+            cmd.setMinimumLength( 160 );
+            cmd.setMaximumLength( 160 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_9:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "<SEND>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 1 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_10:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( QString() );
+            cmd.setMinimumLength( 1 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_1_11:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setEcho( true );
+            cmd.setText( "" );
+            cmd.setMinimumLength( 1 );
+            cmd.setMaximumLength( 5 );
+            command( cmd, this, SLOT(sendGetInputNormalMenu()) );
+        }
+        break;
+
+        case NormalMenu_Main:
+        {
+            sendGetInputMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
+}
+
+void DemoSimApplication::GetInputIconMenu( const QSimTerminalResponse& resp )
+{
+    QSimCommand cmd;
+
+    if ( resp.result() != QSimTerminalResponse::Success ) {
+        /* Unknown response - just go back to the main menu. */
+        endSession();
+
+        return;
+    }
+
+    /* Item selected. */
+    switch ( resp.menuItem() ) {
+        case IconMenu_1A:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<NO-ICON>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            cmd.setIconId( 1 );
+            cmd.setIconSelfExplanatory( true );
+            command( cmd, this, SLOT(sendGetInputIconMenu()) );
+        }
+        break;
+
+        case IconMenu_2A:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<BASIC-ICON>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendGetInputIconMenu()) );
+        }
+        break;
+
+        case IconMenu_3A:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<NO-ICON>" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            cmd.setIconId( 2 );
+            cmd.setIconSelfExplanatory( true );
+            command( cmd, this, SLOT(sendGetInputIconMenu()) );
+        }
+        break;
+
+        case IconMenu_4A:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "<COLOUR-ICON>" );
+            cmd.setIconId( 2 );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            command( cmd, this, SLOT(sendGetInputIconMenu()) );
+        }
+        break;
+
+        case IconMenu_5A:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( "" );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendGetInputIconMenu()) );
+        }
+        break;
+
+        case IconMenu_6A:
+        {
+            cmd.setType( QSimCommand::GetInput );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            cmd.setWantDigits(true);
+            cmd.setText( QString() );
+            cmd.setMinimumLength( 0 );
+            cmd.setMaximumLength( 10 );
+            cmd.setIconId( 1 );
+            command( cmd, this, SLOT(sendGetInputIconMenu()) );
+        }
+        break;
+
+        case IconMenu_Main:
+        {
+            sendGetInputMenu();
+        }
+        break;
+
+        default:
+            endSession();
+        break;
+    }
 }
\ No newline at end of file
diff --git a/src/simapplication.h b/src/simapplication.h
index f8545fc..6894f78 100644
--- a/src/simapplication.h
+++ b/src/simapplication.h
@@ -145,6 +145,12 @@ protected slots:
     void sendGetInkeyIconMenu();
     void GetInkeyIconMenu( const QSimTerminalResponse& resp );
     void sendHelpInfo( const QSimTerminalResponse& resp );
+    void sendGetInputMenu();
+    void GetInputMenu( const QSimTerminalResponse& resp );
+    void GetInputNormalMenu( const QSimTerminalResponse& resp );
+    void sendGetInputNormalMenu();
+    void sendGetInputIconMenu();
+    void GetInputIconMenu( const QSimTerminalResponse& resp );
 
 private:
     int sticksLeft;
-- 
1.7.0.4

[RFC 5/5] phonesim: Add MoreTime conformance test case

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

From: badrjee <badrjee@badrjee-laptop.(none)>

---
 src/simapplication.cpp |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/simapplication.cpp b/src/simapplication.cpp
index befe358..ff49e48 100644
--- a/src/simapplication.cpp
+++ b/src/simapplication.cpp
@@ -353,6 +353,7 @@ const QString DemoSimApplication::getName()
 #define ConformanceMenu_DisplayText 1
 #define ConformanceMenu_GetInkey    2
 #define ConformanceMenu_GetInput    3
+#define ConformanceMenu_MoreTime    4
 #define ConformanceMenu_Main        20
 
 #define NormalMenu_1_1    1
@@ -2447,6 +2448,10 @@ void DemoSimApplication::sendConformanceMenu()
     item.setLabel( "Get Input" );
     items += item;
 
+    item.setIdentifier( ConformanceMenu_MoreTime );
+    item.setLabel( "More Time" );
+    items += item;
+
     item.setIdentifier( ConformanceMenu_Main );
     item.setLabel( "Return to main menu" );
     items += item;
@@ -2487,6 +2492,14 @@ void DemoSimApplication::ConformanceMenu( const QSimTerminalResponse& resp )
         }
         break;
 
+        case ConformanceMenu_MoreTime:
+        {
+            cmd.setType( QSimCommand::MoreTime );
+            cmd.setDestinationDevice( QSimCommand::ME );
+            command( cmd, this, SLOT(sendConformanceMenu()) );
+        }
+        break;
+
         default:
             endSession();
         break;
-- 
1.7.0.4

Re: [RFC 0/5] Add few conformance test cases to phonesim

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi Jeevaka,

On 01/03/2011 04:09 AM, Jeevaka Badrappan wrote:
> Hi,
> 
>  Following set of patches adds Display Text, Get Inkey, Get Input and 
> MoreTime conformance test cases as specificed in ETSI TS 102 384 to
> phonesim. Logging of the result in a file can be done but it is not
> part of this patch.

I think this is a great idea.  However, what I would suggest is to stuff
this inside a dedicated SIM Application, since the current Demo
Application is getting a bit full.  We'd also need a UI on the Sim Tab
to select the right application.

Regards,
-Denis