From 5f2e6bceb0edaaffdbec43ddd85b246b5783b692 Mon Sep 17 00:00:00 2001 From: Shirou WAKAYAMA Date: Mon, 12 May 2014 11:51:08 +0900 Subject: [PATCH] add test about String(). --- cpu_test.go | 18 ++++++++++++++-- disk_test.go | 56 ++++++++++++++++++++++++++++++++++++++++++++++--- host_test.go | 32 ++++++++++++++++++++++++++-- load_test.go | 16 +++++++++++++- mem_test.go | 39 ++++++++++++++++++++++++++++++++-- net_test.go | 16 +++++++------- process_test.go | 21 ++++++++++++------- 7 files changed, 172 insertions(+), 26 deletions(-) diff --git a/cpu_test.go b/cpu_test.go index 6997d52..e2e6b2e 100644 --- a/cpu_test.go +++ b/cpu_test.go @@ -1,6 +1,7 @@ package gopsutil import ( + "fmt" "testing" ) @@ -12,9 +13,9 @@ func TestCpu_times(t *testing.T) { if len(v) == 0 { t.Errorf("could not get CPUs ", err) } - + empty := CPUTimesStat{} for _, vv := range v { - if vv.User == 0 { + if vv == empty { t.Errorf("could not get CPU User: %v", vv) } } @@ -29,3 +30,16 @@ func TestCpu_counts(t *testing.T) { t.Errorf("could not get CPU counts: %v", v) } } + +func TestCPUTimeStat_String(t *testing.T) { + v := CPUTimesStat{ + CPU: "cpu0", + User: 100.1, + System: 200.1, + Idle: 300.1, + } + e := `{"cpu":"cpu0","user":100.1,"system":200.1,"idle":300.1,"nice":0,"iowait":0,"irq":0,"softirq":0,"steal":0,"guest":0,"guest_nice":0,"stolen":0}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("CPUTimesStat string is invalid: %v", v) + } +} diff --git a/disk_test.go b/disk_test.go index 4a7bc93..06d7d50 100644 --- a/disk_test.go +++ b/disk_test.go @@ -15,14 +15,22 @@ func TestDisk_usage(t *testing.T) { if err != nil { t.Errorf("error %v", err) } - fmt.Println(v) + if v.Path != path { + t.Errorf("error %v", err) + } } func TestDisk_partitions(t *testing.T) { - _, err := DiskPartitions(false) + ret, err := DiskPartitions(false) if err != nil { t.Errorf("error %v", err) } + empty := DiskPartitionStat{} + for _, disk := range ret { + if disk == empty { + t.Errorf("Could not get device info %v", disk) + } + } } func TestDisk_io_counters(t *testing.T) { @@ -30,9 +38,51 @@ func TestDisk_io_counters(t *testing.T) { if err != nil { t.Errorf("error %v", err) } + empty := DiskIOCountersStat{} for _, io := range ret { - if io.Name == "" { + if io == empty { t.Errorf("io_counter error %v", io) } } } + +func TestDiskUsageStat_String(t *testing.T) { + v := DiskUsageStat{ + Path: "/", + Total: 1000, + Free: 2000, + Used: 3000, + UsedPercent: 50.1, + } + e := `{"path":"/","total":1000,"free":2000,"used":3000,"usedPercent":50.1}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("DiskUsageStat string is invalid: %v", v) + } +} + +func TestDiskPartitionStat_String(t *testing.T) { + v := DiskPartitionStat{ + Device: "sd01", + Mountpoint: "/", + Fstype: "ext4", + Opts: "ro", + } + e := `{"device":"sd01","mountpoint":"/","fstype":"ext4","opts":"ro"}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("DiskUsageStat string is invalid: %v", v) + } +} + +func TestDiskIOCountersStat_String(t *testing.T) { + v := DiskIOCountersStat{ + Name: "sd01", + ReadCount: 100, + WriteCount: 200, + ReadBytes: 300, + WriteBytes: 400, + } + e := `{"readCount":100,"writeCount":200,"readBytes":300,"writeBytes":400,"readTime":0,"writeTime":0,"name":"sd01"}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("DiskUsageStat string is invalid: %v", v) + } +} diff --git a/host_test.go b/host_test.go index 2ad0e21..8cdf056 100644 --- a/host_test.go +++ b/host_test.go @@ -1,6 +1,7 @@ package gopsutil import ( + "fmt" "testing" ) @@ -9,7 +10,8 @@ func TestHostInfo(t *testing.T) { if err != nil { t.Errorf("error %v", err) } - if v.Hostname == "" { + empty := &HostInfoStat{} + if v == empty { t.Errorf("Could not get hostinfo %v", v) } } @@ -29,9 +31,35 @@ func TestUsers(t *testing.T) { if err != nil { t.Errorf("error %v", err) } + empty := UserStat{} for _, u := range v { - if u.User == "" { + if u == empty { t.Errorf("Could not Users %v", v) } } } + +func TestHostInfoStat_String(t *testing.T) { + v := HostInfoStat{ + Hostname: "test", + Uptime: 3000, + Procs: 100, + } + e := `{"hostname":"test","uptime":3000,"procs":100}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("HostInfoStat string is invalid: %v", v) + } +} + +func TestUserStat_String(t *testing.T) { + v := UserStat{ + User: "user", + Terminal: "term", + Host: "host", + Started: 100, + } + e := `{"user":"user","terminal":"term","host":"host","started":100}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("UserStat string is invalid: %v", v) + } +} diff --git a/load_test.go b/load_test.go index 4d1be38..41f178a 100644 --- a/load_test.go +++ b/load_test.go @@ -3,6 +3,7 @@ package gopsutil import ( + "fmt" "testing" ) @@ -12,7 +13,20 @@ func TestLoad(t *testing.T) { t.Errorf("error %v", err) } - if v.Load1 == 0 || v.Load5 == 0 || v.Load15 == 0 { + empty := &LoadAvgStat{} + if v == empty { t.Errorf("error load: %v", v) } } + +func TestLoadAvgStat_String(t *testing.T) { + v := LoadAvgStat{ + Load1: 10.1, + Load5: 20.1, + Load15: 30.1, + } + e := `{"load1":10.1,"load5":20.1,"load15":30.1}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("LoadAvgStat string is invalid: %v", v) + } +} diff --git a/mem_test.go b/mem_test.go index 31eb10e..9426175 100644 --- a/mem_test.go +++ b/mem_test.go @@ -10,7 +10,12 @@ func TestVirtual_memory(t *testing.T) { if err != nil { t.Errorf("error %v", err) } - fmt.Println(v) + + empty := &VirtualMemoryStat{} + if v == empty { + t.Errorf("error %v", v) + } + } func TestSwap_memory(t *testing.T) { @@ -18,5 +23,35 @@ func TestSwap_memory(t *testing.T) { if err != nil { t.Errorf("error %v", err) } - fmt.Println(v) + empty := &SwapMemoryStat{} + if v == empty { + t.Errorf("error %v", v) + } +} + +func TestVirtualMemoryStat_String(t *testing.T) { + v := VirtualMemoryStat{ + Total: 10, + Available: 20, + Used: 30, + UsedPercent: 30.1, + Free: 40, + } + e := `{"total":10,"available":20,"used":30,"usedPercent":30.1,"free":40,"active":0,"inactive":0,"buffers":0,"cached":0,"wired":0,"shared":0}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("VirtualMemoryStat string is invalid: %v", v) + } +} + +func TestSwapMemoryStat_String(t *testing.T) { + v := SwapMemoryStat{ + Total: 10, + Used: 30, + Free: 40, + UsedPercent: 30.1, + } + e := `{"total":10,"used":30,"free":40,"usedPercent":30.1,"sin":0,"sout":0}` + if e != fmt.Sprintf("%v", v) { + t.Errorf("SwapMemoryStat string is invalid: %v", v) + } } diff --git a/net_test.go b/net_test.go index 1256ab1..496f7d7 100644 --- a/net_test.go +++ b/net_test.go @@ -1,8 +1,8 @@ package gopsutil import ( - "testing" "fmt" + "testing" ) func TestAddrString(t *testing.T) { @@ -16,7 +16,7 @@ func TestAddrString(t *testing.T) { func TestNetIOCountersStatString(t *testing.T) { v := NetIOCountersStat{ - Name: "test", + Name: "test", BytesSent: 100, } e := `{"name":"test","bytes_sent":100,"bytes_recv":0,"packets_sent":0,"packets_recv":0,"errin":0,"errout":0,"dropin":0,"dropout":0}` @@ -27,9 +27,9 @@ func TestNetIOCountersStatString(t *testing.T) { func TestNetConnectionStatString(t *testing.T) { v := NetConnectionStat{ - Fd: 10, + Fd: 10, Family: 10, - Type: 10, + Type: 10, } e := `{"fd":10,"family":10,"type":10,"laddr":{"ip":"","port":0},"raddr":{"ip":"","port":0},"status":"","pid":0}` if e != fmt.Sprintf("%v", v) { @@ -40,14 +40,14 @@ func TestNetConnectionStatString(t *testing.T) { func TestNetIOCounters(t *testing.T) { v, err := NetIOCounters(true) - if err != nil{ + if err != nil { t.Errorf("Could not get NetIOCounters: %v", err) } - if len(v) == 0{ + if len(v) == 0 { t.Errorf("Could not get NetIOCounters: %v", v) } - for _, vv := range(v){ - if vv.Name == ""{ + for _, vv := range v { + if vv.Name == "" { t.Errorf("Invalid NetIOCounters: %v", vv) } } diff --git a/process_test.go b/process_test.go index dd26c21..6598e28 100644 --- a/process_test.go +++ b/process_test.go @@ -1,7 +1,6 @@ package gopsutil import ( - "fmt" "os" "runtime" "testing" @@ -52,8 +51,13 @@ func Test_NewProcess(t *testing.T) { if err != nil { t.Errorf("error %v", err) } + empty := &Process{} + if runtime.GOOS != "windows" { // Windows pid is 0 + if empty == ret { + t.Errorf("error %v", ret) + } + } - fmt.Println(ret) } func Test_Process_memory_maps(t *testing.T) { @@ -61,15 +65,17 @@ func Test_Process_memory_maps(t *testing.T) { if runtime.GOOS == "windows" { checkPid = 0 } - return ret, err := NewProcess(int32(checkPid)) mmaps, err := ret.MemoryMaps(false) if err != nil { t.Errorf("memory map get error %v", err) } + empty := MemoryMapsStat{} for _, m := range *mmaps { - fmt.Println(m) + if m == empty { + t.Errorf("memory map get error %v", m) + } } } @@ -95,11 +101,10 @@ func Test_Process_IOCounters(t *testing.T) { t.Errorf("geting ppid error %v", err) return } - if v.ReadCount == 0 { - t.Errorf("return value is 0 %v", v) + empty := &IOCountersStat{} + if v == empty { + t.Errorf("error %v", v) } - fmt.Println(v) - } func Test_Process_NumCtx(t *testing.T) { -- GitLab