From 9977bf87c4e355b78a0e3c6c0932e9963838eda7 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Fri, 14 Dec 2012 12:42:39 +0100
Subject: [PATCH] Drop unneeded packages

---
 dnssec_test.go | 22 ++++++++++++++++------
 zone_test.go   | 31 +------------------------------
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/dnssec_test.go b/dnssec_test.go
index 5869ed51..5e85b9d3 100644
--- a/dnssec_test.go
+++ b/dnssec_test.go
@@ -1,7 +1,6 @@
 package dns
 
 import (
-	"os"
 	"strings"
 	"testing"
 )
@@ -194,11 +193,22 @@ func TestSignVerify(t *testing.T) {
 }
 
 func TestDnskey(t *testing.T) {
-	f, _ := os.Open("t/Kmiek.nl.+010+05240.key")
-	pubkey, _ := ReadRR(f, "t/Kmiek.nl.+010+05240.key")
-	f, _ = os.Open("t/Kmiek.nl.+010+05240.private")
-	privkey, _ := pubkey.(*DNSKEY).ReadPrivateKey(f, "t/Kmiek.nl.+010+05240.private")
-	// Okay, we assume this has gone OK
+//	f, _ := os.Open("t/Kmiek.nl.+010+05240.key")
+	pubkey, _ := ReadRR(strings.NewReader(`
+miek.nl.	IN	DNSKEY	256 3 10 AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL ;{id = 5240 (zsk), size = 1024b}
+`), "Kmiek.nl.+010+05240.key")
+	privkey, _ := pubkey.(*DNSKEY).ReadPrivateKey(strings.NewReader(`
+Private-key-format: v1.2
+Algorithm: 10 (RSASHA512)
+Modulus: m4wK7YV26AeROtdiCXmqLG9wPDVoMOW8vjr/EkpscEAdjXp81RvZvrlzCSjYmz9onFRgltmTl3AINnFh+t9tlW0M9C5zejxBoKFXELv8ljPYAdz2oe+pDWPhWsfvVFYg2VCjpViPM38EakyE5mhk4TDOnUd+w4TeU1hyhZTWyYs=
+PublicExponent: AQAB
+PrivateExponent: UfCoIQ/Z38l8vB6SSqOI/feGjHEl/fxIPX4euKf0D/32k30fHbSaNFrFOuIFmWMB3LimWVEs6u3dpbB9CQeCVg7hwU5puG7OtuiZJgDAhNeOnxvo5btp4XzPZrJSxR4WNQnwIiYWbl0aFlL1VGgHC/3By89ENZyWaZcMLW4KGWE=
+Prime1: yxwC6ogAu8aVcDx2wg1V0b5M5P6jP8qkRFVMxWNTw60Vkn+ECvw6YAZZBHZPaMyRYZLzPgUlyYRd0cjupy4+fQ==
+Prime2: xA1bF8M0RTIQ6+A11AoVG6GIR/aPGg5sogRkIZ7ID/sF6g9HMVU/CM2TqVEBJLRPp73cv6ZeC3bcqOCqZhz+pw==
+Exponent1: xzkblyZ96bGYxTVZm2/vHMOXswod4KWIyMoOepK6B/ZPcZoIT6omLCgtypWtwHLfqyCz3MK51Nc0G2EGzg8rFQ==
+Exponent2: Pu5+mCEb7T5F+kFNZhQadHUklt0JUHbi3hsEvVoHpEGSw3BGDQrtIflDde0/rbWHgDPM4WQY+hscd8UuTXrvLw==
+Coefficient: UuRoNqe7YHnKmQzE6iDWKTMIWTuoqqrFAmXPmKQnC+Y+BQzOVEHUo9bXdDnoI9hzXP1gf8zENMYwYLeWpuYlFQ==
+`), "Kmiek.nl.+010+05240.private")
 	if pubkey.(*DNSKEY).PublicKey != "AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL" {
 		t.Log("Pubkey is not what we've read")
 		t.Fail()
diff --git a/zone_test.go b/zone_test.go
index 5c0ddf84..e643d673 100644
--- a/zone_test.go
+++ b/zone_test.go
@@ -1,9 +1,6 @@
 package dns
 
-import (
-	"os"
-	"testing"
-)
+import "testing"
 
 func TestRadixName(t *testing.T) {
 	tests := map[string]string{".": ".",
@@ -21,32 +18,6 @@ func TestRadixName(t *testing.T) {
 	}
 }
 
-func TestApex(t *testing.T) {
-	f, err := os.Open("t/miek.nl.signed_test")
-	if err != nil {
-		t.Logf("Failed to open zone file")
-		t.Fail()
-	}
-	defer f.Close()
-	z := NewZone("miek.nl.")
-	to := ParseZone(f, "miek.nl.", "t/miek.nl.signed_test")
-	for rr := range to {
-		if rr.Error == nil {
-			z.Insert(rr.RR)
-		} else {
-			t.Logf("Error %s\n", rr.Error.Error())
-		}
-	}
-	apex := z.Apex()
-	if apex == nil {
-		t.Fatalf("Apex not found")
-	}
-	t.Logf("Apex found %s", apex.RR[TypeSOA][0].String())
-	apex.RR[TypeSOA][0].(*SOA).Serial++
-	apex = z.Apex()
-	t.Logf("Apex found %s", z.Apex().RR[TypeSOA][0].String())
-}
-
 func TestInsert(t *testing.T) {
 	z := NewZone("miek.nl.")
 	mx, _ := NewRR("foo.miek.nl. MX 10 mx.miek.nl.")