From: Dave B. <bla...@us...> - 2013-09-12 14:18:32
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26892/utst/org/sblim/cimclient/unittest/cim Modified Files: CIMObjectPathTest.java Log Message: 2660 CIMObjectPath.equalsModelPath same as equals Index: CIMObjectPathTest.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim/CIMObjectPathTest.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CIMObjectPathTest.java 6 Sep 2012 19:12:24 -0000 1.18 +++ CIMObjectPathTest.java 12 Sep 2013 14:18:29 -0000 1.19 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2007, 2012 + * (C) Copyright IBM Corp. 2007, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -28,6 +28,7 @@ * 3510090 2012-03-23 blaschke-oss Fix CIMObjectPath.toString() inconsistencies * 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 + * 2660 2013-09-04 blaschke-oss CIMObjectPath.equalsModelPath same as equals */ package org.sblim.cimclient.unittest.cim; @@ -107,6 +108,22 @@ verify("Classname differs", !path1.equals(path2)); } + /** + * testEqualsModelPath + */ + public void testEqualsModelPath() { + CIMObjectPath path1 = new CIMObjectPath("http", "myhost.mydomain.com", "5988", + "root/mynamespace", "CIM_MyClass", new CIMProperty[] { createProperty1a(), + createProperty2a(), createProperty3() }); + + CIMObjectPath path2 = new CIMObjectPath("http", "myhost.mydomain.com", "5988", + "root/myothernamespace", "CIM_MyClass", new CIMProperty[] { createProperty1a(), + createProperty2a(), createProperty3() }); + + verify("Object names do not differ", !path1.equals(path2)); + verify("Model paths differ", path1.equalsModelPath(path2)); + } + /* * Negative test for CIMObjectPath constructor */ |