diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-04-18 10:28:09 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-04-18 10:28:09 +0000 |
| commit | 7a7e62673b161ddbe55dd73fe33fbcc65cc5c433 (patch) | |
| tree | 3ed2bdb13464b4ab68265e6771c25a6600c2fd28 /tests/Config_Test.cpp | |
| parent | 4ea81a1d74e001b9ed93a29aafe66de65d0bd97d (diff) | |
| download | ATCD-7a7e62673b161ddbe55dd73fe33fbcc65cc5c433.tar.gz | |
ChangeLogTag:Wed Apr 18 05:23:53 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
Diffstat (limited to 'tests/Config_Test.cpp')
| -rw-r--r-- | tests/Config_Test.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 28fc3e283bd..61e7e1d2be9 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -799,7 +799,8 @@ Config_Test::testIniFormat () int rc = 0; if (!this->equality_tested_) { - if ((rc = this->testEquality ()) != 0) + rc = this->testEquality (); + if (rc != 0) { ACE_DEBUG ((LM_DEBUG, "Equality Test Failed\n")); return rc; @@ -811,10 +812,12 @@ Config_Test::testIniFormat () // 1. Creates an ACE_Configuration_Heap object ACE_Configuration_Heap original; - if ((rc = original.open ()) == 0) + rc = original.open (); + if (rc == 0) { + rc = build_config_object (original); // 2. Calls build_config_object to populate - if ((rc = build_config_object (original)) != 0) + if (rc != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error populating original config object (%d)\n", @@ -825,7 +828,8 @@ Config_Test::testIniFormat () // 3. Export ACE_Ini_ImpExp importExport (original); - if ((rc = importExport.export_config ("testConfig.ini")) != 0) + rc = importExport.export_config (ACE_TEXT ("testConfig.ini")); + if (rc != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error Exporting (%d)\n", @@ -846,12 +850,14 @@ Config_Test::testIniFormat () // At this point we've successfully created, populated and written // the configuration object // 5. Creates a new ACE_Configuration_Heap object - if ((rc = fromFile.open ()) == 0) + rc = fromFile.open (); + if (rc == 0) { // 6. Imports ACE_Ini_ImpExp importExport (fromFile); - if ((rc = importExport.import_config ("testConfig.ini")) != 0) + rc = importExport.import_config (ACE_TEXT ("testConfig.ini")); + if (rc != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error Exporting (%d)\n", @@ -986,7 +992,8 @@ Config_Test::testRegFormat () int rc = 0; if (!this->equality_tested_) { - if ((rc = this->testEquality ()) != 0) + rc = this->testEquality (); + if (rc != 0) { ACE_DEBUG ((LM_DEBUG, "Equality Test Failed\n")); return rc; @@ -999,10 +1006,12 @@ Config_Test::testRegFormat () // 1. Creates an ACE_Configuration_Heap object ACE_Configuration_Heap original; - if ((rc = original.open ()) == 0) + rc = original.open (); + if (rc == 0) { // 2. Calls build_config_object to populate - if ((rc = build_config_object (original)) != 0) + rc = build_config_object (original); + if (rc != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error populating original config object (%d)\n", @@ -1013,7 +1022,8 @@ Config_Test::testRegFormat () // 3. Export ACE_Registry_ImpExp importExport (original); - if ((rc = importExport.export_config ("testConfig.ini")) != 0) + rc = importExport.export_config (ACE_TEXT ("testConfig.ini")); + if (rc != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error Exporting (%d)\n", @@ -1034,12 +1044,14 @@ Config_Test::testRegFormat () // At this point we've successfully created, populated and written // the configuration object // 5. Creates a new ACE_Configuration_Heap object - if ((rc = fromFile.open ()) == 0) + rc = fromFile.open (); + if (rc == 0) { // 6. Imports ACE_Registry_ImpExp importExport (fromFile); - if ((rc = importExport.import_config ("testConfig.ini")) != 0) + rc = importExport.import_config (ACE_TEXT ("testConfig.ini")); + if (rc != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error Exporting (%d)\n", |