aboutsummaryrefslogblamecommitdiffstats
path: root/tree_diff_test.go
blob: b7efaa1504f65456b763c42d4afceadf3fab69da (plain) (tree)
1
2
3
4
5
6
7
8





              

                                                   




                             

                 





                                          

                                 





















                                                                                       
                                                            





                                                   
                                                                      


























                                                       















































                                                                                                

                                                 

                                         












                                                  


                                            




                                                                                   



                                            



                                            




                          

                                            



                                                                              




                                                                  
                                         




                                                                   
                                         




                                                                   
                                       






                                                                   
                                       






                                                                               
                                       






                                                                               
                                       






                                                                               
                                         




                                                                   
                                       








                                                                         
                                       








                                                                         
                                         




                                                                   

                                                                          


                                                                                






                                                                   

                                                                          


                                                                                






                                                                   
                                         




                                                                   
                                       






                                                                      
                                       









                                                                           
                                       






                                                                      
                                       











                                                                           
                                       











                                                                           
                                       








                                                                           
                                       











                                                                           
                                       









                                                                            
                                       



































                                                                                                                                      

                                                          
                            

                                                           
                            

                                                           



                 
                                                     












                                 


                              
                                                                   
















                                                                  
                            
 
package git

import (
	"os"
	"sort"

	"gopkg.in/src-d/go-git.v4/core"
	"gopkg.in/src-d/go-git.v4/formats/packfile"

	. "gopkg.in/check.v1"
)

type DiffTreeSuite struct {
	BaseSuite

	repos map[string]*Repository
}

var _ = Suite(&DiffTreeSuite{})

func (s *DiffTreeSuite) SetUpSuite(c *C) {
	s.BaseSuite.SetUpSuite(c)

	fixtureRepos := [...]struct {
		url      string
		packfile string
	}{
		{"git://github.com/github/gem-builder.git",
			"fixtures/pack-1ea0b3971fd64fdcdf3282bfb58e8cf10095e4e6.pack"},
		{"git://github.com/githubtraining/example-branches.git",
			"fixtures/pack-bb8ee94710d3fa39379a630f76812c187217b312.pack"},
		{"git://github.com/rumpkernel/rumprun-xen.git",
			"fixtures/pack-7861f2632868833a35fe5e4ab94f99638ec5129b.pack"},
		{"git://github.com/mcuadros/skeetr.git",
			"fixtures/pack-36ef7a2296bfd526020340d27c5e1faa805d8d38.pack"},
		{"git://github.com/dezfowler/LiteMock.git",
			"fixtures/pack-0d9b6cfc261785837939aaede5986d7a7c212518.pack"},
		{"git://github.com/tyba/storable.git",
			"fixtures/pack-0d3d824fb5c930e7e7e1f0f399f2976847d31fd3.pack"},
		{"git://github.com/toqueteos/ts3.git",
			"fixtures/pack-21b33a26eb7ffbd35261149fe5d886b9debab7cb.pack"},
	}

	s.repos = make(map[string]*Repository, 0)
	for _, fixRepo := range fixtureRepos {
		s.repos[fixRepo.url] = NewMemoryRepository()

		f, err := os.Open(fixRepo.packfile)
		c.Assert(err, IsNil)

		r := packfile.NewSeekable(f)
		d := packfile.NewDecoder(r)
		err = d.Decode(s.repos[fixRepo.url].s.ObjectStorage())
		c.Assert(err, IsNil)

		c.Assert(f.Close(), IsNil)
	}
}

func (s *DiffTreeSuite) TestActionString(c *C) {
	expected := "Insert"
	action := Insert
	obtained := action.String()
	c.Assert(obtained, Equals, expected)

	expected = "Delete"
	action = Delete
	obtained = action.String()
	c.Assert(obtained, Equals, expected)

	expected = "Modify"
	action = Modify
	obtained = action.String()
	c.Assert(obtained, Equals, expected)

	action = 37
	c.Assert(func() { action.String() },
		PanicMatches, "unsupported action: 37")
}

func (s *DiffTreeSuite) TestChangeFilesInsert(c *C) {
	tree, err := s.Repository.Tree(core.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c"))
	c.Assert(err, IsNil)

	change := &Change{Action: Insert}
	change.To.Name = "json/long.json"
	change.To.Tree = tree
	change.To.TreeEntry.Hash = core.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9")

	from, to, err := change.Files()
	c.Assert(err, IsNil)
	c.Assert(from, IsNil)
	c.Assert(to.ID(), Equals, change.To.TreeEntry.Hash)
}

func (s *DiffTreeSuite) TestChangeFilesDelete(c *C) {
	tree, err := s.Repository.Tree(core.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c"))
	c.Assert(err, IsNil)

	change := &Change{Action: Delete}
	change.From.Name = "json/long.json"
	change.From.Tree = tree
	change.From.TreeEntry.Hash = core.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9")

	from, to, err := change.Files()
	c.Assert(err, IsNil)
	c.Assert(to, IsNil)
	c.Assert(from.ID(), Equals, change.From.TreeEntry.Hash)
}

func (s *DiffTreeSuite) TestChangeFilesModify(c *C) {
	tree, err := s.Repository.Tree(core.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c"))
	c.Assert(err, IsNil)

	change := &Change{Action: Modify}
	change.To.Name = "json/long.json"
	change.To.Tree = tree
	change.To.TreeEntry.Hash = core.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9")
	change.From.Name = "json/long.json"
	change.From.Tree = tree
	change.From.TreeEntry.Hash = core.NewHash("9a48f23120e880dfbe41f7c9b7b708e9ee62a492")

	from, to, err := change.Files()
	c.Assert(err, IsNil)
	c.Assert(to.ID(), Equals, change.To.TreeEntry.Hash)
	c.Assert(from.ID(), Equals, change.From.TreeEntry.Hash)
}

func (s *DiffTreeSuite) TestChangeString(c *C) {
	expected := "<Action: Insert, Path: foo>"
	change := &Change{Action: Insert}
	change.From.Name = "foo"

	obtained := change.String()
	c.Assert(obtained, Equals, expected)
}

func (s *DiffTreeSuite) TestChangesString(c *C) {
	expected := "[]"
	changes := newEmpty()
	obtained := changes.String()
	c.Assert(obtained, Equals, expected)

	expected = "[<Action: Modify, Path: bla>]"
	changes = make([]*Change, 1)
	changes[0] = &Change{Action: Modify}
	changes[0].From.Name = "bla"

	obtained = changes.String()
	c.Assert(obtained, Equals, expected)

	expected = "[<Action: Modify, Path: bla>, <Action: Insert, Path: foo/bar>]"
	changes = make([]*Change, 2)
	changes[0] = &Change{Action: Modify}
	changes[0].From.Name = "bla"
	changes[1] = &Change{Action: Insert}
	changes[1].From.Name = "foo/bar"
	obtained = changes.String()
	c.Assert(obtained, Equals, expected)
}

type expectChange struct {
	Action Action
	Name   string
}

func (s *DiffTreeSuite) TestDiffTree(c *C) {
	for i, t := range []struct {
		repo     string         // the repo name as in localRepos
		commit1  string         // the commit of the first tree
		commit2  string         // the commit of the second tree
		expected []expectChange // the expected list of []changeExpect
	}{
		{
			"git://github.com/dezfowler/LiteMock.git",
			"",
			"",
			[]expectChange{},
		},
		{
			"git://github.com/dezfowler/LiteMock.git",
			"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
			"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
			[]expectChange{},
		},
		{
			"git://github.com/dezfowler/LiteMock.git",
			"",
			"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
			[]expectChange{
				{Action: Insert, Name: "README"},
			},
		},
		{
			"git://github.com/dezfowler/LiteMock.git",
			"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
			"",
			[]expectChange{
				{Action: Delete, Name: "README"},
			},
		},
		{
			"git://github.com/githubtraining/example-branches.git",
			"",
			"f0eb272cc8f77803478c6748103a1450aa1abd37",
			[]expectChange{
				{Action: Insert, Name: "README.md"},
			},
		},
		{
			"git://github.com/githubtraining/example-branches.git",
			"f0eb272cc8f77803478c6748103a1450aa1abd37",
			"",
			[]expectChange{
				{Action: Delete, Name: "README.md"},
			},
		},
		{
			"git://github.com/githubtraining/example-branches.git",
			"f0eb272cc8f77803478c6748103a1450aa1abd37",
			"f0eb272cc8f77803478c6748103a1450aa1abd37",
			[]expectChange{},
		},
		{
			"git://github.com/github/gem-builder.git",
			"",
			"9608eed92b3839b06ebf72d5043da547de10ce85",
			[]expectChange{
				{Action: Insert, Name: "README"},
				{Action: Insert, Name: "gem_builder.rb"},
				{Action: Insert, Name: "gem_eval.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"9608eed92b3839b06ebf72d5043da547de10ce85",
			"",
			[]expectChange{
				{Action: Delete, Name: "README"},
				{Action: Delete, Name: "gem_builder.rb"},
				{Action: Delete, Name: "gem_eval.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"9608eed92b3839b06ebf72d5043da547de10ce85",
			"9608eed92b3839b06ebf72d5043da547de10ce85",
			[]expectChange{},
		},
		{
			"git://github.com/toqueteos/ts3.git",
			"",
			"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
			[]expectChange{
				{Action: Insert, Name: "README.markdown"},
				{Action: Insert, Name: "examples/bot.go"},
				{Action: Insert, Name: "examples/raw_shell.go"},
				{Action: Insert, Name: "helpers.go"},
				{Action: Insert, Name: "ts3.go"},
			},
		},
		{
			"git://github.com/toqueteos/ts3.git",
			"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
			"",
			[]expectChange{
				{Action: Delete, Name: "README.markdown"},
				{Action: Delete, Name: "examples/bot.go"},
				{Action: Delete, Name: "examples/raw_shell.go"},
				{Action: Delete, Name: "helpers.go"},
				{Action: Delete, Name: "ts3.go"},
			},
		},
		{
			"git://github.com/toqueteos/ts3.git",
			"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
			"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
			[]expectChange{},
		},
		{
			"git://github.com/github/gem-builder.git",
			"9608eed92b3839b06ebf72d5043da547de10ce85",
			"6c41e05a17e19805879689414026eb4e279f7de0",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"6c41e05a17e19805879689414026eb4e279f7de0",
			"89be3aac2f178719c12953cc9eaa23441f8d9371",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
				{Action: Insert, Name: "gem_eval_test.rb"},
				{Action: Insert, Name: "security.rb"},
				{Action: Insert, Name: "security_test.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"89be3aac2f178719c12953cc9eaa23441f8d9371",
			"597240b7da22d03ad555328f15abc480b820acc0",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"597240b7da22d03ad555328f15abc480b820acc0",
			"0260380e375d2dd0e1a8fcab15f91ce56dbe778e",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
				{Action: Modify, Name: "gem_eval_test.rb"},
				{Action: Insert, Name: "lazy_dir.rb"},
				{Action: Insert, Name: "lazy_dir_test.rb"},
				{Action: Modify, Name: "security.rb"},
				{Action: Modify, Name: "security_test.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"0260380e375d2dd0e1a8fcab15f91ce56dbe778e",
			"597240b7da22d03ad555328f15abc480b820acc0",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
				{Action: Modify, Name: "gem_eval_test.rb"},
				{Action: Delete, Name: "lazy_dir.rb"},
				{Action: Delete, Name: "lazy_dir_test.rb"},
				{Action: Modify, Name: "security.rb"},
				{Action: Modify, Name: "security_test.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"0260380e375d2dd0e1a8fcab15f91ce56dbe778e",
			"ca9fd470bacb6262eb4ca23ee48bb2f43711c1ff",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
				{Action: Modify, Name: "security.rb"},
				{Action: Modify, Name: "security_test.rb"},
			},
		},
		{
			"git://github.com/github/gem-builder.git",
			"fe3c86745f887c23a0d38c85cfd87ca957312f86",
			"b7e3f636febf7a0cd3ab473b6d30081786d2c5b6",
			[]expectChange{
				{Action: Modify, Name: "gem_eval.rb"},
				{Action: Modify, Name: "gem_eval_test.rb"},
				{Action: Insert, Name: "git_mock"},
				{Action: Modify, Name: "lazy_dir.rb"},
				{Action: Modify, Name: "lazy_dir_test.rb"},
				{Action: Modify, Name: "security.rb"},
			},
		},
		{
			"git://github.com/rumpkernel/rumprun-xen.git",
			"1831e47b0c6db750714cd0e4be97b5af17fb1eb0",
			"51d8515578ea0c88cc8fc1a057903675cf1fc16c",
			[]expectChange{
				{Action: Modify, Name: "Makefile"},
				{Action: Modify, Name: "netbsd_init.c"},
				{Action: Modify, Name: "rumphyper_stubs.c"},
				{Action: Delete, Name: "sysproxy.c"},
			},
		},
		{
			"git://github.com/rumpkernel/rumprun-xen.git",
			"1831e47b0c6db750714cd0e4be97b5af17fb1eb0",
			"e13e678f7ee9badd01b120889e0ec5fdc8ae3802",
			[]expectChange{
				{Action: Modify, Name: "app-tools/rumprun"},
			},
		},
	} {
		repo, ok := s.repos[t.repo]
		c.Assert(ok, Equals, true,
			Commentf("subtest %d: repo %s not found", i, t.repo))

		tree1, err := tree(repo, t.commit1)
		c.Assert(err, IsNil,
			Commentf("subtest %d: unable to retrieve tree from commit %s and repo %s: %s", i, t.commit1, t.repo, err))

		var tree2 *Tree
		if t.commit1 == t.commit2 {
			tree2 = tree1
		} else {
			tree2, err = tree(repo, t.commit2)
			c.Assert(err, IsNil,
				Commentf("subtest %d: unable to retrieve tree from commit %s and repo %s", i, t.commit2, t.repo, err))
		}

		obtained, err := DiffTree(tree1, tree2)
		c.Assert(err, IsNil,
			Commentf("subtest %d: unable to calculate difftree: %s", i, err))
		c.Assert(equalChanges(obtained, t.expected), Equals, true,
			Commentf("subtest:%d\nrepo=%s\ncommit1=%s\ncommit2=%s\nexpected=%s\nobtained=%s",
				i, t.repo, t.commit1, t.commit2, t.expected, obtained))

		assertChanges(obtained, c)
	}
}

func assertChanges(a Changes, c *C) {
	for _, changes := range a {
		switch changes.Action {
		case Insert:
			c.Assert(changes.From.Tree, IsNil)
			c.Assert(changes.To.Tree, NotNil)
		case Delete:
			c.Assert(changes.From.Tree, NotNil)
			c.Assert(changes.To.Tree, IsNil)
		case Modify:
			c.Assert(changes.From.Tree, NotNil)
			c.Assert(changes.To.Tree, NotNil)
		}
	}
}

func equalChanges(a Changes, b []expectChange) bool {
	if a == nil && b == nil {
		return true
	}

	if a == nil || b == nil {
		return false
	}

	if len(a) != len(b) {
		return false
	}

	sort.Sort(a)

	for i, va := range a {
		vb := b[i]
		if va.Action != vb.Action || va.name() != vb.Name {
			return false
		}
	}

	return true
}

func tree(repo *Repository, commitHashStr string) (*Tree, error) {
	if commitHashStr == "" {
		return nil, nil
	}

	commit, err := repo.Commit(core.NewHash(commitHashStr))
	if err != nil {
		return nil, err
	}

	return commit.Tree()
}