vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-20 19:38:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug with special chars handling in strings, detect package key queries,

Browse Source 
arch condition for dependency-like queries.
This commit is contained in:
Andrey Smirnov
2014-07-12 00:14:49 +04:00
parent b42fd71acf
commit d54ef1e921
5 changed files with 88 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
query/syntax_test.go
View File

@@ -11,11 +11,11 @@ type SyntaxSuite struct {
var _ = Suite(&SyntaxSuite{})
func (s *SyntaxSuite) TestParsing(c *C) {
l, _ := lex("query", "package (<< 1.3), $Source")
l, _ := lex("query", "package (<< 1.3~dev), $Source")
q, err := parse(l)
c.Assert(err, IsNil)
c.Check(q.(*deb.AndQuery).L, DeepEquals, &deb.DependencyQuery{Dep: deb.Dependency{Pkg: "package", Relation: deb.VersionLess, Version: "1.3"}})
c.Check(q.(*deb.AndQuery).L, DeepEquals, &deb.DependencyQuery{Dep: deb.Dependency{Pkg: "package", Relation: deb.VersionLess, Version: "1.3~dev"}})
c.Check(q.(*deb.AndQuery).R, DeepEquals, &deb.FieldQuery{Field: "$Source"})
l, _ = lex("query", "package (1.3), Name (lala) | !$Source")
@@ -39,6 +39,19 @@ func (s *SyntaxSuite) TestParsing(c *C) {
c.Assert(err, IsNil)
c.Check(q, DeepEquals, &deb.DependencyQuery{Dep: deb.Dependency{Pkg: "package", Relation: deb.VersionGreaterOrEqual, Version: "5.3.7"}})
l, _ = lex("query", "alien-data_1.3.4~dev_i386")
q, err = parse(l)
c.Assert(err, IsNil)
c.Check(q, DeepEquals, &deb.PkgQuery{Pkg: "alien-data", Version: "1.3.4~dev", Arch: "i386"})
l, _ = lex("query", "package (> 5.3.7) {amd64}")
q, err = parse(l)
c.Assert(err, IsNil)
c.Check(q, DeepEquals, &deb.DependencyQuery{
Dep: deb.Dependency{Pkg: "package", Relation: deb.VersionGreaterOrEqual, Version: "5.3.7", Architecture: "amd64"}})
}
func (s *SyntaxSuite) TestParsingErrors(c *C) {
@@ -48,7 +61,7 @@ func (s *SyntaxSuite) TestParsingErrors(c *C) {
l, _ = lex("query", "package>5.3.7)")
_, err = parse(l)
c.Check(err, ErrorMatches, "parsing failed: unexpected token >: expecting end of query")
c.Check(err, ErrorMatches, "parsing failed: unexpected token \\): expecting end of query")
l, _ = lex("query", "package | !|")
_, err = parse(l)