--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h Fri Feb 19 23:59:33 2010 +0200
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h Fri Mar 12 15:49:38 2010 +0200
@@ -15,20 +15,16 @@
*
*/
-
-
/**
- @file
+ @file
+ @test
*/
-#if (!defined __Ioctl_STEP_H__)
-#define __Ioctl_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
+
+#ifndef WAPIOCTLTESTSTEPS_H
+#define WAPIOCTLTESTSTEPS_H
+
#include "WapProtSuiteStepBase.h"
-
class CIoctlStep_1 : public CWapProtSuiteStepBase
/**
* Sends/receives a 7_Bit business card using IOCTL
@@ -38,7 +34,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_2 : public CWapProtSuiteStepBase
/**
* Send/receive a long 7-Bit calendar entry using IOCTL(two segments)
@@ -48,7 +43,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_3 : public CWapProtSuiteStepBase
/**
* send/receive one 7-Bit two segments message and one 7-Bit one segment message
@@ -58,7 +52,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_4 : public CWapProtSuiteStepBase
/**
* Simulating client crash conditions with 7bit message
@@ -68,7 +61,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_5 : public CWapProtSuiteStepBase
/**
* Simulating client crash conditions with 8bit push message
@@ -78,7 +70,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_6 : public CWapProtSuiteStepBase
/**
* Testing the old client for 7Bit message
@@ -88,7 +79,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_7 : public CWapProtSuiteStepBase
/**
* Testing push messages (8-Bit)
@@ -98,7 +88,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_8 : public CWapProtSuiteStepBase
/**
* Testing store of 8-Bit messages
@@ -108,7 +97,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_9 : public CWapProtSuiteStepBase
/**
* Testing old clientwith 8-Bit messages
@@ -118,7 +106,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_10 : public CWapProtSuiteStepBase
/**
* Testing wrong port numebr (i.e.8Bit port number) for 7Bit message
@@ -128,7 +115,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_11 : public CWapProtSuiteStepBase
/**
* Testing CancelIOCTL
@@ -138,7 +124,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_12 : public CWapProtSuiteStepBase
/**
* Test issue IOCTL without SetOption NewStyleClient
@@ -148,7 +133,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_13 : public CWapProtSuiteStepBase
/**
* Test sending 8-Bit Calendar entry
@@ -158,7 +142,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_14 : public CWapProtSuiteStepBase
/**
* Simulating client crash conditions with 8bit message
@@ -168,7 +151,6 @@
virtual TVerdict doTestStepL();
};
-
class CIoctlStep_15 : public CWapProtSuiteStepBase
/**
* Receives a 7Bit v-card using IOCTL with concatenation for new style client
@@ -178,7 +160,6 @@
virtual TVerdict doTestStepL();
};
-
class CBackupRestoreStep : public CWapProtSuiteStepBase
/**
* Simulating client crash conditions with 8bit message
@@ -190,7 +171,6 @@
private:
TInt SendWapL();
TBool IsWapFileOpenL();
- RSocketServ iSocketServer;
};
class CIoctlStep_17 : public CWapProtSuiteStepBase
@@ -303,7 +283,7 @@
{
public:
- virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPreambleL();
TInt DoPanicTestL(TPtrC* aTestData1, TPtrC16* aTelNumber, TInt aPort);
virtual TVerdict doTestStepL();
virtual TVerdict doTestStepPostambleL();
@@ -316,16 +296,14 @@
*/
{
public:
+ CSetDiskMonitorLimits();
virtual TVerdict doTestStepL();
-
};
class CSetDiskSpace : public CWapProtSuiteStepBase
-/**
- * Fill the disk space
- */
{
public:
+ CSetDiskSpace();
virtual TVerdict doTestStepL();
};
@@ -341,25 +319,11 @@
};
class CReceiveWapMessage : public CWapProtSuiteStepBase
-/**
- * Free the disk space
- */
{
public:
+ CReceiveWapMessage();
virtual TVerdict doTestStepL();
-
};
-
-class CInitializePhone : public CWapProtSuiteStepBase
-/**
- * Free the disk space
- */
- {
-public:
- virtual TVerdict doTestStepL();
-
- };
-
/**
Tests enumerating of a VCard which needs to go via the observer and
@@ -371,7 +335,6 @@
virtual TVerdict doTestStepL();
};
-
/**
* Sends a 7-bit VCard with an email address in it, to ensure that '@'
* characters are sent correctly.
@@ -382,7 +345,6 @@
virtual TVerdict doTestStepL();
};
-
/**
* Attempts to send datagrams bigger than the maximum message and bigger
* than the maximum size of an MBuf.
@@ -399,9 +361,8 @@
* segment which has a wap header but an empty data field.
*/
{
- public:
+public:
virtual TVerdict doTestStepL();
};
-
-#endif
+#endif // WAPIOCTLTESTSTEPS_H