1 files changed, 0 insertions, 142 deletions
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc
index 869d305..8a7f805 100644
--- a/runtime/utils_test.cc
+++ b/runtime/utils_test.cc
@@ -172,35 +172,6 @@ TEST_F(UtilsTest, PrettySize) {
   EXPECT_EQ("512B", PrettySize(512));
 }
 
-TEST_F(UtilsTest, PrettyDuration) {
-  const uint64_t one_sec = 1000000000;
-  const uint64_t one_ms  = 1000000;
-  const uint64_t one_us  = 1000;
-
-  EXPECT_EQ("1s", PrettyDuration(1 * one_sec));
-  EXPECT_EQ("10s", PrettyDuration(10 * one_sec));
-  EXPECT_EQ("100s", PrettyDuration(100 * one_sec));
-  EXPECT_EQ("1.001s", PrettyDuration(1 * one_sec + one_ms));
-  EXPECT_EQ("1.000001s", PrettyDuration(1 * one_sec + one_us, 6));
-  EXPECT_EQ("1.000000001s", PrettyDuration(1 * one_sec + 1, 9));
-  EXPECT_EQ("1.000s", PrettyDuration(1 * one_sec + one_us, 3));
-
-  EXPECT_EQ("1ms", PrettyDuration(1 * one_ms));
-  EXPECT_EQ("10ms", PrettyDuration(10 * one_ms));
-  EXPECT_EQ("100ms", PrettyDuration(100 * one_ms));
-  EXPECT_EQ("1.001ms", PrettyDuration(1 * one_ms + one_us));
-  EXPECT_EQ("1.000001ms", PrettyDuration(1 * one_ms + 1, 6));
-
-  EXPECT_EQ("1us", PrettyDuration(1 * one_us));
-  EXPECT_EQ("10us", PrettyDuration(10 * one_us));
-  EXPECT_EQ("100us", PrettyDuration(100 * one_us));
-  EXPECT_EQ("1.001us", PrettyDuration(1 * one_us + 1));
-
-  EXPECT_EQ("1ns", PrettyDuration(1));
-  EXPECT_EQ("10ns", PrettyDuration(10));
-  EXPECT_EQ("100ns", PrettyDuration(100));
-}
-
 TEST_F(UtilsTest, MangleForJni) {
   ScopedObjectAccess soa(Thread::Current());
   EXPECT_EQ("hello_00024world", MangleForJni("hello$world"));
@@ -408,119 +379,6 @@ TEST_F(UtilsTest, ExecError) {
   }
 }
 
-TEST_F(UtilsTest, RoundUpToPowerOfTwo) {
-  // Tests the constexpr variant since all the parameters are constexpr
-  EXPECT_EQ(0, RoundUpToPowerOfTwo(0));
-  EXPECT_EQ(1, RoundUpToPowerOfTwo(1));
-  EXPECT_EQ(2, RoundUpToPowerOfTwo(2));
-  EXPECT_EQ(4, RoundUpToPowerOfTwo(3));
-  EXPECT_EQ(8, RoundUpToPowerOfTwo(7));
-
-  EXPECT_EQ(0b10000L, RoundUpToPowerOfTwo(0b01101L));
-  EXPECT_EQ(1ULL << 63, RoundUpToPowerOfTwo(1ULL << 62 | 1ULL));
-}
-
-TEST_F(UtilsTest, MostSignificantBit) {
-  EXPECT_EQ(-1, MostSignificantBit(0));
-  EXPECT_EQ(0, MostSignificantBit(1));
-  EXPECT_EQ(31, MostSignificantBit(~static_cast<uint32_t>(0)));
-  EXPECT_EQ(2, MostSignificantBit(0b110));
-  EXPECT_EQ(2, MostSignificantBit(0b100));
-}
-
-TEST_F(UtilsTest, MinimumBitsToStore) {
-  EXPECT_EQ(0u, MinimumBitsToStore(0));
-  EXPECT_EQ(1u, MinimumBitsToStore(1));
-  EXPECT_EQ(2u, MinimumBitsToStore(0b10));
-  EXPECT_EQ(2u, MinimumBitsToStore(0b11));
-  EXPECT_EQ(3u, MinimumBitsToStore(0b100));
-  EXPECT_EQ(3u, MinimumBitsToStore(0b110));
-  EXPECT_EQ(3u, MinimumBitsToStore(0b101));
-  EXPECT_EQ(8u, MinimumBitsToStore(0xFF));
-  EXPECT_EQ(32u, MinimumBitsToStore(~static_cast<uint32_t>(0)));
-}
-
-static constexpr int64_t INT_MIN_minus1 = static_cast<int64_t>(INT_MIN) - 1;
-static constexpr int64_t INT_MAX_plus1 = static_cast<int64_t>(INT_MAX) + 1;
-static constexpr int64_t UINT_MAX_plus1 = static_cast<int64_t>(UINT_MAX) + 1;
-
-TEST_F(UtilsTest, IsInt) {
-  EXPECT_FALSE(IsInt(1, -2));
-  EXPECT_TRUE(IsInt(1, -1));
-  EXPECT_TRUE(IsInt(1, 0));
-  EXPECT_FALSE(IsInt(1, 1));
-
-  EXPECT_FALSE(IsInt(4, -9));
-  EXPECT_TRUE(IsInt(4, -8));
-  EXPECT_TRUE(IsInt(4, 7));
-  EXPECT_FALSE(IsInt(4, 8));
-
-  EXPECT_FALSE(IsInt(32, INT_MIN_minus1));
-  EXPECT_TRUE(IsInt(32, INT_MIN));
-  EXPECT_TRUE(IsInt(32, INT_MAX));
-  EXPECT_FALSE(IsInt(32, INT_MAX_plus1));
-}
-
-TEST_F(UtilsTest, IsInt_Static) {
-  EXPECT_FALSE(IsInt<1>(-2));
-  EXPECT_TRUE(IsInt<1>(-1));
-  EXPECT_TRUE(IsInt<1>(0));
-  EXPECT_FALSE(IsInt<1>(1));
-
-  EXPECT_FALSE(IsInt<4>(-9));
-  EXPECT_TRUE(IsInt<4>(-8));
-  EXPECT_TRUE(IsInt<4>(7));
-  EXPECT_FALSE(IsInt<4>(8));
-
-  EXPECT_FALSE(IsInt<32>(INT_MIN_minus1));
-  EXPECT_TRUE(IsInt<32>(INT_MIN));
-  EXPECT_TRUE(IsInt<32>(INT_MAX));
-  EXPECT_FALSE(IsInt<32>(INT_MAX_plus1));
-}
-
-TEST_F(UtilsTest, IsUint) {
-  EXPECT_FALSE(IsUint<1>(-1));
-  EXPECT_TRUE(IsUint<1>(0));
-  EXPECT_TRUE(IsUint<1>(1));
-  EXPECT_FALSE(IsUint<1>(2));
-
-  EXPECT_FALSE(IsUint<4>(-1));
-  EXPECT_TRUE(IsUint<4>(0));
-  EXPECT_TRUE(IsUint<4>(15));
-  EXPECT_FALSE(IsUint<4>(16));
-
-  EXPECT_FALSE(IsUint<32>(-1));
-  EXPECT_TRUE(IsUint<32>(0));
-  EXPECT_TRUE(IsUint<32>(UINT_MAX));
-  EXPECT_FALSE(IsUint<32>(UINT_MAX_plus1));
-}
-
-TEST_F(UtilsTest, IsAbsoluteUint) {
-  EXPECT_FALSE(IsAbsoluteUint<1>(-2));
-  EXPECT_TRUE(IsAbsoluteUint<1>(-1));
-  EXPECT_TRUE(IsAbsoluteUint<32>(0));
-  EXPECT_TRUE(IsAbsoluteUint<1>(1));
-  EXPECT_FALSE(IsAbsoluteUint<1>(2));
-
-  EXPECT_FALSE(IsAbsoluteUint<4>(-16));
-  EXPECT_TRUE(IsAbsoluteUint<4>(-15));
-  EXPECT_TRUE(IsAbsoluteUint<32>(0));
-  EXPECT_TRUE(IsAbsoluteUint<4>(15));
-  EXPECT_FALSE(IsAbsoluteUint<4>(16));
-
-  EXPECT_FALSE(IsAbsoluteUint<32>(-UINT_MAX_plus1));
-  EXPECT_TRUE(IsAbsoluteUint<32>(-UINT_MAX));
-  EXPECT_TRUE(IsAbsoluteUint<32>(0));
-  EXPECT_TRUE(IsAbsoluteUint<32>(UINT_MAX));
-  EXPECT_FALSE(IsAbsoluteUint<32>(UINT_MAX_plus1));
-}
-
-TEST_F(UtilsTest, TestSleep) {
-  auto start = NanoTime();
-  NanoSleep(MsToNs(1500));
-  EXPECT_GT(NanoTime() - start, MsToNs(1000));
-}
-
 TEST_F(UtilsTest, IsValidDescriptor) {
   std::vector<uint8_t> descriptor(
       { 'L', 'a', '/', 'b', '$', 0xed, 0xa0, 0x80, 0xed, 0xb0, 0x80, ';', 0x00 });