[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-370-gab54fbf

[Chris B. <buc...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  ab54fbf546070dba77147ea57f89264d3215989f (commit)
      from  525240d35f40a07d5ae6453b8c876689ac64dd32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab54fbf546070dba77147ea57f89264d3215989f
Author: buccella <buc...@li...>
Date:   Fri Jan 18 10:18:11 2013 -0500

    [ 3601386 ] Add test for EmbeddedObject output

-----------------------------------------------------------------------

Summary of changes:
diff --git a/NEWS b/NEWS
index 880abd6..a4eb74c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Everything in 1.3.17 (see below), plus:
 New features:
 - 3597805 Restart HTTP daemon without restarting SFCB
 - 3597806 Bind to arbitrary list of IP addresses in SFCB
+- 3601386 Add test for EmbeddedObject output
 
 Bugs fixed:
 - 3599526 segfault during ecn with classProviderSf
diff --git a/test/TestProviders/cmpiTestInstanceProvider.c b/test/TestProviders/cmpiTestInstanceProvider.c
index a974de3..eba1812 100644
--- a/test/TestProviders/cmpiTestInstanceProvider.c
+++ b/test/TestProviders/cmpiTestInstanceProvider.c
@@ -103,16 +103,19 @@ initialize()
   CMPIArray      *arr_ptr;
   CMPIValue       value1,
                   value2,
+                  value3,
                   value_inst1,
                   value_inst2;
   CMPIInstance   *instance1,
                  *instance2,
-                 *instance3;
+                 *instance3,
+                 *Einst;
   CMPIObjectPath *cop1,
                  *cop2,
                  *cop3;
   value1.uint8 = 1;
   value2.string = CMNewString(_broker, "Hello World", &rc);
+  value3.string = CMNewString(_broker, "I'm an EmbeddedObject", &rc);
 
   /*
    * create a new array to hold the instances created 
@@ -139,6 +142,13 @@ initialize()
      */
     CMSetProperty(instance1, "Identifier", &value1, CMPI_uint8);
     CMSetProperty(instance1, "Message", &value2, CMPI_string);
+
+    /* EmbeddedObject */
+    Einst = CMNewInstance(_broker, cop1, &rc);
+    CMSetProperty(Einst, "Message", &value3, CMPI_string);
+    CMSetProperty(instance1, "EInst", &Einst, CMPI_instance);
+
+
     value_inst1.inst = instance1;
 
     /*
diff --git a/test/TestProviders/tests/Test1EnumerateInstances.OK b/test/TestProviders/tests/Test1EnumerateInstances.OK
new file mode 100644
index 0000000..e87011f
--- /dev/null
+++ b/test/TestProviders/tests/Test1EnumerateInstances.OK
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+<MESSAGE ID="10001" PROTOCOLVERSION="1.0">
+<SIMPLERSP>
+<IMETHODRESPONSE NAME="EnumerateInstances">
+<IRETURNVALUE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="Sample_Instance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="Sample_Instance">
+<PROPERTY NAME="Identifier" TYPE="uint8">
+<VALUE>1</VALUE>
+</PROPERTY>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+<VALUE><![CDATA[<INSTANCE CLASSNAME="Sample_Instance">
+<PROPERTY NAME="Identifier" TYPE="uint8">
+<VALUE>1</VALUE>
+</PROPERTY>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+</PROPERTY>
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>I&apos;m an EmbeddedObject</VALUE>
+</PROPERTY>
+</INSTANCE>
+]]></VALUE>
+</PROPERTY>
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>Hello World</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="Sample_Instance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="Sample_Instance">
+<PROPERTY NAME="Identifier" TYPE="uint8">
+<VALUE>2</VALUE>
+</PROPERTY>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+</PROPERTY>
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>Yo Planet</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="Sample_Instance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="Sample_Instance">
+<PROPERTY NAME="Identifier" TYPE="uint8">
+<VALUE>3</VALUE>
+</PROPERTY>
+<PROPERTY NAME="Einst" EmbeddedObject="object" TYPE="string">
+</PROPERTY>
+<PROPERTY NAME="Message" TYPE="string">
+<VALUE>Hey Earth</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+</IRETURNVALUE>
+</IMETHODRESPONSE>
+</SIMPLERSP>
+</MESSAGE>
+</CIM>
diff --git a/test/TestProviders/tests/Test1EnumerateInstances.lines b/test/TestProviders/tests/Test1EnumerateInstances.lines
deleted file mode 100644
index 7ae92e7..0000000
--- a/test/TestProviders/tests/Test1EnumerateInstances.lines
+++ /dev/null
@@ -1,43 +0,0 @@
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
-<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>Hello World</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-</INSTANCE>
-</VALUE.NAMEDINSTANCE>
-<VALUE.NAMEDINSTANCE>
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
-<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>Yo Planet</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>2</VALUE>
-</PROPERTY>
-</INSTANCE>
-</VALUE.NAMEDINSTANCE>
-<VALUE.NAMEDINSTANCE>
-<INSTANCENAME CLASSNAME="Sample_Instance">
-<KEYBINDING NAME="Identifier">
-<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>Hey Earth</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>3</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/schema/root/cimv2/Test_Instance.mof b/test/schema/root/cimv2/Test_Instance.mof
index a9a1017..066dd8c 100644
--- a/test/schema/root/cimv2/Test_Instance.mof
+++ b/test/schema/root/cimv2/Test_Instance.mof
@@ -11,4 +11,7 @@ class Sample_Instance : Sample_Class
 {
 	[read, write]
 	string Message;
+
+        [EmbeddedObject]
+        string Einst;
 };


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker