fix tests

googleapis · May 3, 2024 · 2feb67d · 2feb67d
1 parent c981a4d
commit 2feb67d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/dev/src/Command/AddComponentCommand.php b/dev/src/Command/AddComponentCommand.php
@@ -200,7 +200,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         ];
         $repoMetadataFullPath = $this->rootPath . '/.repo-metadata-full.json';
         $repoMetadataFull = json_decode(file_get_contents($repoMetadataFullPath), true);
-        $repoMetadataFull[$new->composerPackage] = $repoMetadata;
+        $repoMetadataFull[$new->componentName] = $repoMetadata;
         file_put_contents(
             $repoMetadataFullPath,
             json_encode($repoMetadataFull, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)

diff --git a/dev/src/Component.php b/dev/src/Component.php
@@ -187,13 +187,13 @@ private function validateComponentFiles(): void
         if (!$repoMetadataFullJson) {
             throw new RuntimeException('Invalid .repo-metadata-full.json');
         }
-        if (!isset($repoMetadataFullJson[$this->packageName])) {
+        if (!isset($repoMetadataFullJson[$this->name])) {
             throw new RuntimeException(sprintf(
-                'repo metadata not found in .repo-metadata-full.json for component "%s"',
+                'repo metadata for component "%s" not found in .repo-metadata-full.json',
                 $this->name
             ));
         }
-        $repoMetadataJson = $repoMetadataFullJson[$this->packageName];
+        $repoMetadataJson = $repoMetadataFullJson[$this->name];
         if (empty($repoMetadataJson['release_level'])) {
             throw new RuntimeException(sprintf(
                 'repo metadata does not contain "release_level" for component "%s"',

diff --git a/dev/tests/Unit/Command/AddComponentCommandTest.php b/dev/tests/Unit/Command/AddComponentCommandTest.php
@@ -98,7 +98,7 @@ public function testAddComponent()
         }
 
         $repoMetadataFull = json_decode(file_get_contents(self::$tmpDir . '/.repo-metadata-full.json'), true);
-        $this->assertArrayHasKey('google/cloud-secretmanager', $repoMetadataFull);
+        $this->assertArrayHasKey('SecretManager', $repoMetadataFull);
         $this->assertComposerJson('SecretManager');
     }
 

diff --git a/dev/tests/Unit/Command/ComponentInfoCommandTest.php b/dev/tests/Unit/Command/ComponentInfoCommandTest.php
@@ -28,19 +28,6 @@
  */
 class ComponentInfoCommandTest extends TestCase
 {
-    private static $expectedFiles = [
-        '.OwlBot.yaml',
-        '.gitattributes',
-        '.github/pull_request_template.md',
-        '.repo-metadata.json',
-        'CONTRIBUTING.md',
-        'LICENSE',
-        'README.md',
-        'VERSION',
-        'owlbot.py',
-        'phpunit.xml.dist',
-    ];
-
     private static CommandTester $commandTester;
 
     public static function setUpBeforeClass(): void