summaryrefslogtreecommitdiff
path: root/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/QueryCondition/DDS')
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl14
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc13
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc19
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp418
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc18
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp172
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README40
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml69
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl31
9 files changed, 0 insertions, 794 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
deleted file mode 100644
index de514308408..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL_
-#define BASE_IDL_
-
-struct QueryConditionTest {
- string symbol; //@key
- long iteration;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
deleted file mode 100644
index 351304a0a57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-project(QC_Base_stub) : ndds_ts_defaults, nddslib {
- sharedname = QC_Base_stub
- dynamicflags += NDDS_USER_DLL_EXPORT
- libout = ../descriptors
-
- NDDSTypeSupport_Files {
- Base.idl
- }
-
- Source_Files {
- }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
deleted file mode 100644
index 7a9b9e20b27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
- exename = DDS_receiver
- after += QC_Base_stub
-
- includes += ../Base
-
- libs += QC_Base_stub
- libpaths += ../descriptors
-
- exeout += ../descriptors
-
- Source_Files {
- QC_Receiver.cpp
- }
-
- Header_Files {
- }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
deleted file mode 100644
index 72620a0ce0f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "Base.h"
-#include "BaseSupport.h"
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#define LIBRARY_NAME "QueryCondition_Library"
-#define PROFILE_NAME "QueryConditionProfile"
-
-bool shutdown_flag = false;
-long num_samples = 0;
-long received_samples = 0;
-long expected_samples_run1 = 1 * 2; //only sample 2 should be received of 2 keys
-long expected_samples_run2 = 1 * 2; //only sample 5 should be received o 2 keys
-long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys.
-
-DDSWaitSet* ws_ = new DDSWaitSet ();
-DDS_Duration_t dur_ = {9, 0};
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
- Sleep(sleeptime * 1000);
-#else
- sleep(sleeptime);
-#endif
-}
-
-void check_iter (const QueryConditionTest & sample,
- const DDS_SampleInfo & readinfo,
- const int & run)
-{
- bool error = false;
- if (run == 1)
- {
- //only sample 2 should be received
- error = sample.iteration <= 1 && sample.iteration >= 3;
- }
- else if (run == 2)
- {
- //only samples 8 should be received
- error = sample.iteration <= 4 && sample.iteration >= 6;
- }
- else if (run == 3)
- {
- //all other unread samples.
- error = sample.iteration == 2;
- error |= sample.iteration ==5;
- }
-
- error
- ?
- cerr << "ERROR Received: key <"
- << sample.symbol
- << "> - iteration <"
- << sample.iteration
- << ">"
- << endl
- :
- cout << "Received: key <"
- << sample.symbol
- << "> - iteration <"
- << sample.iteration
- << "> - instance status <"
- << readinfo.instance_state
- << "> - view status <"
- << readinfo.view_state
- << "> - sample status <"
- << readinfo.sample_state
- << ">"
- << endl;
-}
-
-
-void read (DDSDataReader * dr,
- DDSQueryCondition * qc,
- DDSReadCondition * rc,
- const int & run)
-{
- QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr);
-
- DDSConditionSeq cond;
-
- if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT)
- {
- cerr << "ERROR: wait timed out" << endl;
- }
- else
- {
- //wait a moment to allow DDS to write all samples we need here...
- QueryConditionTestSeq data;
- DDS_SampleInfoSeq info_seq;
- sleep_now (3);
- for (DDS_Long i = 0; i < cond.length (); ++i)
- {
- if (run == 3)
- {
- sleep_now (10);
- if (cond[i] == rc)
- {
- received_samples = 0;
-
- // ************** read all in one
- cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl;
- typed_dr->read_w_condition (data,
- info_seq,
- DDS_LENGTH_UNLIMITED,
- rc);
- for (DDS_Long y = 0; y < data.length (); ++y)
- {
- if (info_seq[y].valid_data)
- {
- check_iter (data[y], info_seq[y], run);
- received_samples ++;
- }
- }
- typed_dr->return_loan (data, info_seq);
- if (received_samples != expected_samples_run3)
- {
- cerr << "ERROR: run 3 unexpected number of samples received : "
- << "expected < "
- << expected_samples_run3 << "> - received <"
- << received_samples << ">" << endl;
- }
- // end read all in one
-
- }
- else
- {
- cerr << "ERROR: Should be woken up on ReadCondition" << endl;
- }
- }
- else // run 1 and 2
- {
- if (cond[i] == qc)
- {
- received_samples = 0;
- cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl;
- typed_dr->read_w_condition (data,
- info_seq,
- DDS_LENGTH_UNLIMITED,
- qc);
- for (DDS_Long i = 0; i < data.length (); ++i)
- {
- if (info_seq[i].valid_data)
- {
- check_iter (data[i], info_seq[i], run);
- received_samples ++;
- }
- }
- typed_dr->return_loan (data, info_seq);
-
- if (run == 1)
- {
- if (received_samples != expected_samples_run1)
- {
- cerr << "ERROR: run 1 unexpected number of samples received : "
- << "expected < "
- << expected_samples_run1 << "> - received <"
- << received_samples << ">" << endl;
- }
- }
- else
- {
- if (received_samples != expected_samples_run2)
- {
- cerr << "ERROR: run 2 unexpected number of samples received : "
- << "expected < "
- << expected_samples_run2 << "> - received <"
- << received_samples << ">" << endl;
- }
- }
- }
- else
- {
- cerr << "ERROR: Should be woken up on QueryCondition" << endl;
- }
- }
- }
- if (run != 3)
- {
- }
-
- }
-
- //check if all samples are still available.
- if (run == 3)
- {
- QueryConditionTestSeq data;
- DDS_SampleInfoSeq info_seq;
- sleep_now (3);
- typed_dr->read (data,
- info_seq,
- DDS_LENGTH_UNLIMITED);
- cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <"
- << data.length ()
- << ">"
- << endl;
- for (DDS_Long i = 0; i < data.length (); ++i)
- {
- cout << "Received: key <"
- << data[i].symbol
- << "> - iteration <"
- << data[i].iteration
- << "> - instance status <"
- << info_seq[i].instance_state
- << "> - view status <"
- << info_seq[i].view_state
- << "> - sample status <"
- << info_seq[i].sample_state
- << ">"
- << endl;
- }
- if (data.length () != 18)
- {
- cerr << "ERROR: unexpected number of samples received : "
- << "expected <18> - received <"
- << data.length () << ">" << endl;
- }
- typed_dr->return_loan (data, info_seq);
- }
- sleep_now (5);
-}
-
-int clean_up (DDSDomainParticipant * participant)
-{
- DDS_ReturnCode_t retcode = DDS_RETCODE_OK;
- int main_result = 0;
-
- cout << "RECEIVER: Exiting ..." << endl;
- if (participant) {
- retcode = participant->delete_contained_entities();
- if (retcode != DDS_RETCODE_OK) {
- main_result = 1;
- }
- retcode = DDSDomainParticipantFactory::get_instance()->
- delete_participant(participant);
- if (retcode != DDS_RETCODE_OK) {
- main_result = 1;
- }
- }
- delete ws_;
- DDSDomainParticipantFactory::finalize_instance ();
- return main_result;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
- DDSTopic* topic = 0;
- DDSDataReader* data_reader = 0;
- DDSSubscriber* sub = 0;
- DDS_ReturnCode_t retcode = DDS_RETCODE_OK;
- QueryConditionTestDataReader* typed_dr = 0;
- DDSQueryCondition* qc = 0;
- DDSReadCondition* rc = 0;
- int run = 0;
-
-// NDDS_Config_LogVerbosity n_verbosity =
-// static_cast <NDDS_Config_LogVerbosity> (3);
-// NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-
- const ACE_TCHAR * env_domain_id = 0;
- if (argc > 1)
- {
- env_domain_id = argv[1];
- }
- if (!env_domain_id)
- {
- printf ("Environment variable DEFAULT_DOMAIN_ID not set "
- "=> setting it to 2\n");
- env_domain_id = "2";
- }
- else
- printf ("Domain ID set to %s\n", env_domain_id);
-
- const int domain_id = ACE_OS::atoi (env_domain_id);
- /* Create the domain participant on domain ID 0 */
- DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
- create_participant_with_profile (domain_id, /* Domain ID */
- LIBRARY_NAME, /* QoS */
- PROFILE_NAME,
- 0, /* Listener */
- DDS_STATUS_MASK_NONE);
- if (!participant) {
- cerr << "RECEIVER: Error creating participant" << endl;
- return 1;
- }
-
- retcode = QueryConditionTestTypeSupport::register_type(
- participant, QueryConditionTestTypeSupport::get_type_name ());
-
- if (retcode != DDS_RETCODE_OK) {
- cerr << "RECEIVER: Error registering type" << endl;
- return clean_up (participant);
- }
-
- topic = participant->create_topic_with_profile (
- "QC", /* Topic name*/
- QueryConditionTestTypeSupport::get_type_name (), /* Type name */
- LIBRARY_NAME, /* QoS */
- PROFILE_NAME,
- 0, /* Listener */
- DDS_STATUS_MASK_NONE);
- if (!topic) {
- cerr << "RECEIVER: Error creating topic" << endl;
- return clean_up (participant);
- }
-
- sub = participant->create_subscriber_with_profile (LIBRARY_NAME,
- PROFILE_NAME,
- 0,
- 0);
- if (!sub) {
- cerr << "RECEIVER: Error creating subscriber" << endl;
- return clean_up (participant);
- }
-
- data_reader = sub->create_datareader_with_profile (
- topic,
- LIBRARY_NAME, /* QoS */
- PROFILE_NAME,
- 0, /* Listener */
- DDS_STATUS_MASK_NONE);
- if (!data_reader) {
- cerr << "RECEIVER: Error creating data reader" << endl;
- return clean_up (participant);
- }
-
- typed_dr = QueryConditionTestDataReader::narrow (data_reader);
-
- if (!typed_dr) {
- cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl;
- return clean_up (participant);
- }
-
- const char* PARAMS_RUN_1[] = {"1", "3"};
- DDS_StringSeq parameters_run_1;
- parameters_run_1.from_array (PARAMS_RUN_1, 2);
-
- qc = typed_dr->create_querycondition (
- DDS_NOT_READ_SAMPLE_STATE,
- DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
- DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
- "iteration > %0 AND iteration < %1",
- parameters_run_1);
- if (!qc) {
- cerr << "RECEIVER: Error creating query condition" << endl;
- return clean_up (participant);
- }
- else
- cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl;
-
- ws_->attach_condition (qc);
-
- cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 3." <<endl;
-
- read (data_reader, qc, rc, ++run);
-
- //Second run: change the parameters
- if (qc)
- {
- const char* PARAMS_RUN_2[] = {"4", "6"};
- DDS_StringSeq parameters_run_2;
- parameters_run_2.from_array (PARAMS_RUN_2, 2);
- if (qc->set_query_parameters (parameters_run_2) != DDS_RETCODE_OK)
- {
- cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl;
- return clean_up (participant);
- }
- }
- cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl;
-
- cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <<endl;
-
- read (data_reader, qc, rc, ++run);
- // Third run: Detach querycondition and create read condition instead.
- // Remove the qc from the waitset and create a readcondition and start receiving
- // samples
- if (ws_->detach_condition (qc) != DDS_RETCODE_OK)
- {
- cerr << "RECEIVER: Error detaching query condition" << endl;
- return clean_up (participant);
- }
- cout << "RECEIVER: query condition deleted" << endl;
- cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE,"
- << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,"
- << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl;
-
- // Delete the query condition from the data reader
- typed_dr->delete_readcondition (qc);
- sleep_now(10);
-
- rc = typed_dr->create_readcondition (
- DDS_NOT_READ_SAMPLE_STATE,
- DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
- DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
- if (!rc) {
- cerr << "RECEIVER: Error creating read condition" << endl;
- return clean_up (participant);
- }
-
- if (ws_->attach_condition (rc) != DDS_RETCODE_OK)
- {
- cerr << "RECEIVER: Error attaching read condition" << endl;
- return clean_up (participant);
- }
-
- cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" <<endl;
-
- read (data_reader, qc, rc, ++run);
-
- return clean_up (participant);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
deleted file mode 100644
index a58d846f7cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
- exename = DDS_Sender
- after += QC_Base_stub
-
- includes += ../Base
-
- exeout += ../descriptors
- libs += QC_Base_stub
- libpaths += ../descriptors
-
- Source_Files {
- QC_Sender.cpp
- }
-
- Header_Files {
- }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
deleted file mode 100644
index 3c018dc45f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "Base.h"
-#include "BaseSupport.h"
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#define LIBRARY_NAME "QueryCondition_Library"
-#define PROFILE_NAME "QueryConditionProfile"
-
-const int number_of_iterations_ = 3;
-
-const int number_of_keys_ = 2;
-
-int last_iteration_ = 0;
-int run_ = 0;
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
- Sleep(sleeptime * 1000);
-#else
- sleep(sleeptime);
-#endif
-}
-
-void write (DDSDataWriter * writer)
-{
- QueryConditionTestDataWriter* typed_writer = 0;
- typed_writer = QueryConditionTestDataWriter::narrow (writer);
- for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key)
- {
- char key[7];
- QueryConditionTest new_key;
- sprintf (key, "KEY_%d", iter_key);
- new_key.symbol = key;
- for (int iter = 1;
- iter < number_of_iterations_ + 1;
- ++iter)
- {
- new_key.iteration = iter + last_iteration_;
- DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL);
- if (retcode != DDS_RETCODE_OK)
- {
- cout << "ERROR writing symbol <"
- << key
- << "> - iteration <"
- << new_key.iteration
- << ">"
- << endl;
- }
- }
- cout << "Sender: Written samples with symbol <"
- << key
- << "> and iteration <"
- << last_iteration_ + 1
- << "> through <"
- << new_key.iteration
- << ">"
- << endl;
- }
- ++run_;
- last_iteration_ = number_of_iterations_ * run_;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
- DDS_ReturnCode_t retcode;
- DDSTopic* topic = 0;
- DDSDataWriter* data_writer = 0;
- DDSPublisher* publisher = 0;
- int main_result = 1; /* error by default */
-
-// NDDS_Config_LogVerbosity n_verbosity =
-// static_cast <NDDS_Config_LogVerbosity> (3);
-// NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
- const ACE_TCHAR * env_domain_id = 0;
- if (argc > 1)
- {
- env_domain_id = argv[1];
- }
- if (!env_domain_id)
- {
- printf ("Environment variable DEFAULT_DOMAIN_ID not set "
- "=> setting it to 2\n");
- env_domain_id = "2";
- }
- else
- printf ("Domain ID set to %s\n", env_domain_id);
-
- const int domain_id = ACE_OS::atoi (env_domain_id);
-
- DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
- create_participant_with_profile (domain_id, /* Domain ID */
- LIBRARY_NAME, /* QoS */
- PROFILE_NAME,
- 0, /* Listener */
- DDS_STATUS_MASK_NONE);
- if (!participant) {
- cerr << "SENDER: Error creating participant" << endl;
- goto clean_exit;
- }
-
- retcode = QueryConditionTestTypeSupport::register_type(
- participant, QueryConditionTestTypeSupport::get_type_name ());
-
- if (retcode != DDS_RETCODE_OK) {
- cerr << "SENDER: Error registering type" << endl;
- goto clean_exit;
- }
-
- topic = participant->create_topic_with_profile (
- "QC", /* Topic name*/
- QueryConditionTestTypeSupport::get_type_name (), /* Type name */
- LIBRARY_NAME, /* QoS */
- PROFILE_NAME,
- 0, /* Listener */
- DDS_STATUS_MASK_NONE);
- if (!topic) {
- cerr << "SENDER: Error creating topic" << endl;
- goto clean_exit;
- }
-
- publisher = participant->create_publisher_with_profile (LIBRARY_NAME,
- PROFILE_NAME,
- 0,
- 0);
- if (!publisher) {
- cerr << "SENDER: Error creating publisher" << endl;
- goto clean_exit;
- }
-
- data_writer = publisher->create_datawriter_with_profile (
- topic,
- LIBRARY_NAME, /* QoS */
- PROFILE_NAME,
- 0, /* Listener */
- DDS_STATUS_MASK_NONE);
- if (!data_writer) {
- cerr << "SENDER: Error creating data writer" << endl;
- goto clean_exit;
- }
-
- write (data_writer);
- sleep_now (8);
- write (data_writer);
- sleep_now (8);
- write (data_writer);
- sleep_now (30);
-
- main_result = 0;
-clean_exit:
- cout << "SENDER: Exiting ..." << endl;
- if (participant) {
- retcode = participant->delete_contained_entities();
- if (retcode != DDS_RETCODE_OK) {
- main_result = 1;
- }
- retcode = DDSDomainParticipantFactory::get_instance()->
- delete_participant(participant);
- if (retcode != DDS_RETCODE_OK) {
- main_result = 1;
- }
- }
- DDSDomainParticipantFactory::finalize_instance ();
- return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README
deleted file mode 100644
index b276b44a76f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-This is a plain DDS test, which test the use of 2 different query conditions, followed through a
-readcondition.
-
-Use a sample with {
- string symbol; //@key
- long iteration;
-}
-
-The sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <1> through <3>
-The receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <4> through <6>
-The receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <7> through <9>
-The receiver deletes the query condition and creates the next readcondition:
- "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE"
-and uses a read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED.
-
-(This test (QueryCondition/DDS) differs with the test QueryCondition/DDS_OneByOne that the DDS_OneByOne test does use a loop with
-read_w_condition with this readcondition and number of samples = 1.)
-
-
-What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which
-are already received before.
-
-Next we check the number of samples in DDS with a plain read.
-What we expect is that the receiver receives all 18 samples.
-
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index d061e075aae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5c/scripts/../resource/rtiddsgen/../qos_profiles_4.5c/schema/rti_dds_qos_profiles.xsd"
- version="4.5c">
- <!-- QoS Library containing the QoS profile used in the generated example.
-
- A QoS library is a named set of QoS profiles.
- -->
- <qos_library name="QueryCondition_Library">
- <!-- QoS profile used to configure reliable communication between the DataWriter
- and DataReader created in the example code.
-
- A QoS profile groups a set of related QoS.
- -->
- <qos_profile name="QueryConditionProfile" is_default_qos="false">
- <!-- QoS used to configure the data writer created in the example code -->
- <datawriter_qos>
- <reliability>
- <kind>RELIABLE_RELIABILITY_QOS</kind>
- <max_blocking_time>
- <sec>10</sec>
- <nanosec>0</nanosec>
- </max_blocking_time>
- </reliability>
- <durability>
- <kind>TRANSIENT_DURABILITY_QOS</kind>
- </durability>
- <history>
- <kind>KEEP_ALL_HISTORY_QOS</kind>
- </history>
- <protocol>
- <rtps_reliable_writer>
- <max_heartbeat_retries>10</max_heartbeat_retries>
- </rtps_reliable_writer>
- </protocol>
- </datawriter_qos>
- <!-- QoS used to configure the data reader created in the example code -->
- <datareader_qos>
- <reliability>
- <kind>RELIABLE_RELIABILITY_QOS</kind>
- </reliability>
- <history>
- <kind>KEEP_ALL_HISTORY_QOS</kind>
- </history>
- <durability>
- <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
- </durability>
- </datareader_qos>
- </qos_profile>
- </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl
deleted file mode 100755
index a24f5ff02ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
- & eval 'exec perl -S $0 $argv:q'
- if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}";
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("./DDS_receiver", "$domain_id");
-$R->Spawn();
-
-sleep (1);
-
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("./DDS_Sender", "$domain_id");
-$S->Spawn ();
-
-
-sleep (90);
-
-$R->Kill ();
-$S->Kill ();
-
-exit 0;