forked from sneak/util
Compare commits
1 Commits
proposal-r
...
proposal-c
| Author | SHA1 | Date | |
|---|---|---|---|
| d52588d635 |
28
random.go
28
random.go
@@ -1,28 +0,0 @@
|
|||||||
package util
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/rand"
|
|
||||||
"encoding/hex"
|
|
||||||
"errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
// RandomHexString returns byteLength random bytes from the operating system's
|
|
||||||
// random source, written as lowercase hexadecimal, so the returned string is
|
|
||||||
// twice as long as byteLength. The bytes come from crypto/rand, which means the
|
|
||||||
// result is fit for session tokens, temporary filenames and anything else a
|
|
||||||
// stranger should not be able to guess.
|
|
||||||
//
|
|
||||||
// An error comes back only for a negative length or if the random source
|
|
||||||
// itself fails, which does not happen on a working system.
|
|
||||||
func RandomHexString(byteLength int) (string, error) {
|
|
||||||
if byteLength < 0 {
|
|
||||||
return "", errors.New("byte length cannot be negative")
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer := make([]byte, byteLength)
|
|
||||||
if _, err := rand.Read(buffer); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return hex.EncodeToString(buffer), nil
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
package util
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/hex"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestRandomHexStringLength(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
byteLength int
|
|
||||||
expectedLength int
|
|
||||||
}{
|
|
||||||
{"no bytes at all", 0, 0},
|
|
||||||
{"one byte", 1, 2},
|
|
||||||
{"eight bytes", 8, 16},
|
|
||||||
{"sixteen bytes", 16, 32},
|
|
||||||
{"thirty-two bytes", 32, 64},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, test := range tests {
|
|
||||||
t.Run(test.name, func(t *testing.T) {
|
|
||||||
got, err := RandomHexString(test.byteLength)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("did not expect an error, got %v", err)
|
|
||||||
}
|
|
||||||
if len(got) != test.expectedLength {
|
|
||||||
t.Errorf("expected a string of %d characters, got %d (%q)", test.expectedLength, len(got), got)
|
|
||||||
}
|
|
||||||
if _, err := hex.DecodeString(got); err != nil {
|
|
||||||
t.Errorf("expected valid hexadecimal, got %q: %v", got, err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRandomHexStringRejectsNegativeLength(t *testing.T) {
|
|
||||||
got, err := RandomHexString(-1)
|
|
||||||
if err == nil {
|
|
||||||
t.Errorf("expected an error for a negative length, got %q", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRandomHexStringDiffersBetweenCalls(t *testing.T) {
|
|
||||||
seen := make(map[string]struct{})
|
|
||||||
|
|
||||||
for i := 0; i < 100; i++ {
|
|
||||||
value, err := RandomHexString(16)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("did not expect an error, got %v", err)
|
|
||||||
}
|
|
||||||
if _, repeated := seen[value]; repeated {
|
|
||||||
t.Fatalf("got the same string twice: %q", value)
|
|
||||||
}
|
|
||||||
seen[value] = struct{}{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
12
whitespace.go
Normal file
12
whitespace.go
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
package util
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// CollapseWhitespace replaces every run of whitespace in s with a single space
|
||||||
|
// and removes any whitespace at the start and end. Tabs, newlines and spaces
|
||||||
|
// outside ASCII such as the non-breaking space all count as whitespace, so a
|
||||||
|
// block of text comes back as one line with single spaces between the words.
|
||||||
|
// A string that is nothing but whitespace comes back empty.
|
||||||
|
func CollapseWhitespace(s string) string {
|
||||||
|
return strings.Join(strings.Fields(s), " ")
|
||||||
|
}
|
||||||
36
whitespace_test.go
Normal file
36
whitespace_test.go
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
package util
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// Written as a code point so that it is visible in the source rather than
|
||||||
|
// looking like an ordinary space.
|
||||||
|
const nonBreakingSpace = string(rune(0x00a0))
|
||||||
|
|
||||||
|
func TestCollapseWhitespace(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
input string
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{"nothing to change", "one two", "one two"},
|
||||||
|
{"leading and trailing spaces", " one two ", "one two"},
|
||||||
|
{"run in the middle", "one two", "one two"},
|
||||||
|
{"tabs and newlines", "one\t\ttwo\nthree", "one two three"},
|
||||||
|
{"windows line endings", "one\r\ntwo", "one two"},
|
||||||
|
{"non-breaking space", "one" + nonBreakingSpace + "two", "one two"},
|
||||||
|
{"mixed whitespace run", "one \t" + nonBreakingSpace + " two", "one two"},
|
||||||
|
{"only whitespace", " \t\n ", ""},
|
||||||
|
{"empty string", "", ""},
|
||||||
|
{"single word with padding", "\tword\n", "word"},
|
||||||
|
{"paragraph becomes one line", "first line\n\nsecond line\n", "first line second line"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
got := CollapseWhitespace(test.input)
|
||||||
|
if got != test.expected {
|
||||||
|
t.Errorf("expected %q got %q", test.expected, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user