Refactor to use single struct Dependency.

This commit is contained in:
Andrey Smirnov
2014-01-08 18:38:02 +04:00
parent 4969c31e38
commit 5dbb771ba8
3 changed files with 62 additions and 52 deletions
+34 -34
View File
@@ -99,57 +99,57 @@ func (s *VersionSuite) TestCompareVersions(c *C) {
}
func (s *VersionSuite) TestParseDependency(c *C) {
p, r, v, e := parseDependency("dpkg (>= 1.6)")
d, e := parseDependency("dpkg (>= 1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionGreaterOrEqual)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionGreaterOrEqual)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg(>>1.6)")
d, e = parseDependency("dpkg(>>1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionGreater)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionGreater)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg (> 1.6)")
d, e = parseDependency("dpkg (> 1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionGreaterOrEqual)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionGreaterOrEqual)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg (< 1.6)")
d, e = parseDependency("dpkg (< 1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionLessOrEqual)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionLessOrEqual)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg (= 1.6)")
d, e = parseDependency("dpkg (= 1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionEqual)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionEqual)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg (<< 1.6)")
d, e = parseDependency("dpkg (<< 1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionLess)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionLess)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg(>>1.6)")
d, e = parseDependency("dpkg(>>1.6)")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionGreater)
c.Check(v, Equals, "1.6")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionGreater)
c.Check(d.Version, Equals, "1.6")
p, r, v, e = parseDependency("dpkg ")
d, e = parseDependency("dpkg ")
c.Check(e, IsNil)
c.Check(p, Equals, "dpkg")
c.Check(r, Equals, VersionDontCare)
c.Check(v, Equals, "")
c.Check(d.Pkg, Equals, "dpkg")
c.Check(d.Relation, Equals, VersionDontCare)
c.Check(d.Version, Equals, "")
p, r, v, e = parseDependency("dpkg(==1.6)")
d, e = parseDependency("dpkg(==1.6)")
c.Check(e, ErrorMatches, "relation unknown.*")
p, r, v, e = parseDependency("dpkg==1.6)")
d, e = parseDependency("dpkg==1.6)")
c.Check(e, ErrorMatches, "unable to parse.*")
}