ChangeLogTag: Thu Jun 26 16:08:03 2003 George Edwards <g.edwards@vanderbilt.edu>

4 files changed, 12 insertions, 48 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 52e28b1b332..6bdf565852a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jun 26 16:08:03 2003  George Edwards <g.edwards@vanderbilt.edu>
+
+        * TAO/tests/OBV/Supports/Supports_Test_impl.cpp:
+        * TAO/tests/OBV/Supports/Supports_Test_impl.h:
+        * TAO/tests/OBV/Supports/Client/client.cpp:
+
+        Enhanced valuetype test by including more complex valuetypes and
+        adding more parameter passing scenarios.
+
 Thu Jun 26 14:30:48 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Objref_VarOut_T.h:
diff --git a/TAO/tests/OBV/Supports/Client/client.cpp b/TAO/tests/OBV/Supports/Client/client.cpp
index 584d372a343..d49fa13aaf5 100644
--- a/TAO/tests/OBV/Supports/Client/client.cpp
+++ b/TAO/tests/OBV/Supports/Client/client.cpp
@@ -94,68 +94,44 @@ main (int argc, char *argv[])
 		ACE_TRY_CHECK;
 		if (CORBA::is_nil (test_graph.in ())) ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::graph obj ref\n"), 1);
 
-    //cout << "pass_vt_graph_in" << endl;
-
 		ACE_ASSERT (test_vt_graph->size () == 3);
 		my_test->pass_vt_graph_in (test_vt_graph.in () ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 		ACE_ASSERT (test_vt_graph->size () == 3);
 
-    //cout << endl;
-
-    //cout << "pass_obj_graph_in" << endl;
-
 		ACE_ASSERT (test_graph->size () == 4);
 		my_test->pass_obj_graph_in (test_graph.in () ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 		ACE_ASSERT (test_graph->size () == 5);
 
-    //cout << endl;
-
     test_vt_graph->add_node ("NEW1");
 
     test_graph->add_node ("NEW2");
 
-    //cout << "pass_vt_graph_out" << endl;
-
     ACE_ASSERT (test_vt_graph->size () == 4);
     my_test->pass_vt_graph_out (test_vt_graph.out () ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 		ACE_ASSERT (test_vt_graph->size () == 4);
 
-    //cout << endl;
-
-    //cout << "pass_obj_graph_out" << endl;
-
 		ACE_ASSERT (test_graph->size () == 6);
 		my_test->pass_obj_graph_out (test_graph.out () ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 		ACE_ASSERT (test_graph->size () == 5);
 
-    //cout << endl;
-
     test_vt_graph->add_node ("NEW2");
 
     test_graph->add_node ("NEW2");
 
-    //cout << "pass_vt_graph_inout" << endl;
-
     ACE_ASSERT (test_vt_graph->size () == 5);
     my_test->pass_vt_graph_inout (test_vt_graph.inout () ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 		ACE_ASSERT (test_vt_graph->size () == 6);
 
-    //cout << endl;
-
-    //cout << "pass_obj_graph_inout" << endl;
-
 		ACE_ASSERT (test_graph->size () == 6);
 		my_test->pass_obj_graph_inout (test_graph.inout () ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 		ACE_ASSERT (test_graph->size () == 7);
 
-    //cout << endl;
-
 		/* Shut down */
 
 		my_test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 47b5c9f816b..6c59b48cd68 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -15,13 +15,12 @@ vt_graph_impl::vt_graph_impl (int num_nodes)
 	for (int i = 0; i < num_nodes; i++)
 		{
 			add_node ("OLD");
-			//if (i != 0) nodes_ ()[i]->add_edge (nodes_ ()[0]);
+			if (i != 0) nodes_ ()[i]->add_edge (nodes_ ()[0]);
 		}
 }
 
 CORBA::Long vt_graph_impl::size (void)
 {
-	//cout << "Num nodes = " << nodes_ ().length () << endl;
 	return nodes_ ().length ();
 }
 
@@ -71,34 +70,24 @@ test_impl::test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb))
 void test_impl::pass_obj_graph_in (Supports_Test::graph * graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  //cout << "pass_obj_graph_in" << endl;
-
   ACE_ASSERT (graph_param->size () == 4);
 	graph_param->add_node ("NEW1");
 	ACE_ASSERT (graph_param->size () == 5);
 
-  //cout << endl;
-
 }
 
 void test_impl::pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  //cout << "pass_vt_graph_in" << endl;
-
 	ACE_ASSERT (vt_graph_param->size () == 3);
 	vt_graph_param->add_node ("NEW1");
 	ACE_ASSERT (vt_graph_param->size () == 4);
 
-  //cout << endl;
-
 }
 
 void test_impl::pass_obj_graph_out (Supports_Test::graph_out graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  //cout << "pass_obj_graph_out" << endl;
-
   vt_graph_impl * the_vt_graph = 0;
   ACE_NEW (the_vt_graph, vt_graph_impl (4));
   graph_param = the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -113,8 +102,6 @@ void test_impl::pass_obj_graph_out (Supports_Test::graph_out graph_param ACE_ENV
 void test_impl::pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  //cout << "pass_vt_graph_out" << endl;
-
   vt_graph_impl * the_vt_graph = 0;
 	ACE_NEW (the_vt_graph, vt_graph_impl (3));
 	vt_graph_param = the_vt_graph;
@@ -123,15 +110,11 @@ void test_impl::pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param AC
 	vt_graph_param->add_node ("NEW1");
 	ACE_ASSERT (vt_graph_param->size () == 4);
 
-  //cout << endl;
-
 }
 
 void test_impl::pass_obj_graph_inout (Supports_Test::graph * &graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  //cout << "pass_obj_graph_inout" << endl;
-
   ACE_ASSERT (graph_param->size () == 6);
 	graph_param->add_node ("NEW!");
 	ACE_ASSERT (graph_param->size () == 7);
@@ -141,14 +124,10 @@ void test_impl::pass_obj_graph_inout (Supports_Test::graph * &graph_param ACE_EN
 void test_impl::pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  //cout << "pass_vt_graph_inout" << endl;
-
 	ACE_ASSERT (vt_graph_param->size () == 5);
 	vt_graph_param->add_node ("NEW!");
 	ACE_ASSERT (vt_graph_param->size () == 6);
 
-  //cout << endl;
-
 }
 
 void test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
@@ -176,6 +155,7 @@ void node_impl::add_edge (Supports_Test::Node * neighbor)
 	degree_ (degree_ () + 1);
 	neighbors_ ().length (neighbors_ ().length () + 1);
 	neighbors_ ()[neighbors_ ().length () - 1] = neighbor;
+  neighbor->_add_ref ();
 	return;
 }
 	
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 2caf64f1de9..346c3eb6e86 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -41,8 +41,7 @@ public:
 class vt_graph_impl :
   public virtual OBV_Supports_Test::vt_graph,
   public virtual POA_Supports_Test::vt_graph,
-  public virtual CORBA::DefaultValueRefCountBase,
-  public virtual PortableServer::ServantBase
+  public virtual CORBA::DefaultValueRefCountBase
 {
 
 public: