Skip to content

Commit 94fb7c0

Browse files
author
Artur Kh
committed
Change Paste() output format and simplify test
1 parent 05d3d43 commit 94fb7c0

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

Diff for: clipboard.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func NewClipboard() (*Clipboard, error) {
2525

2626
for _, c := range ClipboardCommands {
2727
if runtime.GOOS == "windows" {
28+
// TODO: Windows
2829
return nil, errors.New("Clipboard doesn't work on Windows.")
2930
} else {
3031
cmd := exec.Command("which", strings.Split(c.copyCmd, " ")[0])
@@ -57,14 +58,14 @@ func (c *Clipboard) Copy(content string) error {
5758
return nil
5859
}
5960

60-
func (c *Clipboard) Paste() (string, error) {
61+
func (c *Clipboard) Paste() ([]byte, error) {
6162
var stdout bytes.Buffer
6263

6364
cmd := exec.Command(c.pasteCmd)
6465
cmd.Stdout = &stdout
6566
if err := cmd.Run(); err != nil {
66-
return "", err
67+
return nil, err
6768
}
6869

69-
return stdout.String(), nil
70+
return stdout.Bytes(), nil
7071
}

Diff for: clipboard_test.go

+5-16
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,21 @@ import (
55
"time"
66
)
77

8-
func TestNewClipboard(t *testing.T) {
9-
if _, err := NewClipboard(); err != nil {
10-
t.Fatal(err)
11-
}
12-
}
13-
14-
func TestClipboardCopy(t *testing.T) {
8+
func TestClipboard(t *testing.T) {
159
c, err := NewClipboard()
1610
if err != nil {
1711
t.Fatal(err)
1812
}
1913

20-
message := "GO COPY TEST " + time.Now().String()
14+
var message string
2115

22-
if err := c.Copy(message); err != nil {
23-
t.Fatal(err)
24-
}
25-
}
16+
message = "GO COPY TEST " + time.Now().String()
2617

27-
func TestClipboardPaste(t *testing.T) {
28-
c, err := NewClipboard()
29-
if err != nil {
18+
if err := c.Copy(message); err != nil {
3019
t.Fatal(err)
3120
}
3221

33-
message := "GO PASTE TEST " + time.Now().String()
22+
message = "GO PASTE TEST " + time.Now().String()
3423

3524
if err := c.Copy(message); err != nil {
3625
t.Fatal(err)

0 commit comments

Comments
 (0)