abort connection on '.' target replies in SRV

[apt.git] / test / libapt / install_progress_test.cc

diff --git a/test/libapt/install_progress_test.cc b/test/libapt/install_progress_test.cc
index be1a3411e5b4d8f32a573e13f1852476404e5063..b63b4716fbde736273aad5fc58b0993761ebdeda 100644 (file)
--- a/test/libapt/install_progress_test.cc
+++ b/test/libapt/install_progress_test.cc
@@ -4,27 +4,22 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "assert.h"
+#include <gtest/gtest.h>

 
 

-int main() {
+TEST(InstallProgressTest, FancyGetTextProgressStr)
+{

    APT::Progress::PackageManagerFancy p;
    APT::Progress::PackageManagerFancy p;

-   std::string s;   

 
 

-   s= p.GetTextProgressStr(0.5, 60);
-   equals(s.size(), 60);
-   
-   s= p.GetTextProgressStr(0.5, 4);
-   equals(s, "[#.]");
-
-   s= p.GetTextProgressStr(0.1, 12);
-   equals(s, "[#.........]");
-   
-   s= p.GetTextProgressStr(0.9, 12);
-   equals(s, "[#########.]");
+   EXPECT_EQ(60, p.GetTextProgressStr(0.5, 60).size());
+   EXPECT_EQ("[#.]", p.GetTextProgressStr(0.5, 4));
+   EXPECT_EQ("[..........]", p.GetTextProgressStr(0.0, 12));
+   EXPECT_EQ("[#.........]", p.GetTextProgressStr(0.1, 12));
+   EXPECT_EQ("[####......]", p.GetTextProgressStr(0.4999, 12));
+   EXPECT_EQ("[#####.....]", p.GetTextProgressStr(0.5001, 12));
+   EXPECT_EQ("[#########.]", p.GetTextProgressStr(0.9, 12));
+   EXPECT_EQ("[##########]", p.GetTextProgressStr(1.0, 12));

 
    // deal with incorrect inputs gracefully (or should we die instead?)
 
    // deal with incorrect inputs gracefully (or should we die instead?)

-   s= p.GetTextProgressStr(-999, 12);
-   equals(s, "");
-
-   return 0;
+   EXPECT_EQ("[..........]", p.GetTextProgressStr(-1.0, 12));
+   EXPECT_EQ("[##########]", p.GetTextProgressStr(2.0, 12));

 }
 }