packages,plugins: migrate to using TestApiProvider and Registry

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

plugins/tech-radar/src/components/RadarComponent.test.tsx

@@ -19,13 +19,12 @@ import { render, waitForElement } from '@testing-library/react';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
 import { act } from 'react-dom/test-utils';
-import { withLogCollector } from '@backstage/test-utils';
+import { TestApiProvider, withLogCollector } from '@backstage/test-utils';
 
 import GetBBoxPolyfill from '../utils/polyfills/getBBox';
 import { RadarComponent } from './RadarComponent';
 import { TechRadarLoaderResponse, techRadarApiRef, TechRadarApi } from '../api';
 
-import { ApiRegistry, ApiProvider } from '@backstage/core-app-api';
 import { errorApiRef } from '@backstage/core-plugin-api';
 
 describe('RadarComponent', () => {
@@ -55,18 +54,18 @@ describe('RadarComponent', () => {
     const errorApi = { post: () => {} };
     const { getByTestId, queryByTestId } = render(
       <ThemeProvider theme={lightTheme}>
-        <ApiProvider
-          apis={ApiRegistry.from([
+        <TestApiProvider
+          apis={[
             [errorApiRef, errorApi],
             [techRadarApiRef, mockClient],
-          ])}
+          ]}
         >
           <RadarComponent
             width={1200}
             height={800}
             svgProps={{ 'data-testid': 'tech-radar-svg' }}
           />
-        </ApiProvider>
+        </TestApiProvider>
       </ThemeProvider>,
     );
 
@@ -87,18 +86,18 @@ describe('RadarComponent', () => {
 
     const { queryByTestId } = render(
       <ThemeProvider theme={lightTheme}>
-        <ApiProvider
-          apis={ApiRegistry.from([
+        <TestApiProvider
+          apis={[
             [errorApiRef, errorApi],
             [techRadarApiRef, mockClient],
-          ])}
+          ]}
         >
           <RadarComponent
             width={1200}
             height={800}
             svgProps={{ 'data-testid': 'tech-radar-svg' }}
           />
-        </ApiProvider>
+        </TestApiProvider>
       </ThemeProvider>,
     );
 
@@ -115,13 +114,13 @@ describe('RadarComponent', () => {
         expect(() => {
           render(
             <ThemeProvider theme={lightTheme}>
-              <ApiProvider apis={ApiRegistry.from([])}>
+              <TestApiProvider apis={[]}>
                 <RadarComponent
                   width={1200}
                   height={800}
                   svgProps={{ 'data-testid': 'tech-radar-svg' }}
                 />
-              </ApiProvider>
+              </TestApiProvider>
             </ThemeProvider>,
           );
         }).toThrow();

plugins/tech-radar/src/components/RadarPage.test.tsx

@@ -17,6 +17,7 @@
 import {
   MockErrorApi,
   renderInTestApp,
+  TestApiProvider,
   wrapInTestApp,
 } from '@backstage/test-utils';
 import { lightTheme } from '@backstage/theme';
@@ -28,7 +29,6 @@ import GetBBoxPolyfill from '../utils/polyfills/getBBox';
 import { RadarPage } from './RadarPage';
 import { TechRadarLoaderResponse, techRadarApiRef, TechRadarApi } from '../api';
 
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import { errorApiRef } from '@backstage/core-plugin-api';
 
 describe('RadarPage', () => {
@@ -63,9 +63,9 @@ describe('RadarPage', () => {
     const { getByTestId, queryByTestId } = render(
       wrapInTestApp(
         <ThemeProvider theme={lightTheme}>
-          <ApiProvider apis={ApiRegistry.from([[techRadarApiRef, mockClient]])}>
+          <TestApiProvider apis={[[techRadarApiRef, mockClient]]}>
             <RadarPage {...techRadarProps} />
-          </ApiProvider>
+          </TestApiProvider>
         </ThemeProvider>,
       ),
     );
@@ -89,9 +89,9 @@ describe('RadarPage', () => {
 
     const { getByText, getByTestId } = await renderInTestApp(
       <ThemeProvider theme={lightTheme}>
-        <ApiProvider apis={ApiRegistry.from([[techRadarApiRef, mockClient]])}>
+        <TestApiProvider apis={[[techRadarApiRef, mockClient]]}>
           <RadarPage {...techRadarProps} />
-        </ApiProvider>
+        </TestApiProvider>
       </ThemeProvider>,
     );
 
@@ -115,9 +115,9 @@ describe('RadarPage', () => {
 
     const { getByTestId } = await renderInTestApp(
       <ThemeProvider theme={lightTheme}>
-        <ApiProvider apis={ApiRegistry.from([[techRadarApiRef, mockClient]])}>
+        <TestApiProvider apis={[[techRadarApiRef, mockClient]]}>
           <RadarPage {...techRadarProps} />
-        </ApiProvider>
+        </TestApiProvider>
       </ThemeProvider>,
     );
 
@@ -142,14 +142,14 @@ describe('RadarPage', () => {
 
     const { queryByTestId } = await renderInTestApp(
       <ThemeProvider theme={lightTheme}>
-        <ApiProvider
-          apis={ApiRegistry.from([
+        <TestApiProvider
+          apis={[
             [errorApiRef, errorApi],
             [techRadarApiRef, mockClient],
-          ])}
+          ]}
         >
           <RadarPage {...techRadarProps} />
-        </ApiProvider>
+        </TestApiProvider>
       </ThemeProvider>,
     );