[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/cim CIMObjectPathTest.java, 1.1.2.14, 1.1.2.15

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv30483/utst/org/sblim/cimclient/unittest/cim

Modified Files:
      Tag: Experimental
	CIMObjectPathTest.java 
Log Message:
3496349 - JSR48 1.0.0: add CIMObjectPath getKeyValue

Index: CIMObjectPathTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim/CIMObjectPathTest.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- CIMObjectPathTest.java	24 Jul 2011 20:41:52 -0000	1.1.2.14
+++ CIMObjectPathTest.java	2 Mar 2012 19:01:54 -0000	1.1.2.15
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2007, 2011
+ * (C) Copyright IBM Corp. 2007, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -24,6 +24,7 @@
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
  * 2944824    2010-02-08  blaschke-oss Missing getXmlSchemaName() in CIMObjectPath
  * 3374012    2011-07-24  blaschke-oss Sblim client CIMObjectPath class defect for LLA format URL
+ * 3496349    2012-03-02  blaschke-oss JSR48 1.0.0: add CIMObjectPath getKeyValue
  */
 
 package org.sblim.cimclient.unittest.cim;
@@ -302,17 +303,23 @@
 		}
 
 		@SuppressWarnings("null")
-		private void equals(StringBuffer pBuf, String pOPName, CIMProperty<?>[] pKeys) {
+		private void equals(StringBuffer pBuf, String pOPName, CIMObjectPath pOP) {
+			CIMProperty<?>[] keys = pOP.getKeys();
 			int refLen = this.iKeys == null ? 0 : this.iKeys.length;
-			int len = pKeys == null ? 0 : pKeys.length;
+			int len = keys == null ? 0 : keys.length;
 			if (refLen != len) {
 				pBuf.append(pOPName + ".getKeys().length = " + len + " != " + refLen + " !!!\n");
 				return;
 			}
 			for (int i = 0; i < len; i++) {
-				CIMProperty<?> refKey = this.iKeys[i], key = pKeys[i];
+				CIMProperty<?> refKey = this.iKeys[i], key = keys[i];
 				if (!refKey.equals(key)) pBuf.append(pOPName + ": idx:" + i + " refKey!=key !!!\n"
 						+ "refKey:" + refKey + "\n   key:" + key + "\n");
+				if (!pOP.getKeyValue(refKey.getName()).equals(pOP.getKeyValue(key.getName()))) pBuf
+						.append(pOPName + ": idx:" + i
+								+ " getKeyValue(refKey)!=getKeyValue(key) !!!\n"
+								+ "getKeyValue(refKey):" + pOP.getKeyValue(refKey.getName())
+								+ "\n   getKeyValue(key):" + pOP.getKeyValue(key.getName()) + "\n");
 			}
 		}
 
@@ -324,7 +331,7 @@
 			equals(strBuf, pName, "getNamespace", this.iNameSpace, pOP.getNamespace());
 			equals(strBuf, pName, "getObjectName", this.iObjName, pOP.getObjectName());
 			equals(strBuf, pName, "getXmlSchemaName", null, pOP.getXmlSchemaName());
-			equals(strBuf, pName, pOP.getKeys());
+			equals(strBuf, pName, pOP);
 			return strBuf.length() == 0 ? null : strBuf.toString();
 		}