From 6c56cef5189ca1b3d5ef01dc07f4d611dfc0bb33 Mon Sep 17 00:00:00 2001 From: Oleg Sklyar Date: Mon, 4 Jan 2016 02:44:24 +0100 Subject: [PATCH] Removing copyright sign and adjusting flaky test --- LICENSE | 2 +- README.md | 6 +++--- shortid.go | 6 +++--- shortid_integration_test.go | 2 +- shortid_test.go | 5 +---- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index 00d1776..4fb4674 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright © 2016, Ventu.io, Oleg Sklyar, contributors +Copyright (c) 2016, Ventu.io, Oleg Sklyar, contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, diff --git a/README.md b/README.md index 3a938f9..690e863 100644 --- a/README.md +++ b/README.md @@ -102,15 +102,15 @@ implement an algorithm with e.g. more randomness, but with longer Ids and shorte ## License -Copyright © 2016 Ventu.io, Oleg Sklyar, contributors. +Copyright (c) 2016 Ventu.io, Oleg Sklyar, contributors. Distributed under a MIT style license found in the [LICENSE][license] file. -**[Original algorithm][nodeshortid]:** Copyright © 2015 Dylan Greene, contributors. The same MIT +**[Original algorithm][nodeshortid]:** Copyright (c) 2015 Dylan Greene, contributors. The same MIT license applies. Many thanks to Dylan for putting together the original node.js library, which inspired this "port": -**Seed computation:** based on The Central Randomizer 1.3. Copyright © 1997 Paul Houle (houle@msc.cornell.edu) +**Seed computation:** based on The Central Randomizer 1.3. Copyright (c) 1997 Paul Houle (houle@msc.cornell.edu) [go]: https://golang.org diff --git a/shortid.go b/shortid.go index 76d839b..3e2f974 100644 --- a/shortid.go +++ b/shortid.go @@ -1,12 +1,12 @@ -// Copyright © 2016 Ventu.io, Oleg Sklyar, contributors +// Copyright (c) 2016 Ventu.io, Oleg Sklyar, contributors // The use of this source code is governed by a MIT style license found in the LICENSE file // Original algorithm: -// Copyright © 2015 Dylan Greene, contributors: https://github.com/dylang/shortid. +// Copyright (c) 2015 Dylan Greene, contributors: https://github.com/dylang/shortid. // MIT-license as found in the LICENSE file. // Seed computation: based on The Central Randomizer 1.3 -// Copyright © 1997 Paul Houle (houle@msc.cornell.edu) +// Copyright (c) 1997 Paul Houle (houle@msc.cornell.edu) // Package shortid enables the generation of short, unique, non-sequential and by default URL friendly // Ids. The package is heavily inspired by the node.js https://github.com/dylang/shortid library. diff --git a/shortid_integration_test.go b/shortid_integration_test.go index 14c0630..9262e94 100644 --- a/shortid_integration_test.go +++ b/shortid_integration_test.go @@ -1,4 +1,4 @@ -// Copyright © 2016 Ventu.io, Oleg Sklyar, contributors +// Copyright (c) 2016 Ventu.io, Oleg Sklyar, contributors // The use of this source code is governed by a MIT style license found in the LICENSE file package shortid_test diff --git a/shortid_test.go b/shortid_test.go index be49ae4..4c65663 100644 --- a/shortid_test.go +++ b/shortid_test.go @@ -1,4 +1,4 @@ -// Copyright © 2016 Ventu.io, Oleg Sklyar, contributors +// Copyright (c) 2016 Ventu.io, Oleg Sklyar, contributors // The use of this source code is governed by a MIT style license found in the LICENSE file package shortid_test @@ -136,9 +136,6 @@ func TestShortid_onMustGenerate_success(t *testing.T) { if id := sid.MustGenerate(); len(id) != 9 { t.Errorf("expected id of length 9, found %v", id) } - if id := sid.MustGenerate(); len(id) != 10 { - t.Errorf("expected id of length 10, found %v", id) - } time.Sleep(2 * time.Millisecond) if id := sid.MustGenerate(); len(id) != 9 { t.Errorf("expected id of length 9, found %v", id)