Menu
▾
▴
[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/wbem XMLHostStrTest.java, 1.7, 1.8 CIMBuilder.java, 1.21, 1.22 ParserTest.java, 1.24, 1.25 ModifyInstanceTest.java, 1.7, 1.8 TVPair.java, 1.14, 1.15
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv21848/utst/org/sblim/cimclient/unittest/wbem
Modified Files:
XMLHostStrTest.java CIMBuilder.java ParserTest.java
ModifyInstanceTest.java TVPair.java
Log Message:
3529151 - TCK: CIMInstance property APIs include keys from COP
Index: ModifyInstanceTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/ModifyInstanceTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ModifyInstanceTest.java 12 Jun 2009 02:33:23 -0000 1.7
+++ ModifyInstanceTest.java 6 Sep 2012 19:12:24 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -129,7 +130,8 @@
"TestClass", "root/cimv2")),
mkProp("ClassProp", CIMDataType.CLASS_T, new CIMClass("TestClass", null, null, null,
null)),
- mkProp("InstProp", CIMDataType.OBJECT_T, new CIMInstance(REF_INST_OP, null)) });
+ mkProp("InstProp", CIMDataType.OBJECT_T, new CIMInstance(REF_INST_OP,
+ new CIMProperty<?>[] { KEY_PROP })) });
/**
* testWithPropList
Index: ParserTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/ParserTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ParserTest.java 9 May 2012 14:18:44 -0000 1.24
+++ ParserTest.java 6 Sep 2012 19:12:24 -0000 1.25
@@ -28,6 +28,7 @@
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
* 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -476,14 +477,14 @@
new CIMObjectPath(null, "CL3E2289", null, "root/ibm", "IBMTS_Account",
new CIMProperty[] {
new CIMProperty<String>("SystemName", CIMDataType.STRING_T,
- "icat", false, false, null),
+ "icat", true, false, null),
new CIMProperty<String>("SystemCreationClassName",
- CIMDataType.STRING_T, "IBMTS_Account", false, false,
+ CIMDataType.STRING_T, "IBMTS_Account", true, false,
null),
new CIMProperty<String>("Name", CIMDataType.STRING_T, "dummy1",
- false, false, null),
+ true, false, null),
new CIMProperty<String>("CreationClassName",
- CIMDataType.STRING_T, "IBMTS_Account", false, false,
+ CIMDataType.STRING_T, "IBMTS_Account", true, false,
null) })) }, "data/SVCMethodRsp.smpl0.xml");
/**
Index: TVPair.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/TVPair.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TVPair.java 16 Aug 2010 17:20:50 -0000 1.14
+++ TVPair.java 6 Sep 2012 19:12:24 -0000 1.15
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -25,6 +25,7 @@
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
* 3027615 2010-07-12 blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -173,7 +174,7 @@
private static CIMInstance mkInst(String pKeyStr) {
CIMProperty<String> key = new CIMProperty<String>("Name", CIMDataType.STRING_T, pKeyStr,
true, false, null);
- return new CIMInstance(Common.LOCALPATH.build("Clazz", null, new CIMProperty[] { key }),
+ return new CIMInstance(Common.LOCALPATH.build("Clazz", null, null),
new CIMProperty[] { key });
}
Index: CIMBuilder.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/CIMBuilder.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- CIMBuilder.java 9 May 2012 14:18:44 -0000 1.21
+++ CIMBuilder.java 6 Sep 2012 19:12:24 -0000 1.22
@@ -28,6 +28,7 @@
* 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type
* 3500619 2012-03-16 blaschke-oss JSR48 1.0.0: CIMClass association/key clean up
* 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -462,14 +463,14 @@
public static CIMInstance[] buildInstances() {
if (cInstA != null) return cInstA;
cInstA = new CIMInstance[] {
- new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null,
- getKeyProps(false)), null),
- new CIMInstance(Common.LOCALPATH
- .build("CIMAnythingClass1", null, getKeyProps(true)), null),
- new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null,
- getKeyProps(false)), getAllProps(false)),
- new CIMInstance(Common.LOCALPATH
- .build("CIMAnythingClass1", null, getKeyProps(true)), getAllProps(true)) };
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null, null),
+ getKeyProps(false)),
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass1", null, null),
+ getKeyProps(true)),
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null, null),
+ getAllProps(false)),
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass1", null, null),
+ getAllProps(true)) };
return cInstA;
}
Index: XMLHostStrTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/XMLHostStrTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- XMLHostStrTest.java 12 Jun 2009 02:33:23 -0000 1.7
+++ XMLHostStrTest.java 6 Sep 2012 19:12:24 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -15,8 +15,9 @@
* 1742873 2007-06-25 ebak IPv6 ready cim-client
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -79,12 +80,14 @@
private static final CIMObjectPath INSTANCEPATH = new CIMObjectPath(PROTOCOL, HOST, PORT,
NAMESPACE, CLASSNAME, new CIMProperty[] { new CIMProperty<String>("KeyProp",
- CIMDataType.STRING_T, "Hello") });
+ CIMDataType.STRING_T, "Hello", true, false, null) });
private static final MethodRspChecker METHOD_RSP_CHKR = new MethodRspChecker(new CIMObjectPath(
- PROTOCOL, HOST, PORT, NAMESPACE, CLASSNAME, null),
- new CIMArgument[] { new CIMArgument<CIMObjectPath>("outParam", new CIMDataType(
- CLASSNAME), INSTANCEPATH) }, "data/MethodRspWithReference.xml");
+ PROTOCOL, HOST, PORT, NAMESPACE, CLASSNAME,
+ new CIMProperty[] { new CIMProperty<String>("KeyProp", CIMDataType.STRING_T, "Hello",
+ true, false, null) }), new CIMArgument[] { new CIMArgument<CIMObjectPath>(
+ "outParam", new CIMDataType(CLASSNAME), INSTANCEPATH) },
+ "data/MethodRspWithReference.xml");
@SuppressWarnings("null")
private void checkClassPath(CIMObjectPath pClassPath) {
|
