Add public deps to GN

tools/gn/target_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/build_settings.h"
 #include "tools/gn/config.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/target.h"
 #include "tools/gn/test_with_scope.h"
 #include "tools/gn/toolchain.h"
 
-// Tests that depending on a group is like depending directly on the group's
-// deps.
-TEST(Target, GroupDeps) {
-  TestWithScope setup;
-  Err err;
-
-  // Used as the origin for the not-automatically-set deps.
-  IdentifierNode origin;
-
-  // Two low-level targets.
-  Target x(setup.settings(), Label(SourceDir("//component/"), "x"));
-  x.set_output_type(Target::STATIC_LIBRARY);
-  x.SetToolchain(setup.toolchain());
-  ASSERT_TRUE(x.OnResolved(&err));
-  Target y(setup.settings(), Label(SourceDir("//component/"), "y"));
-  y.set_output_type(Target::STATIC_LIBRARY);
-  y.SetToolchain(setup.toolchain());
-  ASSERT_TRUE(y.OnResolved(&err));
-
-  // Make a group for both x and y.
-  Target g(setup.settings(), Label(SourceDir("//group/"), "g"));
-  g.set_output_type(Target::GROUP);
-  g.visibility().SetPublic();
-  g.deps().push_back(LabelTargetPair(&x));
-  g.deps()[0].origin = &origin;
-  g.deps().push_back(LabelTargetPair(&y));
-  g.deps()[1].origin = &origin;
-
-  // Random placeholder target so we can see the group's deps get inserted at
-  // the right place.
-  Target b(setup.settings(), Label(SourceDir("//app/"), "b"));
-  b.set_output_type(Target::STATIC_LIBRARY);
-  b.SetToolchain(setup.toolchain());
-  b.visibility().SetPublic();
-  ASSERT_TRUE(b.OnResolved(&err));
-
-  // Make a target depending on the group and "b". OnResolved will expand.
-  Target a(setup.settings(), Label(SourceDir("//app/"), "a"));
-  a.set_output_type(Target::EXECUTABLE);
-  a.deps().push_back(LabelTargetPair(&g));
-  a.deps()[0].origin = &origin;
-  a.deps().push_back(LabelTargetPair(&b));
-  a.deps()[1].origin = &origin;
-  a.SetToolchain(setup.toolchain());
-  ASSERT_TRUE(a.OnResolved(&err));
-
-  // The group's deps should be inserted after the group itself in the deps
-  // list, so we should get "g, x, y, b"
-  ASSERT_EQ(4u, a.deps().size());
-  EXPECT_EQ(&g, a.deps()[0].ptr);
-  EXPECT_EQ(&x, a.deps()[1].ptr);
-  EXPECT_EQ(&y, a.deps()[2].ptr);
-  EXPECT_EQ(&b, a.deps()[3].ptr);
-
-  // The "regular" deps on a should have the origin set. The automatically
-  // expanded ones will have a null origin so we know they are generated.
-  EXPECT_EQ(&origin, a.deps()[0].origin);
-  EXPECT_EQ(NULL, a.deps()[1].origin);
-  EXPECT_EQ(NULL, a.deps()[2].origin);
-  EXPECT_EQ(&origin, a.deps()[3].origin);
-}
-
 // Tests that lib[_dir]s are inherited across deps boundaries for static
 // libraries but not executables.
 TEST(Target, LibInheritance) {
   TestWithScope setup;
   Err err;
 
   const std::string lib("foo");
   const SourceDir libdir("/foo_dir/");
 
   // Leaf target with ldflags set.
   Target z(setup.settings(), Label(SourceDir("//foo/"), "z"));
   z.set_output_type(Target::STATIC_LIBRARY);
   z.config_values().libs().push_back(lib);
   z.config_values().lib_dirs().push_back(libdir);
+  z.visibility().SetPublic();
   z.SetToolchain(setup.toolchain());
   ASSERT_TRUE(z.OnResolved(&err));
 
   // All lib[_dir]s should be set when target is resolved.
   ASSERT_EQ(1u, z.all_libs().size());
   EXPECT_EQ(lib, z.all_libs()[0]);
   ASSERT_EQ(1u, z.all_lib_dirs().size());
   EXPECT_EQ(libdir, z.all_lib_dirs()[0]);
 
   // Shared library target should inherit the libs from the static library
   // and its own. Its own flag should be before the inherited one.
   const std::string second_lib("bar");
   const SourceDir second_libdir("/bar_dir/");
   Target shared(setup.settings(), Label(SourceDir("//foo/"), "shared"));
   shared.set_output_type(Target::SHARED_LIBRARY);
   shared.config_values().libs().push_back(second_lib);
   shared.config_values().lib_dirs().push_back(second_libdir);
-  shared.deps().push_back(LabelTargetPair(&z));
+  shared.private_deps().push_back(LabelTargetPair(&z));
+  shared.visibility().SetPublic();
   shared.SetToolchain(setup.toolchain());
   ASSERT_TRUE(shared.OnResolved(&err));
 
   ASSERT_EQ(2u, shared.all_libs().size());
   EXPECT_EQ(second_lib, shared.all_libs()[0]);
   EXPECT_EQ(lib, shared.all_libs()[1]);
   ASSERT_EQ(2u, shared.all_lib_dirs().size());
   EXPECT_EQ(second_libdir, shared.all_lib_dirs()[0]);
   EXPECT_EQ(libdir, shared.all_lib_dirs()[1]);
 
   // Executable target shouldn't get either by depending on shared.
   Target exec(setup.settings(), Label(SourceDir("//foo/"), "exec"));
   exec.set_output_type(Target::EXECUTABLE);
-  exec.deps().push_back(LabelTargetPair(&shared));
+  exec.private_deps().push_back(LabelTargetPair(&shared));
   exec.SetToolchain(setup.toolchain());
   ASSERT_TRUE(exec.OnResolved(&err));
   EXPECT_EQ(0u, exec.all_libs().size());
   EXPECT_EQ(0u, exec.all_lib_dirs().size());
 }
 
-// Test all/direct_dependent_configs inheritance, and
+// Test all_dependent_configs, public_config inheritance, and
 // forward_dependent_configs_from
 TEST(Target, DependentConfigs) {
   TestWithScope setup;
   Err err;
 
   // Set up a dependency chain of a -> b -> c
   Target a(setup.settings(), Label(SourceDir("//foo/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
+  a.visibility().SetPublic();
   a.SetToolchain(setup.toolchain());
   Target b(setup.settings(), Label(SourceDir("//foo/"), "b"));
   b.set_output_type(Target::STATIC_LIBRARY);
+  b.visibility().SetPublic();
   b.SetToolchain(setup.toolchain());
   Target c(setup.settings(), Label(SourceDir("//foo/"), "c"));
   c.set_output_type(Target::STATIC_LIBRARY);
+  c.visibility().SetPublic();
   c.SetToolchain(setup.toolchain());
-  a.deps().push_back(LabelTargetPair(&b));
-  b.deps().push_back(LabelTargetPair(&c));
+  a.private_deps().push_back(LabelTargetPair(&b));
+  b.private_deps().push_back(LabelTargetPair(&c));
 
   // Normal non-inherited config.
   Config config(setup.settings(), Label(SourceDir("//foo/"), "config"));
   c.configs().push_back(LabelConfigPair(&config));
 
   // All dependent config.
   Config all(setup.settings(), Label(SourceDir("//foo/"), "all"));
   c.all_dependent_configs().push_back(LabelConfigPair(&all));
 
   // Direct dependent config.
   Config direct(setup.settings(), Label(SourceDir("//foo/"), "direct"));
-  c.direct_dependent_configs().push_back(LabelConfigPair(&direct));
+  c.public_configs().push_back(LabelConfigPair(&direct));
 
   ASSERT_TRUE(c.OnResolved(&err));
   ASSERT_TRUE(b.OnResolved(&err));
   ASSERT_TRUE(a.OnResolved(&err));
 
   // B should have gotten both dependent configs from C.
   ASSERT_EQ(2u, b.configs().size());
   EXPECT_EQ(&all, b.configs()[0].ptr);
   EXPECT_EQ(&direct, b.configs()[1].ptr);
   ASSERT_EQ(1u, b.all_dependent_configs().size());
   EXPECT_EQ(&all, b.all_dependent_configs()[0].ptr);
 
   // A should have just gotten the "all" dependent config from C.
   ASSERT_EQ(1u, a.configs().size());
   EXPECT_EQ(&all, a.configs()[0].ptr);
   EXPECT_EQ(&all, a.all_dependent_configs()[0].ptr);
 
   // Making an an alternate A and B with B forwarding the direct dependents.
   Target a_fwd(setup.settings(), Label(SourceDir("//foo/"), "a_fwd"));
   a_fwd.set_output_type(Target::EXECUTABLE);
+  a_fwd.visibility().SetPublic();
   a_fwd.SetToolchain(setup.toolchain());
   Target b_fwd(setup.settings(), Label(SourceDir("//foo/"), "b_fwd"));
   b_fwd.set_output_type(Target::STATIC_LIBRARY);
   b_fwd.SetToolchain(setup.toolchain());
-  a_fwd.deps().push_back(LabelTargetPair(&b_fwd));
-  b_fwd.deps().push_back(LabelTargetPair(&c));
+  b_fwd.visibility().SetPublic();
+  a_fwd.private_deps().push_back(LabelTargetPair(&b_fwd));
+  b_fwd.private_deps().push_back(LabelTargetPair(&c));
   b_fwd.forward_dependent_configs().push_back(LabelTargetPair(&c));
 
   ASSERT_TRUE(b_fwd.OnResolved(&err));
   ASSERT_TRUE(a_fwd.OnResolved(&err));
 
   // A_fwd should now have both configs.
   ASSERT_EQ(2u, a_fwd.configs().size());
   EXPECT_EQ(&all, a_fwd.configs()[0].ptr);
   EXPECT_EQ(&direct, a_fwd.configs()[1].ptr);
   ASSERT_EQ(1u, a_fwd.all_dependent_configs().size());
   EXPECT_EQ(&all, a_fwd.all_dependent_configs()[0].ptr);
 }
 
-// Tests that forward_dependent_configs_from works for groups, forwarding the
-// group's deps' dependent configs.
-TEST(Target, ForwardDependentConfigsFromGroups) {
-  TestWithScope setup;
-  Err err;
-
-  Target a(setup.settings(), Label(SourceDir("//foo/"), "a"));
-  a.set_output_type(Target::EXECUTABLE);
-  a.SetToolchain(setup.toolchain());
-  Target b(setup.settings(), Label(SourceDir("//foo/"), "b"));
-  b.set_output_type(Target::GROUP);
-  b.SetToolchain(setup.toolchain());
-  Target c(setup.settings(), Label(SourceDir("//foo/"), "c"));
-  c.set_output_type(Target::STATIC_LIBRARY);
-  c.SetToolchain(setup.toolchain());
-  a.deps().push_back(LabelTargetPair(&b));
-  b.deps().push_back(LabelTargetPair(&c));
-
-  // Direct dependent config on C.
-  Config direct(setup.settings(), Label(SourceDir("//foo/"), "direct"));
-  c.direct_dependent_configs().push_back(LabelConfigPair(&direct));
-
-  // A forwards the dependent configs from B.
-  a.forward_dependent_configs().push_back(LabelTargetPair(&b));
-
-  ASSERT_TRUE(c.OnResolved(&err));
-  ASSERT_TRUE(b.OnResolved(&err));
-  ASSERT_TRUE(a.OnResolved(&err));
-
-  // The config should now be on A, and in A's direct dependent configs.
-  ASSERT_EQ(1u, a.configs().size());
-  ASSERT_EQ(&direct, a.configs()[0].ptr);
-  ASSERT_EQ(1u, a.direct_dependent_configs().size());
-  ASSERT_EQ(&direct, a.direct_dependent_configs()[0].ptr);
-}
-
 TEST(Target, InheritLibs) {
   TestWithScope setup;
   Err err;
 
   // Create a dependency chain:
   //   A (executable) -> B (shared lib) -> C (static lib) -> D (source set)
   Target a(setup.settings(), Label(SourceDir("//foo/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
+  a.visibility().SetPublic();
   a.SetToolchain(setup.toolchain());
   Target b(setup.settings(), Label(SourceDir("//foo/"), "b"));
   b.set_output_type(Target::SHARED_LIBRARY);
+  b.visibility().SetPublic();
   b.SetToolchain(setup.toolchain());
   Target c(setup.settings(), Label(SourceDir("//foo/"), "c"));
   c.set_output_type(Target::STATIC_LIBRARY);
+  c.visibility().SetPublic();
   c.SetToolchain(setup.toolchain());
   Target d(setup.settings(), Label(SourceDir("//foo/"), "d"));
   d.set_output_type(Target::SOURCE_SET);
+  d.visibility().SetPublic();
   d.SetToolchain(setup.toolchain());
-  a.deps().push_back(LabelTargetPair(&b));
-  b.deps().push_back(LabelTargetPair(&c));
-  c.deps().push_back(LabelTargetPair(&d));
+  a.private_deps().push_back(LabelTargetPair(&b));
+  b.private_deps().push_back(LabelTargetPair(&c));
+  c.private_deps().push_back(LabelTargetPair(&d));
 
   ASSERT_TRUE(d.OnResolved(&err));
   ASSERT_TRUE(c.OnResolved(&err));
   ASSERT_TRUE(b.OnResolved(&err));
   ASSERT_TRUE(a.OnResolved(&err));
 
   // C should have D in its inherited libs.
   const UniqueVector<const Target*>& c_inherited = c.inherited_libraries();
   EXPECT_EQ(1u, c_inherited.size());
   EXPECT_TRUE(c_inherited.IndexOf(&d) != static_cast<size_t>(-1));
@@ skipping 12 matching lines @@
 }
 
 TEST(Target, InheritCompleteStaticLib) {
   TestWithScope setup;
   Err err;
 
   // Create a dependency chain:
   //   A (executable) -> B (complete static lib) -> C (source set)
   Target a(setup.settings(), Label(SourceDir("//foo/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
+  a.visibility().SetPublic();
   a.SetToolchain(setup.toolchain());
   Target b(setup.settings(), Label(SourceDir("//foo/"), "b"));
   b.set_output_type(Target::STATIC_LIBRARY);
+  b.visibility().SetPublic();
   b.set_complete_static_lib(true);
   b.SetToolchain(setup.toolchain());
   Target c(setup.settings(), Label(SourceDir("//foo/"), "c"));
   c.set_output_type(Target::SOURCE_SET);
+  c.visibility().SetPublic();
   c.SetToolchain(setup.toolchain());
-  a.deps().push_back(LabelTargetPair(&b));
-  b.deps().push_back(LabelTargetPair(&c));
+  a.public_deps().push_back(LabelTargetPair(&b));
+  b.public_deps().push_back(LabelTargetPair(&c));
 
   ASSERT_TRUE(c.OnResolved(&err));
   ASSERT_TRUE(b.OnResolved(&err));
   ASSERT_TRUE(a.OnResolved(&err));
 
   // B should have C in its inherited libs.
   const UniqueVector<const Target*>& b_inherited = b.inherited_libraries();
   EXPECT_EQ(1u, b_inherited.size());
   EXPECT_TRUE(b_inherited.IndexOf(&c) != static_cast<size_t>(-1));
 
@@ skipping 54 matching lines @@
   Target b(setup.settings(), Label(SourceDir("//private/"), "b"));
   b.set_output_type(Target::STATIC_LIBRARY);
   b.SetToolchain(setup.toolchain());
   b.visibility().SetPrivate(b.label().dir());
   ASSERT_TRUE(b.OnResolved(&err));
 
   // Make a target depending on "b". The dependency must have an origin to mark
   // it as user-set so we check visibility. This check should fail.
   Target a(setup.settings(), Label(SourceDir("//app/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
-  a.deps().push_back(LabelTargetPair(&b));
+  a.private_deps().push_back(LabelTargetPair(&b));
   IdentifierNode origin;  // Dummy origin.
-  a.deps()[0].origin = &origin;
+  a.private_deps()[0].origin = &origin;
   a.SetToolchain(setup.toolchain());
   ASSERT_FALSE(a.OnResolved(&err));
 }
 
-// Test visibility with a single datadep.
+// Test visibility with a single data_dep.
 TEST(Target, VisibilityDatadeps) {
   TestWithScope setup;
   Err err;
 
   Target b(setup.settings(), Label(SourceDir("//public/"), "b"));
   b.set_output_type(Target::STATIC_LIBRARY);
   b.SetToolchain(setup.toolchain());
   b.visibility().SetPublic();
   ASSERT_TRUE(b.OnResolved(&err));
 
   // Make a target depending on "b". The dependency must have an origin to mark
   // it as user-set so we check visibility. This check should fail.
   Target a(setup.settings(), Label(SourceDir("//app/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
-  a.datadeps().push_back(LabelTargetPair(&b));
+  a.data_deps().push_back(LabelTargetPair(&b));
   IdentifierNode origin;  // Dummy origin.
-  a.datadeps()[0].origin = &origin;
+  a.data_deps()[0].origin = &origin;
   a.SetToolchain(setup.toolchain());
   ASSERT_TRUE(a.OnResolved(&err)) << err.help_text();
 }
 
 // Tests that A -> Group -> B where the group is visible from A but B isn't,
 // passes visibility even though the group's deps get expanded into A.
 TEST(Target, VisibilityGroup) {
   TestWithScope setup;
   Err err;
 
   IdentifierNode origin;  // Dummy origin.
 
   // B has private visibility. This lets the group see it since the group is in
   // the same directory.
   Target b(setup.settings(), Label(SourceDir("//private/"), "b"));
   b.set_output_type(Target::STATIC_LIBRARY);
   b.SetToolchain(setup.toolchain());
   b.visibility().SetPrivate(b.label().dir());
   ASSERT_TRUE(b.OnResolved(&err));
 
   // The group has public visibility and depends on b.
   Target g(setup.settings(), Label(SourceDir("//private/"), "g"));
   g.set_output_type(Target::GROUP);
   g.SetToolchain(setup.toolchain());
-  g.deps().push_back(LabelTargetPair(&b));
-  g.deps()[0].origin = &origin;
+  g.private_deps().push_back(LabelTargetPair(&b));
+  g.private_deps()[0].origin = &origin;
   g.visibility().SetPublic();
   ASSERT_TRUE(b.OnResolved(&err));
 
   // Make a target depending on "g". This should succeed.
   Target a(setup.settings(), Label(SourceDir("//app/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
-  a.deps().push_back(LabelTargetPair(&g));
-  a.deps()[0].origin = &origin;
+  a.private_deps().push_back(LabelTargetPair(&g));
+  a.private_deps()[0].origin = &origin;
   a.SetToolchain(setup.toolchain());
   ASSERT_TRUE(a.OnResolved(&err));
 }
 
 // Verifies that only testonly targets can depend on other testonly targets.
 // Many of the above dependency checking cases covered the non-testonly
 // case.
 TEST(Target, Testonly) {
   TestWithScope setup;
   Err err;
 
   // "testlib" is a test-only library.
   Target testlib(setup.settings(), Label(SourceDir("//test/"), "testlib"));
   testlib.set_testonly(true);
   testlib.set_output_type(Target::STATIC_LIBRARY);
+  testlib.visibility().SetPublic();
   testlib.SetToolchain(setup.toolchain());
   ASSERT_TRUE(testlib.OnResolved(&err));
 
   // "test" is a test-only executable depending on testlib, this is OK.
   Target test(setup.settings(), Label(SourceDir("//test/"), "test"));
   test.set_testonly(true);
   test.set_output_type(Target::EXECUTABLE);
-  test.deps().push_back(LabelTargetPair(&testlib));
+  test.private_deps().push_back(LabelTargetPair(&testlib));
   test.SetToolchain(setup.toolchain());
   ASSERT_TRUE(test.OnResolved(&err));
 
   // "product" is a non-test depending on testlib. This should fail.
   Target product(setup.settings(), Label(SourceDir("//app/"), "product"));
   product.set_testonly(false);
   product.set_output_type(Target::EXECUTABLE);
-  product.deps().push_back(LabelTargetPair(&testlib));
+  product.private_deps().push_back(LabelTargetPair(&testlib));
   product.SetToolchain(setup.toolchain());
   ASSERT_FALSE(product.OnResolved(&err));
 }