From dfbf8f341a6e333abcac26f7e28df6cfcfb747d6 Mon Sep 17 00:00:00 2001 From: ashmrtn Date: Mon, 22 May 2023 10:16:16 -0700 Subject: [PATCH] Remove older tests prior to expanded cache (#3465) Tests were for when the cache could only manage either IDs or display names. Now that it has both these tests aren't needed. --- #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [x] :broom: Tech Debt/Cleanup #### Test Plan - [ ] :muscle: Manual - [x] :zap: Unit test - [ ] :green_heart: E2E --- .../exchange/container_resolver_test.go | 51 +------------------ 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/src/internal/connector/exchange/container_resolver_test.go b/src/internal/connector/exchange/container_resolver_test.go index a79daa58f..c4d5bbeaf 100644 --- a/src/internal/connector/exchange/container_resolver_test.go +++ b/src/internal/connector/exchange/container_resolver_test.go @@ -342,16 +342,13 @@ func (r mockContainerRefresher) refreshContainer( type ConfiguredFolderCacheUnitSuite struct { tester.Suite - fc *containerResolver - fcWithID *containerResolver + fc *containerResolver - allContainers []*mockCachedContainer - containersWithID []*mockCachedContainer + allContainers []*mockCachedContainer } func (suite *ConfiguredFolderCacheUnitSuite) SetupTest() { suite.fc, suite.allContainers = resolverWithContainers(4, false) - suite.fcWithID, suite.containersWithID = resolverWithContainers(4, true) } func TestConfiguredFolderCacheUnitSuite(t *testing.T) { @@ -585,26 +582,6 @@ func (suite *ConfiguredFolderCacheUnitSuite) TestLookupCachedFolderNoPathsCached } } -// TODO(ashmrtn): Remove this since the same cache can do IDs or locations. -func (suite *ConfiguredFolderCacheUnitSuite) TestLookupCachedFolderNoPathsCached_useID() { - ctx, flush := tester.NewContext() - defer flush() - - err := suite.fcWithID.populatePaths(ctx, fault.New(true)) - require.NoError(suite.T(), err, clues.ToCore(err)) - - for _, c := range suite.containersWithID { - suite.Run(ptr.Val(c.GetDisplayName()), func() { - t := suite.T() - - p, l, err := suite.fcWithID.IDToPath(ctx, c.id) - require.NoError(t, err, clues.ToCore(err)) - assert.Equal(t, c.expectedPath, p.String()) - assert.Equal(t, c.expectedLocation, l.String()) - }) - } -} - func (suite *ConfiguredFolderCacheUnitSuite) TestLookupCachedFolderCachesPaths() { ctx, flush := tester.NewContext() defer flush() @@ -628,30 +605,6 @@ func (suite *ConfiguredFolderCacheUnitSuite) TestLookupCachedFolderCachesPaths() assert.Equal(t, c.expectedLocation, l.String()) } -// TODO(ashmrtn): Remove this since the same cache can do IDs or locations. -func (suite *ConfiguredFolderCacheUnitSuite) TestLookupCachedFolderCachesPaths_useID() { - ctx, flush := tester.NewContext() - defer flush() - - t := suite.T() - c := suite.containersWithID[len(suite.containersWithID)-1] - - err := suite.fcWithID.populatePaths(ctx, fault.New(true)) - require.NoError(t, err, clues.ToCore(err)) - - p, l, err := suite.fcWithID.IDToPath(ctx, c.id) - require.NoError(t, err, clues.ToCore(err)) - assert.Equal(t, c.expectedPath, p.String()) - assert.Equal(t, c.expectedLocation, l.String()) - - c.parentID = "foo" - - p, l, err = suite.fcWithID.IDToPath(ctx, c.id) - require.NoError(t, err, clues.ToCore(err)) - assert.Equal(t, c.expectedPath, p.String()) - assert.Equal(t, c.expectedLocation, l.String()) -} - func (suite *ConfiguredFolderCacheUnitSuite) TestLookupCachedFolderErrorsParentNotFound() { ctx, flush := tester.NewContext() defer flush()