Commit 6651ddc Jacob Woliver
committed
1 parent cfab93c commit 6651ddc Copy full SHA for 6651ddc
File tree 4 files changed +13
-5
lines changed
4 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ var validSchemas = []int{
13
13
var validBiocSchemas = []int {
14
14
3 ,
15
15
4 ,
16
+ 5 ,
16
17
}
17
18
18
19
func IsValidSchema (v version.ManifestVersion ) bool {
Original file line number Diff line number Diff line change @@ -58,11 +58,13 @@ func (s *SchemaSuite) TestIsValidBiocSchema() {
58
58
{"v2" , false },
59
59
{"v3" , true },
60
60
{"v4" , true },
61
+ {"v5" , true },
61
62
{"v13" , false },
62
63
{"1" , false },
63
64
{"2" , false },
64
65
{"3" , true },
65
66
{"4" , true },
67
+ {"5" , true },
66
68
{"13" , false },
67
69
{"v1/2" , false },
68
70
{"v2/2" , false },
@@ -73,6 +75,7 @@ func (s *SchemaSuite) TestIsValidBiocSchema() {
73
75
{"v2/2/4" , false },
74
76
{"v3/2/4" , true },
75
77
{"v4/2/4" , true },
78
+ {"v5/2/4" , true },
76
79
{"v13/2/4" , false },
77
80
} {
78
81
v , err := version .ParseNewManifestVersion (test .version )
Original file line number Diff line number Diff line change 6
6
"path/filepath"
7
7
8
8
"github.com/rstudio/package-manager-rpackagerewriter/pkg/archive"
9
- "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
10
- "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
9
+ v1 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
10
+ v2 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
11
11
)
12
12
13
13
type FilePathGetter interface {
@@ -42,7 +42,7 @@ func (f *defaultFilePathGetterFactory) GetFilePathGetter(schemaVersion int) (Fil
42
42
43
43
func (f * biocFilePathGetterFactory ) GetFilePathGetter (schemaVersion int ) (FilePathGetter , error ) {
44
44
switch schemaVersion {
45
- case 3 , 4 :
45
+ case 3 , 4 , 5 :
46
46
// Bioc was originally created at parity with CRAN at version 3. Version 4 of bioc was a simple copy
47
47
// of version 3 that was used to force a fresh sync so that a fix in the sync code would be picked
48
48
// up. For both of these reasons, the Bioc transformer here is the same as the CRAN V2V3FilePathGetter.
Original file line number Diff line number Diff line change 7
7
"github.com/stretchr/testify/suite"
8
8
9
9
"github.com/rstudio/package-manager-rpackagerewriter/pkg/archive"
10
- "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
11
- "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
10
+ v1 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
11
+ v2 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
12
12
)
13
13
14
14
func TestFilePathGetterSuite (t * testing.T ) {
@@ -65,6 +65,10 @@ func (s *FilePathGetterSuite) TestGetBioc() {
65
65
s .Require ().Nil (err )
66
66
s .Require ().IsType (& v2.V2V3FilePathGetter {}, fpg )
67
67
68
+ fpg , err = fpf .GetFilePathGetter (5 )
69
+ s .Require ().Nil (err )
70
+ s .Require ().IsType (& v2.V2V3FilePathGetter {}, fpg )
71
+
68
72
_ , err = fpf .GetFilePathGetter (13 )
69
73
s .Require ().ErrorContains (err , "Invalid version 13 for GetFilePathGetter" )
70
74
}
You can’t perform that action at this time.
0 commit comments