Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test: unixfs @ 87% coverage #3492

Merged
merged 2 commits into from
Dec 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion unixfs/format.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func FilePBData(data []byte, totalsize uint64) []byte {
return data
}

// Returns Bytes that represent a Directory
//FolderPBData returns Bytes that represent a Directory.
func FolderPBData() []byte {
pbfile := new(pb.Data)
typ := pb.Data_Directory
Expand All @@ -65,6 +65,7 @@ func FolderPBData() []byte {
return data
}

//WrapData marshals raw bytes into a `Data_Raw` type protobuf message.
func WrapData(b []byte) []byte {
pbdata := new(pb.Data)
typ := pb.Data_Raw
Expand All @@ -81,6 +82,7 @@ func WrapData(b []byte) []byte {
return out
}

//SymlinkData returns a `Data_Symlink` protobuf message for the path you specify.
func SymlinkData(path string) ([]byte, error) {
pbdata := new(pb.Data)
typ := pb.Data_Symlink
Expand Down Expand Up @@ -184,6 +186,7 @@ type Metadata struct {
Size uint64
}

//MetadataFromBytes Unmarshals a protobuf message into Metadata.
func MetadataFromBytes(b []byte) (*Metadata, error) {
pbd := new(pb.Data)
err := proto.Unmarshal(b, pbd)
Expand Down
124 changes: 123 additions & 1 deletion unixfs/format_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package unixfs

import (
"bytes"
"testing"

proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
Expand All @@ -11,9 +12,10 @@ import (
func TestFSNode(t *testing.T) {
fsn := new(FSNode)
fsn.Type = TFile
for i := 0; i < 15; i++ {
for i := 0; i < 16; i++ {
fsn.AddBlockSize(100)
}
fsn.RemoveBlockSize(15)

fsn.Data = make([]byte, 128)

Expand All @@ -32,8 +34,128 @@ func TestFSNode(t *testing.T) {
if err != nil {
t.Fatal(err)
}
nKids := fsn.NumChildren()
if nKids != 15 {
t.Fatal("Wrong number of child nodes")
}

if ds != (100*15)+128 {
t.Fatal("Datasize calculations incorrect!")
}

nfsn, err := FSNodeFromBytes(b)
if err != nil {
t.Fatal(err)
}

if nfsn.FileSize() != (100*15)+128 {
t.Fatal("fsNode FileSize calculations incorrect")
}
}

func TestPBdataTools(t *testing.T) {
raw := []byte{0x00, 0x01, 0x02, 0x17, 0xA1}
rawPB := WrapData(raw)

pbDataSize, err := DataSize(rawPB)
if err != nil {
t.Fatal(err)
}

same := len(raw) == int(pbDataSize)
if !same {
t.Fatal("WrapData changes the size of data.")
}

rawPBBytes, err := UnwrapData(rawPB)
if err != nil {
t.Fatal(err)
}

same = bytes.Equal(raw, rawPBBytes)
if !same {
t.Fatal("Unwrap failed to produce the correct wrapped data.")
}

rawPBdata, err := FromBytes(rawPB)
if err != nil {
t.Fatal(err)
}

isRaw := rawPBdata.GetType() == TRaw
if !isRaw {
t.Fatal("WrapData does not create pb.Data_Raw!")
}

catFile := []byte("Mr_Meowgie.gif")
catPBfile := FilePBData(catFile, 17)
catSize, err := DataSize(catPBfile)
if catSize != 17 {
t.Fatal("FilePBData is the wrong size.")
}
if err != nil {
t.Fatal(err)
}

dirPB := FolderPBData()
dir, err := FromBytes(dirPB)
isDir := dir.GetType() == TDirectory
if !isDir {
t.Fatal("FolderPBData does not create a directory!")
}
if err != nil {
t.Fatal(err)
}
_, dirErr := DataSize(dirPB)
if dirErr == nil {
t.Fatal("DataSize didn't throw an error when taking the size of a directory.")
}

catSym, err := SymlinkData("/ipfs/adad123123/meowgie.gif")
if err != nil {
t.Fatal(err)
}

catSymPB, err := FromBytes(catSym)
isSym := catSymPB.GetType() == TSymlink
if !isSym {
t.Fatal("Failed to make a Symlink.")
}
if err != nil {
t.Fatal(err)
}

_, sizeErr := DataSize(catSym)
if sizeErr == nil {
t.Fatal("DataSize didn't throw an error when taking the size of a Symlink.")
}

}

func TestMetedata(t *testing.T) {
meta := &Metadata{
MimeType: "audio/aiff",
Size: 12345,
}

_, err := meta.Bytes()
if err != nil {
t.Fatal(err)
}

metaPB, err := BytesForMetadata(meta)
if err != nil {
t.Fatal(err)
}

meta, err = MetadataFromBytes(metaPB)
if err != nil {
t.Fatal(err)
}

mimeAiff := meta.MimeType == "audio/aiff"
if !mimeAiff {
t.Fatal("Metadata does not Marshal and Unmarshal properly!")
}

}