@@ -618,26 +618,6 @@ test.serial(
618618 } ,
619619) ;
620620
621- function makeOverlayMatchFeatures ( opts : {
622- matchFlagEnabled ?: boolean ;
623- dryRunFlagEnabled ?: boolean ;
624- } ) : FeatureEnablement {
625- return {
626- getEnabledDefaultCliVersions : async ( ) => {
627- throw new Error ( "not implemented" ) ;
628- } ,
629- getValue : async ( feature ) => {
630- if ( feature === Feature . OverlayAnalysisMatchCodeqlVersion ) {
631- return opts . matchFlagEnabled ?? false ;
632- }
633- if ( feature === Feature . OverlayAnalysisMatchCodeqlVersionDryRun ) {
634- return opts . dryRunFlagEnabled ?? false ;
635- }
636- return false ;
637- } ,
638- } ;
639- }
640-
641621const overlayMatchEnabledVersions = {
642622 enabledVersions : [
643623 { cliVersion : "2.20.2" , tagName : "codeql-bundle-v2.20.2" } ,
@@ -674,7 +654,7 @@ test.serial(
674654 SAMPLE_DOTCOM_API_DETAILS ,
675655 GitHubVariant . DOTCOM ,
676656 false ,
677- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
657+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
678658 getRunnerLogger ( true ) ,
679659 ) ;
680660
@@ -712,7 +692,7 @@ test.serial(
712692 SAMPLE_DOTCOM_API_DETAILS ,
713693 GitHubVariant . DOTCOM ,
714694 false ,
715- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
695+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
716696 getRunnerLogger ( true ) ,
717697 ) ;
718698
@@ -744,7 +724,7 @@ test.serial(
744724 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
745725 overlayMatchEnabledVersions ,
746726 [ "javascript" ] ,
747- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
727+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
748728 getRunnerLogger ( true ) ,
749729 ) ;
750730 t . deepEqual ( result , [
@@ -767,7 +747,7 @@ test.serial(
767747 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
768748 overlayMatchEnabledVersions ,
769749 [ "javascript" ] ,
770- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
750+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
771751 getRunnerLogger ( true ) ,
772752 ) ;
773753 t . deepEqual ( result , [ ] ) ;
@@ -782,7 +762,7 @@ test.serial(
782762 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
783763 overlayMatchEnabledVersions ,
784764 undefined ,
785- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
765+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
786766 getRunnerLogger ( true ) ,
787767 ) ;
788768 t . deepEqual ( result , [ ] ) ;
@@ -802,7 +782,7 @@ test.serial(
802782 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
803783 overlayMatchEnabledVersions ,
804784 [ "javascript" ] ,
805- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
785+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
806786 getRunnerLogger ( true ) ,
807787 ) ;
808788 t . deepEqual ( result , [ ] ) ;
@@ -822,7 +802,7 @@ test.serial(
822802 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
823803 overlayMatchEnabledVersions ,
824804 [ "javascript" ] ,
825- makeOverlayMatchFeatures ( { matchFlagEnabled : true } ) ,
805+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersion ] ) ,
826806 getRunnerLogger ( true ) ,
827807 ) ;
828808 t . deepEqual ( result , [
@@ -839,7 +819,7 @@ test.serial(
839819 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
840820 overlayMatchEnabledVersions ,
841821 [ "javascript" ] ,
842- makeOverlayMatchFeatures ( { } ) ,
822+ createFeatures ( [ ] ) ,
843823 getRunnerLogger ( true ) ,
844824 ) ;
845825 t . deepEqual ( result , [ ] ) ;
@@ -863,7 +843,7 @@ test.serial(
863843 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
864844 overlayMatchEnabledVersions ,
865845 [ "javascript" ] ,
866- makeOverlayMatchFeatures ( { dryRunFlagEnabled : true } ) ,
846+ createFeatures ( [ Feature . OverlayAnalysisMatchCodeqlVersionDryRun ] ) ,
867847 getRunnerLogger ( true ) ,
868848 ) ;
869849 t . deepEqual (
@@ -891,10 +871,10 @@ test.serial(
891871 const result = await setupCodeql . getEnabledVersionsWithOverlayBaseDatabases (
892872 overlayMatchEnabledVersions ,
893873 [ "javascript" ] ,
894- makeOverlayMatchFeatures ( {
895- matchFlagEnabled : true ,
896- dryRunFlagEnabled : true ,
897- } ) ,
874+ createFeatures ( [
875+ Feature . OverlayAnalysisMatchCodeqlVersion ,
876+ Feature . OverlayAnalysisMatchCodeqlVersionDryRun ,
877+ ] ) ,
898878 getRunnerLogger ( true ) ,
899879 ) ;
900880 t . deepEqual ( result , [
0 commit comments