summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp2
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fc720286293..26a3785c2f0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu May 4 13:36:00 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>
+
+ * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+
+ Eliminated a "magic" constant, used for the number of expected
+ services, because it can vary dependent on the particular TAO
+ configuration, like mincorba, static, etc.
+
Thu May 4 08:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PI/ClientRequestInfo.cpp:
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index 2fb0da61168..1f1a893e011 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -160,10 +160,8 @@ testORBInitializer_Registry (int , ACE_TCHAR *[])
// four other (static) services. The PolicyFactory_Loader,
// ClientRequestInterceptor_Adapter_Factory and PICurrent_Loader are
// registred explicitely, while CodecFactory_Loader - indirectly.
- // Hence the number 5.
ACE_ASSERT (loca_size != one.services_count ());
- ACE_ASSERT (5 == one.services_count ());
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) try global dynamic service"