[ros-diffs] [chorns] 14003: Make tests build again

Make tests build again
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp
  _____

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp
2005-03-13 10:24:34 UTC (rev 14002)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp
2005-03-13 10:33:15 UTC (rev 14003)
@@ -6,16 +6,16 @@

{
    string projectFilename ( RBUILD_BASE "tests/data/define.xml" );
    Project project ( projectFilename );
-	ARE_EQUAL(1, project.defines.size());
-	Define& define1 = *project.defines[0];
+	ARE_EQUAL(1, project.non_if_data.defines.size());
+	Define& define1 = *project.non_if_data.defines[0];
    ARE_EQUAL("define1", define1.name);
    ARE_EQUAL("value1", define1.value);

ARE_EQUAL(1, project.modules.size());
    Module& module1 = *project.modules[0];

-	ARE_EQUAL(1, module1.defines.size());
-	Define& define2 = *module1.defines[0];
+	ARE_EQUAL(1, module1.non_if_data.defines.size());
+	Define& define2 = *module1.non_if_data.defines[0];
    ARE_EQUAL("define2", define2.name);
    ARE_EQUAL("value2", define2.value);
 }
  _____

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp
2005-03-13 10:24:34 UTC (rev 14002)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp
2005-03-13 10:33:15 UTC (rev 14003)
@@ -10,16 +10,16 @@

ARE_EQUAL ( 1, project.modules.size () );
    Module& module1 = *project.modules[0];

-	ARE_EQUAL ( 1, module1.ifs.size () );
-	If& if1 = *module1.ifs[0];
+	ARE_EQUAL ( 1, module1.non_if_data.ifs.size () );
+	If& if1 = *module1.non_if_data.ifs[0];
    ARE_EQUAL ( "VAR1", if1.property );
    ARE_EQUAL ( "value1", if1.value );

-	ARE_EQUAL ( 1, if1.files.size () );
-	File& file1 = *if1.files[0];
+	ARE_EQUAL ( 1, if1.data.files.size () );
+	File& file1 = *if1.data.files[0];
    ARE_EQUAL( "." SSEP "file1.c", file1.name );

-	ARE_EQUAL ( 1, module1.files.size () );
-	File& file2 = *module1.files[0];
+	ARE_EQUAL ( 1, module1.non_if_data.files.size () );
+	File& file2 = *module1.non_if_data.files[0];
    ARE_EQUAL( "." SSEP "file2.c", file2.name );
 }
  _____

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp
2005-03-13 10:24:34 UTC (rev 14002)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp
2005-03-13 10:33:15 UTC (rev 14003)
@@ -6,19 +6,19 @@

{
    string projectFilename ( RBUILD_BASE "tests/data/include.xml" );
    Project project ( projectFilename );
-	ARE_EQUAL(1, project.includes.size());
-	Include& include1 = *project.includes[0];
+	ARE_EQUAL(1, project.non_if_data.includes.size());
+	Include& include1 = *project.non_if_data.includes[0];
    ARE_EQUAL("include1", include1.directory);

ARE_EQUAL(2, project.modules.size());
    Module& module1 = *project.modules[0];
    Module& module2 = *project.modules[1];

-	ARE_EQUAL(1, module1.includes.size());
-	Include& include2 = *module1.includes[0];
+	ARE_EQUAL(1, module1.non_if_data.includes.size());
+	Include& include2 = *module1.non_if_data.includes[0];
    ARE_EQUAL("include2", include2.directory);

-	ARE_EQUAL(1, module2.includes.size());
-	Include& include3 = *module2.includes[0];
+	ARE_EQUAL(1, module2.non_if_data.includes.size());
+	Include& include3 = *module2.non_if_data.includes[0];
    ARE_EQUAL(FixSeparator("./dir1/include3"), include3.directory);
 }
  _____

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp
2005-03-13 10:24:34 UTC (rev 14002)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp
2005-03-13 10:33:15 UTC (rev 14003)
@@ -10,20 +10,20 @@

Module& module1 = *project.modules[0];
    IS_TRUE(module1.type == BuildTool);
-	ARE_EQUAL(2, module1.files.size());
-	ARE_EQUAL("." SSEP "dir1" SSEP "file1.c",
module1.files[0]->name);
-	ARE_EQUAL("." SSEP "dir1" SSEP "file2.c",
module1.files[1]->name);
+	ARE_EQUAL(2, module1.non_if_data.files.size());
+	ARE_EQUAL("." SSEP "dir1" SSEP "file1.c",
module1.non_if_data.files[0]->name);
+	ARE_EQUAL("." SSEP "dir1" SSEP "file2.c",
module1.non_if_data.files[1]->name);

-	ARE_EQUAL(0, module1.libraries.size());
+	ARE_EQUAL(0, module1.non_if_data.libraries.size());

Module& module2 = *project.modules[1];
    IS_TRUE(module2.type == KernelModeDLL);
-	ARE_EQUAL(2, module2.files.size());
-	ARE_EQUAL("." SSEP "dir2" SSEP "file3.c",
module2.files[0]->name);
-	ARE_EQUAL("." SSEP "dir2" SSEP "file4.c",
module2.files[1]->name);
+	ARE_EQUAL(2, module2.non_if_data.files.size());
+	ARE_EQUAL("." SSEP "dir2" SSEP "file3.c",
module2.non_if_data.files[0]->name);
+	ARE_EQUAL("." SSEP "dir2" SSEP "file4.c",
module2.non_if_data.files[1]->name);

-	ARE_EQUAL(1, module2.libraries.size());
-	Library& library1 = *module2.libraries[0];
+	ARE_EQUAL(1, module2.non_if_data.libraries.size());
+	Library& library1 = *module2.non_if_data.libraries[0];
    ARE_EQUAL("module1", library1.name);

ARE_EQUAL(1, module2.dependencies.size());