Imported Upstream version 15.0.0

[platform/upstream/libzypp.git] / tests / zypp / PluginFrame_test.cc

diff --git a/tests/zypp/PluginFrame_test.cc b/tests/zypp/PluginFrame_test.cc
index 56ecd9c..cac4f3b 100644 (file)
--- a/tests/zypp/PluginFrame_test.cc
+++ b/tests/zypp/PluginFrame_test.cc
@@ -5,7 +5,7 @@
 #include <sstream>
 
 #include "TestSetup.h"
-#include "zypp/PluginExecutor.h"
+#include "zypp/PluginScript.h"
 
 BOOST_AUTO_TEST_CASE(InitialSettings)
 {
@@ -15,8 +15,8 @@ BOOST_AUTO_TEST_CASE(InitialSettings)
 BOOST_AUTO_TEST_CASE(PluginFrameDefaultCtor)
 {
   PluginFrame f;
-  BOOST_CHECK_EQUAL( bool(f), !f.empty() );
   BOOST_CHECK_EQUAL( f.empty(), true );
+  BOOST_CHECK_EQUAL( bool(f), f.empty() );
   BOOST_CHECK_EQUAL( f.command().empty(), true );
   BOOST_CHECK_EQUAL( f.body().empty(), true );
   BOOST_CHECK_EQUAL( f.headerEmpty(), true );
@@ -27,8 +27,8 @@ BOOST_AUTO_TEST_CASE(PluginFrameDefaultCtor)
 BOOST_AUTO_TEST_CASE(PluginFrameCtorAssign)
 {
   PluginFrame f( "command" );
-  BOOST_CHECK_EQUAL( bool(f), !f.empty() );
   BOOST_CHECK_EQUAL( f.empty(), false );
+  BOOST_CHECK_EQUAL( bool(f), f.empty() );
   BOOST_CHECK_EQUAL( f.command(), "command" );
   BOOST_CHECK_EQUAL( f.body().empty(), true );
   BOOST_CHECK_EQUAL( f.headerEmpty(), true );
@@ -36,8 +36,8 @@ BOOST_AUTO_TEST_CASE(PluginFrameCtorAssign)
   BOOST_CHECK_EQUAL( (f != f), false );
 
   PluginFrame g( "command", "body" );
-  BOOST_CHECK_EQUAL( bool(g), !g.empty() );
   BOOST_CHECK_EQUAL( g.empty(), false );
+  BOOST_CHECK_EQUAL( bool(g), g.empty() );
   BOOST_CHECK_EQUAL( g.command(), "command" );
   BOOST_CHECK_EQUAL( g.body(), "body");
   BOOST_CHECK_EQUAL( g.headerEmpty(), true );
@@ -168,25 +168,3 @@ BOOST_AUTO_TEST_CASE(PluginScriptReceive)
   ::kill( scr.getPid(), SIGKILL);
   BOOST_CHECK_THROW(  scr.receive(), PluginScriptDiedUnexpectedly );
 }
-
-BOOST_AUTO_TEST_CASE(PluginExecutorTest)
-{
-  PluginExecutor exec;
-  BOOST_CHECK_EQUAL( (bool)exec, !exec.empty() );
-  BOOST_CHECK_EQUAL( exec.empty(), true );
-  BOOST_CHECK_EQUAL( exec.size(), 0 );
-
-  exec.load( "/bin/cat" );
-  BOOST_CHECK_EQUAL( (bool)exec, !exec.empty() );
-  BOOST_CHECK_EQUAL( exec.empty(), false );
-  BOOST_CHECK_EQUAL( exec.size(), 1 );
-
-  exec.load( "/bin/cat" );
-  BOOST_CHECK_EQUAL( exec.size(), 2 );
-
-  exec.send( PluginFrame( "ACK" ) );
-  BOOST_CHECK_EQUAL( exec.size(), 2 );
-
-  exec.send( PluginFrame( "ERROR" ) );
-  BOOST_CHECK_EQUAL( exec.size(), 0 ); // deleted failing scripts
-}