Moved unit test

psiphon/stats_test.go

@@ -83,15 +83,6 @@ func makeStatsDialer(serverID string, regexps *Regexps) func(network, addr strin
 	}
 }
 
-// TODO: move out of stats test suite
-func (suite *StatsTestSuite) Test_NextStatusRequestPeriod() {
-	res1 := NextStatusRequestPeriod()
-	suite.True(res1 > time.Duration(0), "duration should not be zero")
-
-	res2 := NextStatusRequestPeriod()
-	suite.NotEqual(res1, res2, "duration should have randomness difference between calls")
-}
-
 func (suite *StatsTestSuite) Test_StatsConn() {
 	resp, err := suite.httpClient.Get("http://example.com/index.html")
 	suite.Nil(err, "basic HTTP requests should succeed")

psiphon/utils_test.go

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2014, Psiphon Inc.
+ * All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package psiphon
+
+import (
+	"testing"
+	"time"
+)
+
+func TestMakeRandomPeriod(t *testing.T) {
+	min := 1 * time.Nanosecond
+	max := 10000 * time.Nanosecond
+
+	res1 := MakeRandomPeriod(min, max)
+
+	if res1 < min {
+		t.Error("duration should not be less than min")
+	}
+
+	if res1 > max {
+		t.Error("duration should not be more than max")
+	}
+
+	res2 := MakeRandomPeriod(min, max)
+	if res1 == res2 {
+		t.Error("duration should have randomness difference between calls")
+	}
+}