fixup! refactor(aria/accordion): consolidate accordion harness to match material expansion harness

Author: ok7sai

src/aria/accordion/testing/accordion-harness-filters.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+import {BaseHarnessFilters} from '@angular/cdk/testing';
+
+/** Filters for locating an `AccordionHarness`. */
+export interface AccordionHarnessFilters extends BaseHarnessFilters {
+  /** Only find instances whose title text matches the given value. */
+  title?: string | RegExp;
+  /** Only find instances whose expanded state matches the given value. */
+  expanded?: boolean;
+  /** Only find instances whose disabled state matches the given value. */
+  disabled?: boolean;
+}
+
+/** Filters for locating an `AccordionGroupHarness`. */
+export interface AccordionGroupHarnessFilters extends BaseHarnessFilters {}

src/aria/accordion/testing/accordion-harness.ts

@@ -10,28 +10,15 @@ import {
   ComponentHarness,
   ContentContainerComponentHarness,
   HarnessPredicate,
-  BaseHarnessFilters,
 } from '@angular/cdk/testing';
+import {AccordionHarnessFilters, AccordionGroupHarnessFilters} from './accordion-harness-filters';
 
 /** Selectors for the sections that may contain user content. */
 export enum AccordionSection {
   TRIGGER = '[ngAccordionTrigger]',
   PANEL = '[ngAccordionPanel]',
 }
 
-/** Filters for locating an `AccordionHarness`. */
-export interface AccordionHarnessFilters extends BaseHarnessFilters {
-  /** Only find instances whose title text matches the given value. */
-  title?: string | RegExp;
-  /** Only find instances whose expanded state matches the given value. */
-  expanded?: boolean;
-  /** Only find instances whose disabled state matches the given value. */
-  disabled?: boolean;
-}
-
-/** Filters for locating an `AccordionGroupHarness`. */
-export interface AccordionGroupHarnessFilters extends BaseHarnessFilters {}
-
 /** Harness for interacting with a standard ngAccordion item in tests. */
 export class AccordionHarness extends ContentContainerComponentHarness<AccordionSection> {
   static hostSelector = '[ngAccordionTrigger]';

src/aria/accordion/testing/public-api.ts

@@ -7,3 +7,4 @@
  */
 
 export * from './accordion-harness';
+export * from './accordion-harness-filters';