Modified output format of values.TagID

spiegel-im-spiegel · spiegel-im-spiegel · commit 8989fa53cf92 · 2017-11-26T12:21:45.000+09:00
diff --git a/cli/gpgpdump/facade/facade_test.go b/cli/gpgpdump/facade/facade_test.go
@@ -23,17 +23,15 @@ T1ZprZqwRPOjiLJg9AwA/ArTwCPz7c2vmxlv7sRlRLUI6CdsOqhuO1KfYXrq7idI
 
 var (
 	resdataFromBindata1 = `[[Packet]]
-  name = "Packet"
-  value = "Marker Packet (Obsolete Literal Packet) (tag 10)"
+  name = "Marker Packet (Obsolete Literal Packet) (tag 10)"
   note = "3 bytes"
 
   [[Packet.Item]]
     name = "Literal data"
     note = "3 bytes"
 
 [[Packet]]
-  name = "Packet"
-  value = "Symmetric-Key Encrypted Session Key Packet (tag 3)"
+  name = "Symmetric-Key Encrypted Session Key Packet (tag 3)"
   note = "4 bytes"
 
   [[Packet.Item]]
@@ -54,8 +52,7 @@ var (
       value = "MD5 (hash 1)"
 
 [[Packet]]
-  name = "Packet"
-  value = "Symmetrically Encrypted Data Packet (tag 9)"
+  name = "Symmetrically Encrypted Data Packet (tag 9)"
   note = "56 bytes"
 
   [[Packet.Item]]
@@ -67,8 +64,7 @@ var (
     note = "55 bytes"
 `
 	resdataFromAscdata1 = `[[Packet]]
-  name = "Packet"
-  value = "Signature Packet (tag 2)"
+  name = "Signature Packet (tag 2)"
   note = "94 bytes"
 
   [[Packet.Item]]
diff --git a/cli/gpgpdump/facade/json_test.go b/cli/gpgpdump/facade/json_test.go
@@ -10,8 +10,7 @@ import (
 var resJSON = `{
   "Packet": [
     {
-      "name": "Packet",
-      "value": "Marker Packet (Obsolete Literal Packet) (tag 10)",
+      "name": "Marker Packet (Obsolete Literal Packet) (tag 10)",
       "note": "3 bytes",
       "Item": [
         {
@@ -21,8 +20,7 @@ var resJSON = `{
       ]
     },
     {
-      "name": "Packet",
-      "value": "Symmetric-Key Encrypted Session Key Packet (tag 3)",
+      "name": "Symmetric-Key Encrypted Session Key Packet (tag 3)",
       "note": "4 bytes",
       "Item": [
         {
@@ -47,8 +45,7 @@ var resJSON = `{
       ]
     },
     {
-      "name": "Packet",
-      "value": "Symmetrically Encrypted Data Packet (tag 9)",
+      "name": "Symmetrically Encrypted Data Packet (tag 9)",
       "note": "56 bytes",
       "Item": [
         {
diff --git a/packet/parser_test.go b/packet/parser_test.go
@@ -25,8 +25,7 @@ const (
 	result2 = `{
   "Packet": [
     {
-      "name": "Packet",
-      "value": "Signature Packet (tag 2)",
+      "name": "Signature Packet (tag 2)",
       "dump": "04 01 13 08 00 06 05 02 54 c3 08 df 00 0a 09 10 31 fb fd a9 5f bb fa 18 36 1f 01 00 ea 1d a2 14 5b 82 06 fd d5 ae c4 9f d8 14 44 41 a4 f5 4f 56 69 ad 9a b0 44 f3 a3 88 b2 60 f4 0c 00 fc 0a d3 c0 23 f3 ed cd af 9b 19 6f ee c4 65 44 b5 08 e8 27 6c 3a a8 6e 3b 52 9f 61 7a ea ee 27 48",
       "note": "94 bytes",
       "Item": [
diff --git a/packet/tags/tags_test.go b/packet/tags/tags_test.go
@@ -27,11 +27,11 @@ func TestTag01(t *testing.T) {
 		t.Errorf("NewTag() = %v, want nil error.", err)
 		return
 	}
-	if i.Name != "Packet" {
-		t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)
+	if i.Name != tag01Name {
+		t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Name, tag01Name)
 	}
-	if i.Value != tag01Name {
-		t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, tag01Name)
+	if i.Value != "" {
+		t.Errorf("Tag.Name = \"%s\", want \"\".", i.Value)
 	}
 	if i.Note != "126 bytes" {
 		t.Errorf("Tag.Note = \"%s\", want \"126 bytes\"", i.Note)
@@ -49,11 +49,11 @@ func TestTag02(t *testing.T) {
 		t.Errorf("NewTag() = %v, want nil error.", err)
 		return
 	}
-	if i.Name != "Packet" {
-		t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)
+	if i.Name != tag02Name {
+		t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Name, tag02Name)
 	}
-	if i.Value != tag02Name {
-		t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, tag02Name)
+	if i.Value != "" {
+		t.Errorf("Tag.Name = \"%s\", want \"\".", i.Value)
 	}
 	if i.Note != "94 bytes" {
 		t.Errorf("Tag.Note = \"%s\", want \"94 bytes\"", i.Note)
@@ -74,11 +74,11 @@ func TestTagUnknown(t *testing.T) {
 		t.Errorf("NewTag() = %v, want nil error.", err)
 		return
 	}
-	if i.Name != "Packet" {
-		t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)
+	if i.Name != name {
+		t.Errorf("Tag.Name = \"%s\", want \"%s\".", i.Name, name)
 	}
-	if i.Value != name {
-		t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, name)
+	if i.Value != "" {
+		t.Errorf("Tag.Value = \"%s\", want \"\".", i.Value)
 	}
 	if i.Note != "4 bytes" {
 		t.Errorf("Tag.Note = \"%s\", want \"4 bytes\"", i.Note)
diff --git a/packet/values/tagid.go b/packet/values/tagid.go
@@ -38,8 +38,7 @@ type TagID int
 // ToItem returns Item instance
 func (t TagID) ToItem(r *reader.Reader, dumpFlag bool) *info.Item {
 	return info.NewItem(
-		info.Name("Packet"),
-		info.Value(t.String()),
+		info.Name(t.String()),
 		info.Note(fmt.Sprintf("%d bytes", r.Len())),
 		info.DumpStr(Dump(r, dumpFlag).String()),
 	)
diff --git a/packet/values/tagid_test.go b/packet/values/tagid_test.go
@@ -78,11 +78,11 @@ func TestTagID(t *testing.T) {
 	var body = []byte{0x01, 0x02, 0x03, 0x04}
 	for tag := 0; tag <= 64; tag++ {
 		i := TagID(tag).ToItem(reader.New(body), true)
-		if i.Name != "Packet" {
-			t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)
+		if i.Name != testTagNames[tag] {
+			t.Errorf("Tag.Name = \"%s\", want \"%s\".", i.Name, testTagNames[tag])
 		}
-		if i.Value != testTagNames[tag] {
-			t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, testTagNames[tag])
+		if i.Value != "" {
+			t.Errorf("Tag.Value = \"%s\", want \"\".", i.Name)
 		}
 		if i.Note != "4 bytes" {
 			t.Errorf("Tag.Note = \"%s\", want \"4 bytes\"", i.Note)
diff --git a/parse_test.go b/parse_test.go
@@ -30,7 +30,7 @@ func ExampleParse() {
 	if err != nil {
 		return
 	}
-	fmt.Println(info.Packets[0].Value)
+	fmt.Println(info.Packets[0].Name)
 	// Output:
 	// Signature Packet (tag 2)
 }
@@ -40,7 +40,7 @@ func ExampleParseByte() {
 	if err != nil {
 		return
 	}
-	fmt.Println(info.Packets[0].Value)
+	fmt.Println(info.Packets[0].Name)
 	// Output:
 	// Signature Packet (tag 2)
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@ import (`
`10`	`10`	var resJSON = `{
`11`	`11`	`"Packet": [`
`12`	`12`	`{`
`13`		`- "name": "Packet",`
`14`		`- "value": "Marker Packet (Obsolete Literal Packet) (tag 10)",`
	`13`	`+ "name": "Marker Packet (Obsolete Literal Packet) (tag 10)",`
`15`	`14`	`"note": "3 bytes",`
`16`	`15`	`"Item": [`
`17`	`16`	`{`
@@ -21,8 +20,7 @@ var resJSON = `{
`21`	`20`	`]`
`22`	`21`	`},`
`23`	`22`	`{`
`24`		`- "name": "Packet",`
`25`		`- "value": "Symmetric-Key Encrypted Session Key Packet (tag 3)",`
	`23`	`+ "name": "Symmetric-Key Encrypted Session Key Packet (tag 3)",`
`26`	`24`	`"note": "4 bytes",`
`27`	`25`	`"Item": [`
`28`	`26`	`{`
@@ -47,8 +45,7 @@ var resJSON = `{
`47`	`45`	`]`
`48`	`46`	`},`
`49`	`47`	`{`
`50`		`- "name": "Packet",`
`51`		`- "value": "Symmetrically Encrypted Data Packet (tag 9)",`
	`48`	`+ "name": "Symmetrically Encrypted Data Packet (tag 9)",`
`52`	`49`	`"note": "56 bytes",`
`53`	`50`	`"Item": [`
`54`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ func TestTag01(t *testing.T) {`
`27`	`27`	`t.Errorf("NewTag() = %v, want nil error.", err)`
`28`	`28`	`return`
`29`	`29`	`}`
`30`		`- if i.Name != "Packet" {`
`31`		`- t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)`
	`30`	`+ if i.Name != tag01Name {`
	`31`	`+ t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Name, tag01Name)`
`32`	`32`	`}`
`33`		`- if i.Value != tag01Name {`
`34`		`- t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, tag01Name)`
	`33`	`+ if i.Value != "" {`
	`34`	`+ t.Errorf("Tag.Name = \"%s\", want \"\".", i.Value)`
`35`	`35`	`}`
`36`	`36`	`if i.Note != "126 bytes" {`
`37`	`37`	`t.Errorf("Tag.Note = \"%s\", want \"126 bytes\"", i.Note)`
`@@ -49,11 +49,11 @@ func TestTag02(t *testing.T) {`
`49`	`49`	`t.Errorf("NewTag() = %v, want nil error.", err)`
`50`	`50`	`return`
`51`	`51`	`}`
`52`		`- if i.Name != "Packet" {`
`53`		`- t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)`
	`52`	`+ if i.Name != tag02Name {`
	`53`	`+ t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Name, tag02Name)`
`54`	`54`	`}`
`55`		`- if i.Value != tag02Name {`
`56`		`- t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, tag02Name)`
	`55`	`+ if i.Value != "" {`
	`56`	`+ t.Errorf("Tag.Name = \"%s\", want \"\".", i.Value)`
`57`	`57`	`}`
`58`	`58`	`if i.Note != "94 bytes" {`
`59`	`59`	`t.Errorf("Tag.Note = \"%s\", want \"94 bytes\"", i.Note)`
`@@ -74,11 +74,11 @@ func TestTagUnknown(t *testing.T) {`
`74`	`74`	`t.Errorf("NewTag() = %v, want nil error.", err)`
`75`	`75`	`return`
`76`	`76`	`}`
`77`		`- if i.Name != "Packet" {`
`78`		`- t.Errorf("Tag.Name = \"%s\", want \"Packet\".", i.Name)`
	`77`	`+ if i.Name != name {`
	`78`	`+ t.Errorf("Tag.Name = \"%s\", want \"%s\".", i.Name, name)`
`79`	`79`	`}`
`80`		`- if i.Value != name {`
`81`		`- t.Errorf("Tag.Value = \"%s\", want \"%s\".", i.Value, name)`
	`80`	`+ if i.Value != "" {`
	`81`	`+ t.Errorf("Tag.Value = \"%s\", want \"\".", i.Value)`
`82`	`82`	`}`
`83`	`83`	`if i.Note != "4 bytes" {`
`84`	`84`	`t.Errorf("Tag.Note = \"%s\", want \"4 bytes\"", i.Note)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func ExampleParse() {`
`30`	`30`	`if err != nil {`
`31`	`31`	`return`
`32`	`32`	`}`
`33`		`- fmt.Println(info.Packets[0].Value)`
	`33`	`+ fmt.Println(info.Packets[0].Name)`
`34`	`34`	`// Output:`
`35`	`35`	`// Signature Packet (tag 2)`
`36`	`36`	`}`
`@@ -40,7 +40,7 @@ func ExampleParseByte() {`
`40`	`40`	`if err != nil {`
`41`	`41`	`return`
`42`	`42`	`}`
`43`		`- fmt.Println(info.Packets[0].Value)`
	`43`	`+ fmt.Println(info.Packets[0].Name)`
`44`	`44`	`// Output:`
`45`	`45`	`// Signature Packet (tag 2)`
`46`	`46`	`}`