summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkumpf <kumpf>2005-08-09 20:51:19 +0000
committerkumpf <kumpf>2005-08-09 20:51:19 +0000
commitc0afaf072c84b7ffe6edaa57a1aacaea7d994704 (patch)
tree1b58a8072d3745ebd0c1b4b9fb64067da5228afa /src
parent4756bbdc92fedb6843a5f3c6b354d563e76ed169 (diff)
downloadtog-pegasus-c0afaf072c84b7ffe6edaa57a1aacaea7d994704.zip
tog-pegasus-c0afaf072c84b7ffe6edaa57a1aacaea7d994704.tar.gz
tog-pegasus-c0afaf072c84b7ffe6edaa57a1aacaea7d994704.tar.xz
BUG#: 4036
TITLE: Query language string is case-insensitive DESCRIPTION: Updated the query language string comparisons to expect upper-case values. Also updated the tests to use upper-case query languages.
Diffstat (limited to 'src')
-rw-r--r--src/Pegasus/IndicationService/IndicationService.cpp2
-rw-r--r--src/Pegasus/IndicationService/tests/DisableEnable/DisableEnable.cpp4
-rw-r--r--src/Pegasus/IndicationService/tests/DisableEnable/Makefile112
-rw-r--r--src/Pegasus/IndicationService/tests/DisableEnable2/DisableEnable2.cpp4
-rw-r--r--src/Pegasus/IndicationService/tests/DisableEnable2/Makefile240
-rw-r--r--src/Pegasus/IndicationService/tests/ProcessIndication/Makefile280
-rw-r--r--src/Pegasus/IndicationService/tests/ProcessIndication/ProcessIndication.cpp10
-rw-r--r--src/Pegasus/IndicationService/tests/Subscription/Subscription.cpp2
-rw-r--r--src/Pegasus/Query/QueryExpression/QueryExpression.cpp18
-rw-r--r--src/Providers/TestProviders/IndicationStressTestProvider/testclient/IndicationStressTest.cpp6
-rw-r--r--src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile28
-rw-r--r--src/Unsupported/LifecycleIndicationProvider/testclient/LifecycleIndication.cpp6
-rw-r--r--src/Unsupported/LifecycleIndicationProvider/testclient/Makefile8
13 files changed, 360 insertions, 360 deletions
diff --git a/src/Pegasus/IndicationService/IndicationService.cpp b/src/Pegasus/IndicationService/IndicationService.cpp
index bb6efd4..5ac79ed 100644
--- a/src/Pegasus/IndicationService/IndicationService.cpp
+++ b/src/Pegasus/IndicationService/IndicationService.cpp
@@ -3459,7 +3459,7 @@ Boolean IndicationService::_canCreate (
#ifdef PEGASUS_DISABLE_CQL
// Special code to block CQL, if CQL is disabled
- if (String::equalNoCase(queryLanguage, "cim:cql"))
+ if (queryLanguage == "CIM:CQL")
{
// CQL is not allowed in this case
PEG_METHOD_EXIT();
diff --git a/src/Pegasus/IndicationService/tests/DisableEnable/DisableEnable.cpp b/src/Pegasus/IndicationService/tests/DisableEnable/DisableEnable.cpp
index 3e8f66e..70d875a 100644
--- a/src/Pegasus/IndicationService/tests/DisableEnable/DisableEnable.cpp
+++ b/src/Pegasus/IndicationService/tests/DisableEnable/DisableEnable.cpp
@@ -385,7 +385,7 @@ void _usage ()
PEGASUS_STD (cerr)
<< "Usage: TestDisableEnable "
<< "{setup | create | delete | create2 | addProvider | modifyProvider1 "
- << "| modifyProvider2 | deleteProvider | delete2 | cleanup} {wql | cim:cql}"
+ << "| modifyProvider2 | deleteProvider | delete2 | cleanup} {WQL | CIM:CQL}"
<< PEGASUS_STD (endl);
}
@@ -718,7 +718,7 @@ int main (int argc, char** argv)
String qlang(optLang);
#ifdef PEGASUS_DISABLE_CQL
- if (String::equalNoCase(qlang, "cim:cql"))
+ if (qlang == "CIM:CQL"))
{
PEGASUS_STD (cout) << "+++++ cql test disabled" << PEGASUS_STD (endl);
return 0;
diff --git a/src/Pegasus/IndicationService/tests/DisableEnable/Makefile b/src/Pegasus/IndicationService/tests/DisableEnable/Makefile
index 0ddeac0..f57cb69 100644
--- a/src/Pegasus/IndicationService/tests/DisableEnable/Makefile
+++ b/src/Pegasus/IndicationService/tests/DisableEnable/Makefile
@@ -44,70 +44,70 @@ include $(ROOT)/mak/program.mak
tests:
poststarttests:
- @$(ECHO) "TestDisableEnable setup wql"
- @$(PROGRAM) setup wql
- @$(ECHO) "TestDisableEnable create wql"
- @$(PROGRAM) create wql
+ @$(ECHO) "TestDisableEnable setup WQL"
+ @$(PROGRAM) setup WQL
+ @$(ECHO) "TestDisableEnable create WQL"
+ @$(PROGRAM) create WQL
cimprovider -d -m ProcessIndicationProviderModule
- @$(ECHO) "TestDisableEnable delete wql"
- @$(PROGRAM) delete wql
+ @$(ECHO) "TestDisableEnable delete WQL"
+ @$(PROGRAM) delete WQL
cimprovider -e -m ProcessIndicationProviderModule
- @$(ECHO) "TestDisableEnable create wql"
- @$(PROGRAM) create wql
+ @$(ECHO) "TestDisableEnable create WQL"
+ @$(PROGRAM) create WQL
cimprovider -d -m ProcessIndicationProviderModule
cimprovider -e -m ProcessIndicationProviderModule
- @$(ECHO) "TestDisableEnable delete wql"
- @$(PROGRAM) delete wql
- @$(ECHO) "TestDisableEnable create wql"
- @$(PROGRAM) create wql
- @$(ECHO) "TestDisableEnable create2 wql"
- @$(PROGRAM) create2 wql
- @$(ECHO) "TestDisableEnable addProvider wql"
- @$(PROGRAM) addProvider wql
- @$(ECHO) "TestDisableEnable modifyProvider1 wql"
- @$(PROGRAM) modifyProvider1 wql
- @$(ECHO) "TestDisableEnable modifyProvider2 wql"
- @$(PROGRAM) modifyProvider2 wql
- @$(ECHO) "TestDisableEnable deleteProvider wql"
- @$(PROGRAM) deleteProvider wql
- @$(ECHO) "TestDisableEnable delete2 wql"
- @$(PROGRAM) delete2 wql
- @$(ECHO) "TestDisableEnable delete wql"
- @$(PROGRAM) delete wql
- @$(ECHO) "TestDisableEnable cleanup wql"
- @$(PROGRAM) cleanup wql
+ @$(ECHO) "TestDisableEnable delete WQL"
+ @$(PROGRAM) delete WQL
+ @$(ECHO) "TestDisableEnable create WQL"
+ @$(PROGRAM) create WQL
+ @$(ECHO) "TestDisableEnable create2 WQL"
+ @$(PROGRAM) create2 WQL
+ @$(ECHO) "TestDisableEnable addProvider WQL"
+ @$(PROGRAM) addProvider WQL
+ @$(ECHO) "TestDisableEnable modifyProvider1 WQL"
+ @$(PROGRAM) modifyProvider1 WQL
+ @$(ECHO) "TestDisableEnable modifyProvider2 WQL"
+ @$(PROGRAM) modifyProvider2 WQL
+ @$(ECHO) "TestDisableEnable deleteProvider WQL"
+ @$(PROGRAM) deleteProvider WQL
+ @$(ECHO) "TestDisableEnable delete2 WQL"
+ @$(PROGRAM) delete2 WQL
+ @$(ECHO) "TestDisableEnable delete WQL"
+ @$(PROGRAM) delete WQL
+ @$(ECHO) "TestDisableEnable cleanup WQL"
+ @$(PROGRAM) cleanup WQL
ifndef PEGASUS_DISABLE_CQL
- @$(ECHO) "TestDisableEnable setup cim:cql"
- @$(PROGRAM) setup cim:cql
- @$(ECHO) "TestDisableEnable create cim:cql"
- @$(PROGRAM) create cim:cql
+ @$(ECHO) "TestDisableEnable setup CIM:CQL"
+ @$(PROGRAM) setup CIM:CQL
+ @$(ECHO) "TestDisableEnable create CIM:CQL"
+ @$(PROGRAM) create CIM:CQL
cimprovider -d -m ProcessIndicationProviderModule
- @$(ECHO) "TestDisableEnable delete cim:cql"
- @$(PROGRAM) delete cim:cql
+ @$(ECHO) "TestDisableEnable delete CIM:CQL"
+ @$(PROGRAM) delete CIM:CQL
cimprovider -e -m ProcessIndicationProviderModule
- @$(ECHO) "TestDisableEnable create cim:cql"
- @$(PROGRAM) create cim:cql
+ @$(ECHO) "TestDisableEnable create CIM:CQL"
+ @$(PROGRAM) create CIM:CQL
cimprovider -d -m ProcessIndicationProviderModule
cimprovider -e -m ProcessIndicationProviderModule
- @$(ECHO) "TestDisableEnable delete cim:cql"
- @$(PROGRAM) delete cim:cql
- @$(ECHO) "TestDisableEnable create cim:cql"
- @$(PROGRAM) create cim:cql
- @$(ECHO) "TestDisableEnable create2 cim:cql"
- @$(PROGRAM) create2 cim:cql
- @$(ECHO) "TestDisableEnable addProvider cim:cql"
- @$(PROGRAM) addProvider cim:cql
- @$(ECHO) "TestDisableEnable modifyProvider1 cim:cql"
- @$(PROGRAM) modifyProvider1 cim:cql
- @$(ECHO) "TestDisableEnable modifyProvider2 cim:cql"
- @$(PROGRAM) modifyProvider2 cim:cql
- @$(ECHO) "TestDisableEnable deleteProvider cim:cql"
- @$(PROGRAM) deleteProvider cim:cql
- @$(ECHO) "TestDisableEnable delete2 cim:cql"
- @$(PROGRAM) delete2 cim:cql
- @$(ECHO) "TestDisableEnable delete cim:cql"
- @$(PROGRAM) delete cim:cql
- @$(ECHO) "TestDisableEnable cleanup cim:cql"
- @$(PROGRAM) cleanup cim:cql
+ @$(ECHO) "TestDisableEnable delete CIM:CQL"
+ @$(PROGRAM) delete CIM:CQL
+ @$(ECHO) "TestDisableEnable create CIM:CQL"
+ @$(PROGRAM) create CIM:CQL
+ @$(ECHO) "TestDisableEnable create2 CIM:CQL"
+ @$(PROGRAM) create2 CIM:CQL
+ @$(ECHO) "TestDisableEnable addProvider CIM:CQL"
+ @$(PROGRAM) addProvider CIM:CQL
+ @$(ECHO) "TestDisableEnable modifyProvider1 CIM:CQL"
+ @$(PROGRAM) modifyProvider1 CIM:CQL
+ @$(ECHO) "TestDisableEnable modifyProvider2 CIM:CQL"
+ @$(PROGRAM) modifyProvider2 CIM:CQL
+ @$(ECHO) "TestDisableEnable deleteProvider CIM:CQL"
+ @$(PROGRAM) deleteProvider CIM:CQL
+ @$(ECHO) "TestDisableEnable delete2 CIM:CQL"
+ @$(PROGRAM) delete2 CIM:CQL
+ @$(ECHO) "TestDisableEnable delete CIM:CQL"
+ @$(PROGRAM) delete CIM:CQL
+ @$(ECHO) "TestDisableEnable cleanup CIM:CQL"
+ @$(PROGRAM) cleanup CIM:CQL
@$(ECHO) "+++++ TestDisableEnable passed all tests"
endif
diff --git a/src/Pegasus/IndicationService/tests/DisableEnable2/DisableEnable2.cpp b/src/Pegasus/IndicationService/tests/DisableEnable2/DisableEnable2.cpp
index e664974..e3d8fd5 100644
--- a/src/Pegasus/IndicationService/tests/DisableEnable2/DisableEnable2.cpp
+++ b/src/Pegasus/IndicationService/tests/DisableEnable2/DisableEnable2.cpp
@@ -280,7 +280,7 @@ void _usage ()
<< "Usage: TestDisableEnable2 "
<< "{setup | setup2 | create | create2 "
<< "| sendSucceed | sendFail | sendBlock "
- << "| delete | delete2 | cleanup | cleanup2} {wql | cim:cql}"
+ << "| delete | delete2 | cleanup | cleanup2} {WQL | CIM:CQL}"
<< PEGASUS_STD (endl);
}
@@ -598,7 +598,7 @@ int main (int argc, char** argv)
String qlang(optLang);
#ifdef PEGASUS_DISABLE_CQL
- if (String::equalNoCase(qlang, "cim:cql"))
+ if (qlang == "CIM:CQL")
{
PEGASUS_STD (cout) << "+++++ cql test disabled" << PEGASUS_STD (endl);
return 0;
diff --git a/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile b/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile
index 418bc2c..f373993 100644
--- a/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile
+++ b/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile
@@ -44,144 +44,144 @@ include $(ROOT)/mak/program.mak
tests:
poststarttests:
- @$(ECHO) "TestDisableEnable2 setup wql"
- @$(PROGRAM) setup wql
- @$(ECHO) "TestDisableEnable2 sendFail wql"
- @$(PROGRAM) sendFail wql
- @$(ECHO) "TestDisableEnable2 create wql"
- @$(PROGRAM) create wql
- @$(ECHO) "TestDisableEnable2 sendSucceed wql"
- @$(PROGRAM) sendSucceed wql
+ @$(ECHO) "TestDisableEnable2 setup WQL"
+ @$(PROGRAM) setup WQL
+ @$(ECHO) "TestDisableEnable2 sendFail WQL"
+ @$(PROGRAM) sendFail WQL
+ @$(ECHO) "TestDisableEnable2 create WQL"
+ @$(PROGRAM) create WQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed WQL"
+ @$(PROGRAM) sendSucceed WQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock wql"
- @$(PROGRAM) sendBlock wql
- @$(ECHO) "TestDisableEnable2 delete wql"
- @$(PROGRAM) delete wql
- @$(ECHO) "TestDisableEnable2 sendBlock wql"
- @$(PROGRAM) sendBlock wql
+ @$(ECHO) "TestDisableEnable2 sendBlock WQL"
+ @$(PROGRAM) sendBlock WQL
+ @$(ECHO) "TestDisableEnable2 delete WQL"
+ @$(PROGRAM) delete WQL
+ @$(ECHO) "TestDisableEnable2 sendBlock WQL"
+ @$(PROGRAM) sendBlock WQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendFail wql"
- @$(PROGRAM) sendFail wql
- @$(ECHO) "TestDisableEnable2 create wql"
- @$(PROGRAM) create wql
- @$(ECHO) "TestDisableEnable2 sendSucceed wql"
- @$(PROGRAM) sendSucceed wql
+ @$(ECHO) "TestDisableEnable2 sendFail WQL"
+ @$(PROGRAM) sendFail WQL
+ @$(ECHO) "TestDisableEnable2 create WQL"
+ @$(PROGRAM) create WQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed WQL"
+ @$(PROGRAM) sendSucceed WQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock wql"
- @$(PROGRAM) sendBlock wql
+ @$(ECHO) "TestDisableEnable2 sendBlock WQL"
+ @$(PROGRAM) sendBlock WQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendSucceed wql"
- @$(PROGRAM) sendSucceed wql
- @$(ECHO) "TestDisableEnable2 delete wql"
- @$(PROGRAM) delete wql
- @$(ECHO) "TestDisableEnable2 sendFail wql"
- @$(PROGRAM) sendFail wql
- @$(ECHO) "TestDisableEnable2 cleanup wql"
- @$(PROGRAM) cleanup wql
+ @$(ECHO) "TestDisableEnable2 sendSucceed WQL"
+ @$(PROGRAM) sendSucceed WQL
+ @$(ECHO) "TestDisableEnable2 delete WQL"
+ @$(PROGRAM) delete WQL
+ @$(ECHO) "TestDisableEnable2 sendFail WQL"
+ @$(PROGRAM) sendFail WQL
+ @$(ECHO) "TestDisableEnable2 cleanup WQL"
+ @$(PROGRAM) cleanup WQL
ifndef PEGASUS_DISABLE_CQL
- @$(ECHO) "TestDisableEnable2 setup cim:cql"
- @$(PROGRAM) setup cim:cql
- @$(ECHO) "TestDisableEnable2 sendFail cim:cql"
- @$(PROGRAM) sendFail cim:cql
- @$(ECHO) "TestDisableEnable2 create cim:cql"
- @$(PROGRAM) create cim:cql
- @$(ECHO) "TestDisableEnable2 sendSucceed cim:cql"
- @$(PROGRAM) sendSucceed cim:cql
+ @$(ECHO) "TestDisableEnable2 setup CIM:CQL"
+ @$(PROGRAM) setup CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendFail CIM:CQL"
+ @$(PROGRAM) sendFail CIM:CQL
+ @$(ECHO) "TestDisableEnable2 create CIM:CQL"
+ @$(PROGRAM) create CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed CIM:CQL"
+ @$(PROGRAM) sendSucceed CIM:CQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock cim:cql"
- @$(PROGRAM) sendBlock cim:cql
- @$(ECHO) "TestDisableEnable2 delete cim:cql"
- @$(PROGRAM) delete cim:cql
- @$(ECHO) "TestDisableEnable2 sendBlock cim:cql"
- @$(PROGRAM) sendBlock cim:cql
+ @$(ECHO) "TestDisableEnable2 sendBlock CIM:CQL"
+ @$(PROGRAM) sendBlock CIM:CQL
+ @$(ECHO) "TestDisableEnable2 delete CIM:CQL"
+ @$(PROGRAM) delete CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendBlock CIM:CQL"
+ @$(PROGRAM) sendBlock CIM:CQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendFail cim:cql"
- @$(PROGRAM) sendFail cim:cql
- @$(ECHO) "TestDisableEnable2 create cim:cql"
- @$(PROGRAM) create cim:cql
- @$(ECHO) "TestDisableEnable2 sendSucceed cim:cql"
- @$(PROGRAM) sendSucceed cim:cql
+ @$(ECHO) "TestDisableEnable2 sendFail CIM:CQL"
+ @$(PROGRAM) sendFail CIM:CQL
+ @$(ECHO) "TestDisableEnable2 create CIM:CQL"
+ @$(PROGRAM) create CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed CIM:CQL"
+ @$(PROGRAM) sendSucceed CIM:CQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock cim:cql"
- @$(PROGRAM) sendBlock cim:cql
+ @$(ECHO) "TestDisableEnable2 sendBlock CIM:CQL"
+ @$(PROGRAM) sendBlock CIM:CQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendSucceed cim:cql"
- @$(PROGRAM) sendSucceed cim:cql
- @$(ECHO) "TestDisableEnable2 delete cim:cql"
- @$(PROGRAM) delete cim:cql
- @$(ECHO) "TestDisableEnable2 sendFail cim:cql"
- @$(PROGRAM) sendFail cim:cql
- @$(ECHO) "TestDisableEnable2 cleanup cim:cql"
- @$(PROGRAM) cleanup cim:cql
+ @$(ECHO) "TestDisableEnable2 sendSucceed CIM:CQL"
+ @$(PROGRAM) sendSucceed CIM:CQL
+ @$(ECHO) "TestDisableEnable2 delete CIM:CQL"
+ @$(PROGRAM) delete CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendFail CIM:CQL"
+ @$(PROGRAM) sendFail CIM:CQL
+ @$(ECHO) "TestDisableEnable2 cleanup CIM:CQL"
+ @$(PROGRAM) cleanup CIM:CQL
endif
- @$(ECHO) "TestDisableEnable2 setup2 wql"
- @$(PROGRAM) setup2 wql
- @$(ECHO) "TestDisableEnable2 sendFail wql"
- @$(PROGRAM) sendFail wql
- @$(ECHO) "TestDisableEnable2 create2 wql"
- @$(PROGRAM) create2 wql
- @$(ECHO) "TestDisableEnable2 sendSucceed wql"
- @$(PROGRAM) sendSucceed wql
+ @$(ECHO) "TestDisableEnable2 setup2 WQL"
+ @$(PROGRAM) setup2 WQL
+ @$(ECHO) "TestDisableEnable2 sendFail WQL"
+ @$(PROGRAM) sendFail WQL
+ @$(ECHO) "TestDisableEnable2 create2 WQL"
+ @$(PROGRAM) create2 WQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed WQL"
+ @$(PROGRAM) sendSucceed WQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock wql"
- @$(PROGRAM) sendBlock wql
- @$(ECHO) "TestDisableEnable2 delete2 wql"
- @$(PROGRAM) delete2 wql
- @$(ECHO) "TestDisableEnable2 sendBlock wql"
- @$(PROGRAM) sendBlock wql
+ @$(ECHO) "TestDisableEnable2 sendBlock WQL"
+ @$(PROGRAM) sendBlock WQL
+ @$(ECHO) "TestDisableEnable2 delete2 WQL"
+ @$(PROGRAM) delete2 WQL
+ @$(ECHO) "TestDisableEnable2 sendBlock WQL"
+ @$(PROGRAM) sendBlock WQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendFail wql"
- @$(PROGRAM) sendFail wql
- @$(ECHO) "TestDisableEnable2 create2 wql"
- @$(PROGRAM) create2 wql
- @$(ECHO) "TestDisableEnable2 sendSucceed wql"
- @$(PROGRAM) sendSucceed wql
+ @$(ECHO) "TestDisableEnable2 sendFail WQL"
+ @$(PROGRAM) sendFail WQL
+ @$(ECHO) "TestDisableEnable2 create2 WQL"
+ @$(PROGRAM) create2 WQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed WQL"
+ @$(PROGRAM) sendSucceed WQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock wql"
- @$(PROGRAM) sendBlock wql
+ @$(ECHO) "TestDisableEnable2 sendBlock WQL"
+ @$(PROGRAM) sendBlock WQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendSucceed wql"
- @$(PROGRAM) sendSucceed wql
- @$(ECHO) "TestDisableEnable2 delete2 wql"
- @$(PROGRAM) delete2 wql
- @$(ECHO) "TestDisableEnable2 sendFail wql"
- @$(PROGRAM) sendFail wql
- @$(ECHO) "TestDisableEnable2 cleanup2 wql"
- @$(PROGRAM) cleanup2 wql
+ @$(ECHO) "TestDisableEnable2 sendSucceed WQL"
+ @$(PROGRAM) sendSucceed WQL
+ @$(ECHO) "TestDisableEnable2 delete2 WQL"
+ @$(PROGRAM) delete2 WQL
+ @$(ECHO) "TestDisableEnable2 sendFail WQL"
+ @$(PROGRAM) sendFail WQL
+ @$(ECHO) "TestDisableEnable2 cleanup2 WQL"
+ @$(PROGRAM) cleanup2 WQL
ifndef PEGASUS_DISABLE_CQL
- @$(ECHO) "TestDisableEnable2 setup2 cim:cql"
- @$(PROGRAM) setup2 cim:cql
- @$(ECHO) "TestDisableEnable2 sendFail cim:cql"
- @$(PROGRAM) sendFail cim:cql
- @$(ECHO) "TestDisableEnable2 create2 cim:cql"
- @$(PROGRAM) create2 cim:cql
- @$(ECHO) "TestDisableEnable2 sendSucceed cim:cql"
- @$(PROGRAM) sendSucceed cim:cql
+ @$(ECHO) "TestDisableEnable2 setup2 CIM:CQL"
+ @$(PROGRAM) setup2 CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendFail CIM:CQL"
+ @$(PROGRAM) sendFail CIM:CQL
+ @$(ECHO) "TestDisableEnable2 create2 CIM:CQL"
+ @$(PROGRAM) create2 CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed CIM:CQL"
+ @$(PROGRAM) sendSucceed CIM:CQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock cim:cql"
- @$(PROGRAM) sendBlock cim:cql
- @$(ECHO) "TestDisableEnable2 delete2 cim:cql"
- @$(PROGRAM) delete2 cim:cql
- @$(ECHO) "TestDisableEnable2 sendBlock cim:cql"
- @$(PROGRAM) sendBlock cim:cql
+ @$(ECHO) "TestDisableEnable2 sendBlock CIM:CQL"
+ @$(PROGRAM) sendBlock CIM:CQL
+ @$(ECHO) "TestDisableEnable2 delete2 CIM:CQL"
+ @$(PROGRAM) delete2 CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendBlock CIM:CQL"
+ @$(PROGRAM) sendBlock CIM:CQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendFail cim:cql"
- @$(PROGRAM) sendFail cim:cql
- @$(ECHO) "TestDisableEnable2 create2 cim:cql"
- @$(PROGRAM) create2 cim:cql
- @$(ECHO) "TestDisableEnable2 sendSucceed cim:cql"
- @$(PROGRAM) sendSucceed cim:cql
+ @$(ECHO) "TestDisableEnable2 sendFail CIM:CQL"
+ @$(PROGRAM) sendFail CIM:CQL
+ @$(ECHO) "TestDisableEnable2 create2 CIM:CQL"
+ @$(PROGRAM) create2 CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendSucceed CIM:CQL"
+ @$(PROGRAM) sendSucceed CIM:CQL
cimprovider -d -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendBlock cim:cql"
- @$(PROGRAM) sendBlock cim:cql
+ @$(ECHO) "TestDisableEnable2 sendBlock CIM:CQL"
+ @$(PROGRAM) sendBlock CIM:CQL
cimprovider -e -m RT_IndicationProviderModule
- @$(ECHO) "TestDisableEnable2 sendSucceed cim:cql"
- @$(PROGRAM) sendSucceed cim:cql
- @$(ECHO) "TestDisableEnable2 delete2 cim:cql"
- @$(PROGRAM) delete2 cim:cql
- @$(ECHO) "TestDisableEnable2 sendFail cim:cql"
- @$(PROGRAM) sendFail cim:cql
- @$(ECHO) "TestDisableEnable2 cleanup2 cim:cql"
- @$(PROGRAM) cleanup2 cim:cql
+ @$(ECHO) "TestDisableEnable2 sendSucceed CIM:CQL"
+ @$(PROGRAM) sendSucceed CIM:CQL
+ @$(ECHO) "TestDisableEnable2 delete2 CIM:CQL"
+ @$(PROGRAM) delete2 CIM:CQL
+ @$(ECHO) "TestDisableEnable2 sendFail CIM:CQL"
+ @$(PROGRAM) sendFail CIM:CQL
+ @$(ECHO) "TestDisableEnable2 cleanup2 CIM:CQL"
+ @$(PROGRAM) cleanup2 CIM:CQL
endif
@$(ECHO) "+++++ TestDisableEnable2 passed all tests"
diff --git a/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile b/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile
index 799b655..97f69d7 100644
--- a/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile
+++ b/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile
@@ -48,148 +48,148 @@ include $(ROOT)/mak/program.mak
tests:
poststarttests:
- @$(ECHO) "TestProcessIndication setup wql"
- @$(PROGRAM) setup wql
- @$(ECHO) "TestProcessIndication create1 wql"
- @$(PROGRAM) create1 wql
- @$(ECHO) "TestProcessIndication sendNormal wql"
- @$(PROGRAM) sendNormal wql
- @$(ECHO) "TestProcessIndication checkNormal wql"
- @$(PROGRAM) checkNormal wql
- @$(ECHO) "TestProcessIndication sendSubclass wql"
- @$(PROGRAM) sendSubclass wql
- @$(ECHO) "TestProcessIndication checkSubclass wql"
- @$(PROGRAM) checkSubclass wql
- @$(ECHO) "TestProcessIndication sendMissing wql"
- @$(PROGRAM) sendMissing wql
- @$(ECHO) "TestProcessIndication checkMissing wql"
- @$(PROGRAM) checkMissing wql
- @$(ECHO) "TestProcessIndication sendExtra wql"
- @$(PROGRAM) sendExtra wql
- @$(ECHO) "TestProcessIndication checkExtra wql"
- @$(PROGRAM) checkExtra wql
- @$(ECHO) "TestProcessIndication sendMatching wql"
- @$(PROGRAM) sendMatching wql
- @$(ECHO) "TestProcessIndication checkMatching wql"
- @$(PROGRAM) checkMatching wql
- @$(ECHO) "TestProcessIndication sendUnmatchingNamespace wql"
- @$(PROGRAM) sendUnmatchingNamespace wql
- @$(ECHO) "TestProcessIndication checkUnmatchingNamespace wql"
- @$(PROGRAM) checkUnmatchingNamespace wql
- @$(ECHO) "TestProcessIndication sendUnmatchingClassName wql"
- @$(PROGRAM) sendUnmatchingClassName wql
- @$(ECHO) "TestProcessIndication checkUnmatchingClassName wql"
- @$(PROGRAM) checkUnmatchingClassName wql
- @$(ECHO) "TestProcessIndication delete1 wql"
- @$(PROGRAM) delete1 wql
- @$(ECHO) "TestProcessIndication create2 wql"
- @$(PROGRAM) create2 wql
- @$(ECHO) "TestProcessIndication sendNormal wql"
- @$(PROGRAM) sendNormal wql
- @$(ECHO) "TestProcessIndication checkNormalAll wql"
- @$(PROGRAM) checkNormalAll wql
- @$(ECHO) "TestProcessIndication sendMissing wql"
- @$(PROGRAM) sendMissing wql
- @$(ECHO) "TestProcessIndication checkMissingAll wql"
- @$(PROGRAM) checkMissingAll wql
- @$(ECHO) "TestProcessIndication sendExtra wql"
- @$(PROGRAM) sendExtra wql
- @$(ECHO) "TestProcessIndication checkExtraAll wql"
- @$(PROGRAM) checkExtraAll wql
- @$(ECHO) "TestProcessIndication delete2 wql"
- @$(PROGRAM) delete2 wql
- @$(ECHO) "TestProcessIndication cleanup wql"
- @$(PROGRAM) cleanup wql
- @$(ECHO) "TestProcessIndication setup cim:cql"
- @$(PROGRAM) setup cim:cql
- @$(ECHO) "TestProcessIndication create1 cim:cql"
- @$(PROGRAM) create1 cim:cql
- @$(ECHO) "TestProcessIndication sendNormal cim:cql"
- @$(PROGRAM) sendNormal cim:cql
- @$(ECHO) "TestProcessIndication checkNormal cim:cql"
- @$(PROGRAM) checkNormal cim:cql
- @$(ECHO) "TestProcessIndication sendSubclass cim:cql"
- @$(PROGRAM) sendSubclass cim:cql
- @$(ECHO) "TestProcessIndication checkSubclass cim:cql"
- @$(PROGRAM) checkSubclass cim:cql
- @$(ECHO) "TestProcessIndication sendMissing cim:cql"
- @$(PROGRAM) sendMissing cim:cql
- @$(ECHO) "TestProcessIndication checkMissing cim:cql"
- @$(PROGRAM) checkMissing cim:cql
- @$(ECHO) "TestProcessIndication sendExtra cim:cql"
- @$(PROGRAM) sendExtra cim:cql
- @$(ECHO) "TestProcessIndication checkExtra cim:cql"
- @$(PROGRAM) checkExtra cim:cql
- @$(ECHO) "TestProcessIndication sendMatching cim:cql"
- @$(PROGRAM) sendMatching cim:cql
- @$(ECHO) "TestProcessIndication checkMatching cim:cql"
- @$(PROGRAM) checkMatching cim:cql
- @$(ECHO) "TestProcessIndication sendUnmatchingNamespace cim:cql"
- @$(PROGRAM) sendUnmatchingNamespace cim:cql
- @$(ECHO) "TestProcessIndication checkUnmatchingNamespace cim:cql"
- @$(PROGRAM) checkUnmatchingNamespace cim:cql
- @$(ECHO) "TestProcessIndication sendUnmatchingClassName cim:cql"
- @$(PROGRAM) sendUnmatchingClassName cim:cql
- @$(ECHO) "TestProcessIndication checkUnmatchingClassName cim:cql"
- @$(PROGRAM) checkUnmatchingClassName cim:cql
- @$(ECHO) "TestProcessIndication delete1 cim:cql"
- @$(PROGRAM) delete1 cim:cql
- @$(ECHO) "TestProcessIndication create2 cim:cql"
- @$(PROGRAM) create2 cim:cql
- @$(ECHO) "TestProcessIndication sendNormal cim:cql"
- @$(PROGRAM) sendNormal cim:cql
- @$(ECHO) "TestProcessIndication checkNormalAll cim:cql"
- @$(PROGRAM) checkNormalAll cim:cql
- @$(ECHO) "TestProcessIndication sendMissing cim:cql"
- @$(PROGRAM) sendMissing cim:cql
- @$(ECHO) "TestProcessIndication checkMissingAll cim:cql"
- @$(PROGRAM) checkMissingAll cim:cql
- @$(ECHO) "TestProcessIndication sendExtra cim:cql"
- @$(PROGRAM) sendExtra cim:cql
- @$(ECHO) "TestProcessIndication checkExtraAll cim:cql"
- @$(PROGRAM) checkExtraAll cim:cql
- @$(ECHO) "TestProcessIndication delete2 cim:cql"
- @$(PROGRAM) delete2 cim:cql
- @$(ECHO) "TestProcessIndication create3 cim:cql"
- @$(PROGRAM) create3 cim:cql
- @$(ECHO) "TestProcessIndication sendNormal cim:cql"
- @$(PROGRAM) sendNormal cim:cql
- @$(ECHO) "TestProcessIndication checkNormalWhere cim:cql"
- @$(PROGRAM) checkNormalWhere cim:cql
- @$(ECHO) "TestProcessIndication sendMissing cim:cql"
- @$(PROGRAM) sendMissing cim:cql
- @$(ECHO) "TestProcessIndication checkMissingWhere cim:cql"
- @$(PROGRAM) checkMissingWhere cim:cql
- @$(ECHO) "TestProcessIndication delete3 cim:cql"
- @$(PROGRAM) delete3 cim:cql
- @$(ECHO) "TestProcessIndication create4 cim:cql"
- @$(PROGRAM) create4 cim:cql
- @$(ECHO) "TestProcessIndication sendNormal cim:cql"
- @$(PROGRAM) sendNormal cim:cql
- @$(ECHO) "TestProcessIndication checkNormalWhereNotSatisfied cim:cql"
- @$(PROGRAM) checkNormalWhereNotSatisfied cim:cql
- @$(ECHO) "TestProcessIndication sendMissing cim:cql"
- @$(PROGRAM) sendMissing cim:cql
- @$(ECHO) "TestProcessIndication checkMissingWhere cim:cql"
- @$(PROGRAM) checkMissingWhere cim:cql
- @$(ECHO) "TestProcessIndication delete4 cim:cql"
- @$(PROGRAM) delete4 cim:cql
- @$(ECHO) "TestProcessIndication cleanup cim:cql"
- @$(PROGRAM) cleanup cim:cql
+ @$(ECHO) "TestProcessIndication setup WQL"
+ @$(PROGRAM) setup WQL
+ @$(ECHO) "TestProcessIndication create1 WQL"
+ @$(PROGRAM) create1 WQL
+ @$(ECHO) "TestProcessIndication sendNormal WQL"
+ @$(PROGRAM) sendNormal WQL
+ @$(ECHO) "TestProcessIndication checkNormal WQL"
+ @$(PROGRAM) checkNormal WQL
+ @$(ECHO) "TestProcessIndication sendSubclass WQL"
+ @$(PROGRAM) sendSubclass WQL
+ @$(ECHO) "TestProcessIndication checkSubclass WQL"
+ @$(PROGRAM) checkSubclass WQL
+ @$(ECHO) "TestProcessIndication sendMissing WQL"
+ @$(PROGRAM) sendMissing WQL
+ @$(ECHO) "TestProcessIndication checkMissing WQL"
+ @$(PROGRAM) checkMissing WQL
+ @$(ECHO) "TestProcessIndication sendExtra WQL"
+ @$(PROGRAM) sendExtra WQL
+ @$(ECHO) "TestProcessIndication checkExtra WQL"
+ @$(PROGRAM) checkExtra WQL
+ @$(ECHO) "TestProcessIndication sendMatching WQL"
+ @$(PROGRAM) sendMatching WQL
+ @$(ECHO) "TestProcessIndication checkMatching WQL"
+ @$(PROGRAM) checkMatching WQL
+ @$(ECHO) "TestProcessIndication sendUnmatchingNamespace WQL"
+ @$(PROGRAM) sendUnmatchingNamespace WQL
+ @$(ECHO) "TestProcessIndication checkUnmatchingNamespace WQL"
+ @$(PROGRAM) checkUnmatchingNamespace WQL
+ @$(ECHO) "TestProcessIndication sendUnmatchingClassName WQL"
+ @$(PROGRAM) sendUnmatchingClassName WQL
+ @$(ECHO) "TestProcessIndication checkUnmatchingClassName WQL"
+ @$(PROGRAM) checkUnmatchingClassName WQL
+ @$(ECHO) "TestProcessIndication delete1 WQL"
+ @$(PROGRAM) delete1 WQL
+ @$(ECHO) "TestProcessIndication create2 WQL"
+ @$(PROGRAM) create2 WQL
+ @$(ECHO) "TestProcessIndication sendNormal WQL"
+ @$(PROGRAM) sendNormal WQL
+ @$(ECHO) "TestProcessIndication checkNormalAll WQL"
+ @$(PROGRAM) checkNormalAll WQL
+ @$(ECHO) "TestProcessIndication sendMissing WQL"
+ @$(PROGRAM) sendMissing WQL
+ @$(ECHO) "TestProcessIndication checkMissingAll WQL"
+ @$(PROGRAM) checkMissingAll WQL
+ @$(ECHO) "TestProcessIndication sendExtra WQL"
+ @$(PROGRAM) sendExtra WQL
+ @$(ECHO) "TestProcessIndication checkExtraAll WQL"
+ @$(PROGRAM) checkExtraAll WQL
+ @$(ECHO) "TestProcessIndication delete2 WQL"
+ @$(PROGRAM) delete2 WQL
+ @$(ECHO) "TestProcessIndication cleanup WQL"
+ @$(PROGRAM) cleanup WQL
+ @$(ECHO) "TestProcessIndication setup CIM:CQL"
+ @$(PROGRAM) setup CIM:CQL
+ @$(ECHO) "TestProcessIndication create1 CIM:CQL"
+ @$(PROGRAM) create1 CIM:CQL
+ @$(ECHO) "TestProcessIndication sendNormal CIM:CQL"
+ @$(PROGRAM) sendNormal CIM:CQL
+ @$(ECHO) "TestProcessIndication checkNormal CIM:CQL"
+ @$(PROGRAM) checkNormal CIM:CQL
+ @$(ECHO) "TestProcessIndication sendSubclass CIM:CQL"
+ @$(PROGRAM) sendSubclass CIM:CQL
+ @$(ECHO) "TestProcessIndication checkSubclass CIM:CQL"
+ @$(PROGRAM) checkSubclass CIM:CQL
+ @$(ECHO) "TestProcessIndication sendMissing CIM:CQL"
+ @$(PROGRAM) sendMissing CIM:CQL
+ @$(ECHO) "TestProcessIndication checkMissing CIM:CQL"
+ @$(PROGRAM) checkMissing CIM:CQL
+ @$(ECHO) "TestProcessIndication sendExtra CIM:CQL"
+ @$(PROGRAM) sendExtra CIM:CQL
+ @$(ECHO) "TestProcessIndication checkExtra CIM:CQL"
+ @$(PROGRAM) checkExtra CIM:CQL
+ @$(ECHO) "TestProcessIndication sendMatching CIM:CQL"
+ @$(PROGRAM) sendMatching CIM:CQL
+ @$(ECHO) "TestProcessIndication checkMatching CIM:CQL"
+ @$(PROGRAM) checkMatching CIM:CQL
+ @$(ECHO) "TestProcessIndication sendUnmatchingNamespace CIM:CQL"
+ @$(PROGRAM) sendUnmatchingNamespace CIM:CQL
+ @$(ECHO) "TestProcessIndication checkUnmatchingNamespace CIM:CQL"
+ @$(PROGRAM) checkUnmatchingNamespace CIM:CQL
+ @$(ECHO) "TestProcessIndication sendUnmatchingClassName CIM:CQL"
+ @$(PROGRAM) sendUnmatchingClassName CIM:CQL
+ @$(ECHO) "TestProcessIndication checkUnmatchingClassName CIM:CQL"
+ @$(PROGRAM) checkUnmatchingClassName CIM:CQL
+ @$(ECHO) "TestProcessIndication delete1 CIM:CQL"
+ @$(PROGRAM) delete1 CIM:CQL
+ @$(ECHO) "TestProcessIndication create2 CIM:CQL"
+ @$(PROGRAM) create2 CIM:CQL
+ @$(ECHO) "TestProcessIndication sendNormal CIM:CQL"
+ @$(PROGRAM) sendNormal CIM:CQL
+ @$(ECHO) "TestProcessIndication checkNormalAll CIM:CQL"
+ @$(PROGRAM) checkNormalAll CIM:CQL
+ @$(ECHO) "TestProcessIndication sendMissing CIM:CQL"
+ @$(PROGRAM) sendMissing CIM:CQL
+ @$(ECHO) "TestProcessIndication checkMissingAll CIM:CQL"
+ @$(PROGRAM) checkMissingAll CIM:CQL
+ @$(ECHO) "TestProcessIndication sendExtra CIM:CQL"
+ @$(PROGRAM) sendExtra CIM:CQL
+ @$(ECHO) "TestProcessIndication checkExtraAll CIM:CQL"
+ @$(PROGRAM) checkExtraAll CIM:CQL
+ @$(ECHO) "TestProcessIndication delete2 CIM:CQL"
+ @$(PROGRAM) delete2 CIM:CQL
+ @$(ECHO) "TestProcessIndication create3 CIM:CQL"
+ @$(PROGRAM) create3 CIM:CQL
+ @$(ECHO) "TestProcessIndication sendNormal CIM:CQL"
+ @$(PROGRAM) sendNormal CIM:CQL
+ @$(ECHO) "TestProcessIndication checkNormalWhere CIM:CQL"
+ @$(PROGRAM) checkNormalWhere CIM:CQL
+ @$(ECHO) "TestProcessIndication sendMissing CIM:CQL"
+ @$(PROGRAM) sendMissing CIM:CQL
+ @$(ECHO) "TestProcessIndication checkMissingWhere CIM:CQL"
+ @$(PROGRAM) checkMissingWhere CIM:CQL
+ @$(ECHO) "TestProcessIndication delete3 CIM:CQL"
+ @$(PROGRAM) delete3 CIM:CQL
+ @$(ECHO) "TestProcessIndication create4 CIM:CQL"
+ @$(PROGRAM) create4 CIM:CQL
+ @$(ECHO) "TestProcessIndication sendNormal CIM:CQL"
+ @$(PROGRAM) sendNormal CIM:CQL
+ @$(ECHO) "TestProcessIndication checkNormalWhereNotSatisfied CIM:CQL"
+ @$(PROGRAM) checkNormalWhereNotSatisfied CIM:CQL
+ @$(ECHO) "TestProcessIndication sendMissing CIM:CQL"
+ @$(PROGRAM) sendMissing CIM:CQL
+ @$(ECHO) "TestProcessIndication checkMissingWhere CIM:CQL"
+ @$(PROGRAM) checkMissingWhere CIM:CQL
+ @$(ECHO) "TestProcessIndication delete4 CIM:CQL"
+ @$(PROGRAM) delete4 CIM:CQL
+ @$(ECHO) "TestProcessIndication cleanup CIM:CQL"
+ @$(PROGRAM) cleanup CIM:CQL
@$(ECHO) "+++++ TestProcessIndication passed all tests"
IndInit_TS1a:
- @$(ECHO) "TestProcessIndication setup wql"
- @$(PROGRAM) setup wql
- @$(ECHO) "TestProcessIndication create1 wql"
- @$(PROGRAM) create1 wql
- @$(ECHO) "TestProcessIndication create2 wql"
- @$(PROGRAM) create2 wql
+ @$(ECHO) "TestProcessIndication setup WQL"
+ @$(PROGRAM) setup WQL
+ @$(ECHO) "TestProcessIndication create1 WQL"
+ @$(PROGRAM) create1 WQL
+ @$(ECHO) "TestProcessIndication create2 WQL"
+ @$(PROGRAM) create2 WQL
IndInit_TS1b:
- @$(ECHO) "TestProcessIndication delete1 wql"
- @$(PROGRAM) delete1 wql
- @$(ECHO) "TestProcessIndication delete2 wql"
- @$(PROGRAM) delete2 wql
- @$(ECHO) "TestProcessIndication cleanup wql"
- @$(PROGRAM) cleanup wql
+ @$(ECHO) "TestProcessIndication delete1 WQL"
+ @$(PROGRAM) delete1 WQL
+ @$(ECHO) "TestProcessIndication delete2 WQL"
+ @$(PROGRAM) delete2 WQL
+ @$(ECHO) "TestProcessIndication cleanup WQL"
+ @$(PROGRAM) cleanup WQL
diff --git a/src/Pegasus/IndicationService/tests/ProcessIndication/ProcessIndication.cpp b/src/Pegasus/IndicationService/tests/ProcessIndication/ProcessIndication.cpp
index 969b6e2..3f1984f 100644
--- a/src/Pegasus/IndicationService/tests/ProcessIndication/ProcessIndication.cpp
+++ b/src/Pegasus/IndicationService/tests/ProcessIndication/ProcessIndication.cpp
@@ -219,7 +219,7 @@ Boolean _checkIndicationLog
}
if (String::equalNoCase (propertyName, "IndicationIdentifier"))
{
- if(String::equalNoCase(qlang, "cim:cql"))
+ if (qlang == "CIM:CQL")
{
id += 10;
}
@@ -553,7 +553,7 @@ void _usage ()
<< "| checkNormalAll | checkMissingAll | checkExtraAll "
<< "| checkNormalWhere | checkMissingWhere "
<< "| checkNormalWhereNotSatisfied "
- << "| delete1 | delete2 | delete3 | delete4 | cleanup} {wql | cim:cql}"
+ << "| delete1 | delete2 | delete3 | delete4 | cleanup} {WQL | CIM:CQL}"
<< PEGASUS_STD (endl);
}
@@ -573,7 +573,7 @@ void _setup (CIMClient & client, String& qlang)
// Filter03 and Filter04 are not created for WQL because WQL does not
// support array properties in the WHERE clause
//
- if (!String::equalNoCase (qlang, "wql"))
+ if (qlang != "WQL")
{
//
// The following filters are used to test that only properties
@@ -973,7 +973,7 @@ void _cleanup (CIMClient & client, String & qlang)
// Filter03 and Filter04 are not created for WQL because WQL does not
// support array properties in the WHERE clause
//
- if (!String::equalNoCase (qlang, "wql"))
+ if (qlang != "WQL")
{
_deleteFilterInstance (client, String ("PIFilter03"));
_deleteFilterInstance (client, String ("PIFilter04"));
@@ -1236,7 +1236,7 @@ int main (int argc, char** argv)
String qlang(optLang);
#ifdef PEGASUS_DISABLE_CQL
- if (String::equalNoCase(qlang, "cim:cql"))
+ if (qlang == "CIM:CQL")
{
PEGASUS_STD (cout) << "+++++ cql test disabled" << PEGASUS_STD (endl);
return 0;
diff --git a/src/Pegasus/IndicationService/tests/Subscription/Subscription.cpp b/src/Pegasus/IndicationService/tests/Subscription/Subscription.cpp
index 79f3787..75b83e8 100644
--- a/src/Pegasus/IndicationService/tests/Subscription/Subscription.cpp
+++ b/src/Pegasus/IndicationService/tests/Subscription/Subscription.cpp
@@ -2043,7 +2043,7 @@ void _errorQueries (CIMClient & client, String& qlang)
catch (CIMException & e)
{
#ifdef PEGASUS_DISABLE_CQL
- if (String::equalNoCase(qlang, "cim:cql"))
+ if (qlang == "CIM:CQL")
{
// If CQL is disabled, then a non-supported error
// for invalid language is expected.
diff --git a/src/Pegasus/Query/QueryExpression/QueryExpression.cpp b/src/Pegasus/Query/QueryExpression/QueryExpression.cpp
index a1c5115..5c91fe1 100644
--- a/src/Pegasus/Query/QueryExpression/QueryExpression.cpp
+++ b/src/Pegasus/Query/QueryExpression/QueryExpression.cpp
@@ -58,7 +58,7 @@ QueryExpression::QueryExpression(String queryLang, String query, QueryContext& c
String cql("CIM:CQL");
String wql("WQL");
- if(String::compareNoCase(queryLang,cql) == 0)
+ if (queryLang == cql)
{
CQLSelectStatement* cqlss = new CQLSelectStatement(queryLang, query, ctx);
@@ -71,7 +71,7 @@ QueryExpression::QueryExpression(String queryLang, String query, QueryContext& c
_ss = cqlss;
}
- else if(String::compareNoCase(queryLang,wql) == 0)
+ else if (queryLang == wql)
{
WQLSelectStatement* wqlss = new WQLSelectStatement(queryLang, query, ctx);
@@ -95,7 +95,7 @@ QueryExpression::QueryExpression(String queryLang, String query):
String cql("CIM:CQL");
String wql("WQL");
- if(String::compareNoCase(queryLang,cql) == 0)
+ if (queryLang == cql)
{
CQLSelectStatement* cqlss = new CQLSelectStatement(queryLang, query);
@@ -105,7 +105,7 @@ QueryExpression::QueryExpression(String queryLang, String query):
_ss = cqlss;
}
- else if(String::compareNoCase(queryLang,wql) == 0)
+ else if (queryLang == wql)
{
WQLSelectStatement* wqlss = new WQLSelectStatement(queryLang, query);
@@ -137,13 +137,13 @@ QueryExpression::QueryExpression(const QueryExpression& expr):
String cql("CIM:CQL");
String wql("WQL");
- if(String::compareNoCase(expr._queryLang, cql) == 0)
+ if (expr._queryLang == cql)
{
CQLSelectStatement* tempSS = dynamic_cast<CQLSelectStatement*>(expr._ss);
if (tempSS != NULL)
_ss = new CQLSelectStatement(*tempSS);
}
- else if (String::compareNoCase(expr._queryLang, wql) == 0)
+ else if (expr._queryLang == wql)
{
WQLSelectStatement* tempSS = dynamic_cast<WQLSelectStatement*>(expr._ss);
if (tempSS != NULL)
@@ -172,13 +172,13 @@ QueryExpression QueryExpression::operator=(const QueryExpression& rhs)
String cql("CIM:CQL");
String wql("WQL");
- if(String::compareNoCase(rhs._queryLang, cql) == 0)
+ if (rhs._queryLang == cql)
{
CQLSelectStatement* tempSS = dynamic_cast<CQLSelectStatement*>(rhs._ss);
if (tempSS != NULL)
_ss = new CQLSelectStatement(*tempSS);
}
- else if (String::compareNoCase(rhs._queryLang, wql) == 0)
+ else if (rhs._queryLang == wql)
{
WQLSelectStatement* tempSS = dynamic_cast<WQLSelectStatement*>(rhs._ss);
if (tempSS != NULL)
@@ -389,7 +389,7 @@ void QueryExpression::setQueryContext(QueryContext& inCtx)
String cql("CIM:CQL");
- if(String::compareNoCase(_queryLang, cql) == 0)
+ if (_queryLang == cql)
{
// Now that we have a QueryContext, we can finish compiling
// the CQL statement.
diff --git a/src/Providers/TestProviders/IndicationStressTestProvider/testclient/IndicationStressTest.cpp b/src/Providers/TestProviders/IndicationStressTestProvider/testclient/IndicationStressTest.cpp
index b9b4bda..14d9673 100644
--- a/src/Providers/TestProviders/IndicationStressTestProvider/testclient/IndicationStressTest.cpp
+++ b/src/Providers/TestProviders/IndicationStressTestProvider/testclient/IndicationStressTest.cpp
@@ -472,7 +472,7 @@ void _usage ()
{
cerr << endl
<< "Usage:" << endl
- << "\tTestIndicationStressTest setup [ wql | cim:cql ]" << endl
+ << "\tTestIndicationStressTest setup [ WQL | CIM:CQL ]" << endl
<< "\tTestIndicationStressTest run <indicationSendCount> [<threads>]" << endl
<< "\tTestIndicationStressTest cleanup" << endl
<< "where: " << endl
@@ -693,8 +693,8 @@ int _beginTest(CIMClient& workClient, const char* opt, const char* optTwo, const
if (String::equalNoCase(opt, "setup"))
{
if ((optTwo == NULL) ||
- (!(String::equalNoCase(optTwo, "wql") ||
- String::equalNoCase(optTwo, "cim:cql"))))
+ (!(String::equal(optTwo, "WQL") ||
+ String::equal(optTwo, "CIM:CQL"))))
{
cerr << "Invalid query language: '" << optTwo << "'" << endl;
_usage();
diff --git a/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile b/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile
index 1613b2f..34f165c 100644
--- a/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile
+++ b/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile
@@ -61,7 +61,7 @@ poststarttests: wql_10_1 cql_10_1
@$(ECHO) "+++++ TestIndicationStressTest passed all tests"
wql_10_1:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run 1
$(PROGRAM) run 10 1
$(PROGRAM) cleanup
@@ -75,69 +75,69 @@ wql_10_1:
## will run 20 iterations in 3 threads
##
cql_i_t:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run $i $t
$(PROGRAM) cleanup
wql_i_t:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run $i $t
$(PROGRAM) cleanup
wql_10_10:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run 10 10
$(PROGRAM) cleanup
wql_10_100:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run 10 100
$(PROGRAM) cleanup
wql_100_10:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run 100 10
$(PROGRAM) cleanup
wql_100_100:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run 100 100
$(PROGRAM) cleanup
wql_1000_100:
- $(PROGRAM) setup wql
+ $(PROGRAM) setup WQL
$(PROGRAM) run 1000 100
$(PROGRAM) cleanup
cql_10_1:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run 1
$(PROGRAM) run 10 1
$(PROGRAM) cleanup
cql_10_10:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run 10 10
$(PROGRAM) cleanup
cql_10_100:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run 10 100
$(PROGRAM) cleanup
cql_100_10:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run 100 10
$(PROGRAM) cleanup
cql_100_100:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run 100 100
$(PROGRAM) cleanup
cql_1000_100:
- $(PROGRAM) setup cim:cql
+ $(PROGRAM) setup CIM:CQL
$(PROGRAM) run 1000 100
$(PROGRAM) cleanup
diff --git a/src/Unsupported/LifecycleIndicationProvider/testclient/LifecycleIndication.cpp b/src/Unsupported/LifecycleIndicationProvider/testclient/LifecycleIndication.cpp
index a4403c7..34dcdb6 100644
--- a/src/Unsupported/LifecycleIndicationProvider/testclient/LifecycleIndication.cpp
+++ b/src/Unsupported/LifecycleIndicationProvider/testclient/LifecycleIndication.cpp
@@ -278,7 +278,7 @@ void _usage ()
{
PEGASUS_STD (cerr)
<< "Usage:" << PEGASUS_STD (endl)
- << "\tTestLifecycleIndication setup [ wql | cim:cql ]" << PEGASUS_STD (endl)
+ << "\tTestLifecycleIndication setup [ WQL | CIM:CQL ]" << PEGASUS_STD (endl)
<< "\tTestLifecycleIndication createInstance" << PEGASUS_STD (endl)
<< "\tTestLifecycleIndication deleteInstance" << PEGASUS_STD (endl)
<< "\tTestLifecycleIndication cleanup" << PEGASUS_STD (endl);
@@ -434,7 +434,7 @@ int _test(CIMClient& client, const char* opt, const char* optLang)
{
if (optLang == NULL)
{
- cerr << "Error, query language not specified, must be 'wql' or 'cim:cql'" << endl;
+ cerr << "Error, query language not specified, must be 'WQL' or 'CIM:CQL'" << endl;
_usage ();
return -1;
}
@@ -497,7 +497,7 @@ int main (int argc, char** argv)
}
#ifdef PEGASUS_DISABLE_CQL
- if (String::equalNoCase(qlang, "cim:cql"))
+ if (qlang == "CIM:CQL")
{
PEGASUS_STD (cout) << "+++++ cql test disabled" << PEGASUS_STD (endl);
return 0;
diff --git a/src/Unsupported/LifecycleIndicationProvider/testclient/Makefile b/src/Unsupported/LifecycleIndicationProvider/testclient/Makefile
index db6f89b..cc2a69b 100644
--- a/src/Unsupported/LifecycleIndicationProvider/testclient/Makefile
+++ b/src/Unsupported/LifecycleIndicationProvider/testclient/Makefile
@@ -51,8 +51,8 @@ include $(ROOT)/mak/program.mak
tests:
poststarttests:
- @$(ECHO) "TestLifecycleIndication setup wql"
- @$(PROGRAM) setup wql
+ @$(ECHO) "TestLifecycleIndication setup WQL"
+ @$(PROGRAM) setup WQL
@$(ECHO) "TestLifecycleIndication createInstance"
@$(PROGRAM) createInstance
@$(ECHO) "TestLifecycleIndication createInstance"
@@ -71,8 +71,8 @@ poststarttests:
@$(PROGRAM) deleteInstance
@$(ECHO) "TestLifecycleIndication cleanup"
@$(PROGRAM) cleanup
- @$(ECHO) "TestLifecycleIndication setup cim:cql"
- @$(PROGRAM) setup cim:cql
+ @$(ECHO) "TestLifecycleIndication setup CIM:CQL"
+ @$(PROGRAM) setup CIM:CQL
@$(ECHO) "TestLifecycleIndication createInstance"
@$(PROGRAM) createInstance
@$(ECHO) "TestLifecycleIndication createInstance"