From 222854694e922344f18910ce3704115d08ca30cb Mon Sep 17 00:00:00 2001
From: Samuel Stauffer <samuel@descolada.com>
Date: Wed, 19 Mar 2014 13:57:32 -0700
Subject: Stylistic fixes, update imports, and some format string fixes

---
 ldap_test.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ldap_test.go')

diff --git a/ldap_test.go b/ldap_test.go
index 00cc7d5..9dd9c71 100644
--- a/ldap_test.go
+++ b/ldap_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 )
 
-var ldap_server string = "ldap.itd.umich.edu"
-var ldap_port uint16 = 389
-var base_dn string = "dc=umich,dc=edu"
+var ldapServer string = "ldap.itd.umich.edu"
+var ldapPort uint16 = 389
+var baseDN string = "dc=umich,dc=edu"
 var filter []string = []string{
 	"(cn=cis-fac)",
 	"(&(objectclass=rfc822mailgroup)(cn=*Computer*))",
@@ -18,7 +18,7 @@ var attributes []string = []string{
 
 func TestConnect(t *testing.T) {
 	fmt.Printf("TestConnect: starting...\n")
-	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldap_server, ldap_port))
+	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
 		t.Errorf(err.String())
 		return
@@ -29,7 +29,7 @@ func TestConnect(t *testing.T) {
 
 func TestSearch(t *testing.T) {
 	fmt.Printf("TestSearch: starting...\n")
-	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldap_server, ldap_port))
+	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
 		t.Errorf(err.String())
 		return
@@ -37,7 +37,7 @@ func TestSearch(t *testing.T) {
 	defer l.Close()
 
 	search_request := NewSearchRequest(
-		base_dn,
+		baseDN,
 		ScopeWholeSubtree, DerefAlways, 0, 0, false,
 		filter[0],
 		attributes,
@@ -54,7 +54,7 @@ func TestSearch(t *testing.T) {
 
 func TestSearchWithPaging(t *testing.T) {
 	fmt.Printf("TestSearchWithPaging: starting...\n")
-	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldap_server, ldap_port))
+	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
 		t.Errorf(err.String())
 		return
@@ -68,7 +68,7 @@ func TestSearchWithPaging(t *testing.T) {
 	}
 
 	search_request := NewSearchRequest(
-		base_dn,
+		baseDN,
 		ScopeWholeSubtree, DerefAlways, 0, 0, false,
 		filter[1],
 		attributes,
@@ -84,7 +84,7 @@ func TestSearchWithPaging(t *testing.T) {
 
 func testMultiGoroutineSearch(t *testing.T, l *Conn, results chan *SearchResult, i int) {
 	search_request := NewSearchRequest(
-		base_dn,
+		baseDN,
 		ScopeWholeSubtree, DerefAlways, 0, 0, false,
 		filter[i],
 		attributes,
@@ -100,7 +100,7 @@ func testMultiGoroutineSearch(t *testing.T, l *Conn, results chan *SearchResult,
 
 func TestMultiGoroutineSearch(t *testing.T) {
 	fmt.Printf("TestMultiGoroutineSearch: starting...\n")
-	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldap_server, ldap_port))
+	l, err := Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
 		t.Errorf(err.String())
 		return
-- 
cgit v1.2.3