@@ -0,0 +1,1835 @@
+// Copyright 2015 Google Inc. All rights reserved.%0A//%0A// Licensed under the Apache License, Version 2.0 (the %22License%22);%0A// you may not use this file except in compliance with the License.%0A// You may obtain a copy of the License at%0A//%0A//    http://www.apache.org/licenses/LICENSE-2.0%0A//%0A// Unless required by applicable law or agreed to in writing, software%0A// distributed under the License is distributed on an %22AS IS%22 BASIS,%0A// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.%0A// See the License for the specific language governing permissions and%0A// limitations under the License.%0Apackage com.google.devtools.build.lib.analysis.util;%0A%0Aimport com.google.common.collect.ImmutableList;%0Aimport com.google.devtools.build.lib.analysis.config.BuildConfiguration;%0Aimport com.google.devtools.build.lib.analysis.config.BuildOptions;%0Aimport com.google.devtools.build.lib.analysis.config.DefaultsPackage;%0Aimport com.google.devtools.build.lib.analysis.config.FragmentOptions;%0Aimport com.google.devtools.common.options.OptionsBase;%0Aimport com.google.devtools.common.options.OptionsParser;%0Aimport com.google.devtools.common.options.OptionsParsingException;%0A%0A/**%0A * Helper class for testing %7B@link DefaultsPackage%7D.%0A */%0Apublic class DefaultsPackageUtil %7B%0A%0A  public static String getDefaultsPackageForOptions(Class%3C? extends FragmentOptions%3E optionsClass,%0A      String... options) throws OptionsParsingException %7B%0A    OptionsParser parser = OptionsParser.newOptionsParser(%0A        ImmutableList.%3CClass%3C? extends OptionsBase%3E%3Eof(%0A            BuildConfiguration.Options.class, optionsClass));%0A    parser.parse(options);%0A    return DefaultsPackage.getDefaultsPackageContent(BuildOptions.of(%0A        ImmutableList.%3CClass%3C? extends FragmentOptions%3E%3Eof(%0A            BuildConfiguration.Options.class, optionsClass), parser));%0A  %7D%0A%7D%0A

Split up the DefaultsPackageTest into C++ and Java parts. Move some tests out of BuildConfigurationTest into a new test class.