Changeset 98172 in vbox for trunk

Timestamp:

Jan 21, 2023 1:01:48 PM (2 years ago)

Author:

vboxsync

Message:

Devices/Network: Wrapped the cppunit tests tstDevEEPROM and tstDevPhy to IPRT testing.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DevE1000Phy.cpp (modified) (1 diff)
• Network/DevEEPROM.cpp (modified) (1 diff)
• Network/testcase/CppUnitEmulation.h (added)
• Network/testcase/tstDevEEPROM.cpp (modified) (7 diffs)
• Network/testcase/tstDevPhy.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -1483 +1483 @@
  # EEPROM device unit test requires cppunit
  #
- ifdef VBOX_WITH_CPPUNIT_TESTCASES
-  ifdef VBOX_WITH_E1000
-   PROGRAMS += tstDevEEPROM
-   tstDevEEPROM_TEMPLATE    = VBOXCPPUNITEXE
-   tstDevEEPROM_SOURCES     = \
+ if defined(VBOX_WITH_E1000) && defined(VBOX_WITH_TESTCASES)
+  PROGRAMS += tstDevEEPROM
+  tstDevEEPROM_TEMPLATE    = VBoxR3TstExe
+  tstDevEEPROM_SOURCES     = \
         Network/testcase/tstDevEEPROM.cpp \
         Network/DevEEPROM.cpp
-   tstDevEEPROM_LIBS        = \
-        $(TARGET_VBoxDD)
-
-   PROGRAMS += tstDevPhy
-   tstDevPhy_TEMPLATE    = VBOXCPPUNITEXE
-   tstDevPhy_SOURCES     = \
+
+  PROGRAMS += tstDevPhy
+  tstDevPhy_TEMPLATE    = VBoxR3TstExe
+  tstDevPhy_DEFS        = PHY_UNIT_TEST
+  tstDevPhy_SOURCES     = \
         Network/testcase/tstDevPhy.cpp \
         Network/DevE1000Phy.cpp
-   tstDevPhy_DEFS        = PHY_UNIT_TEST
-  endif
  endif
 

trunk/src/VBox/Devices/Network/DevE1000Phy.cpp

@@ -51 +51 @@
 /* Little helpers ************************************************************/
 #ifdef PHY_UNIT_TEST
-# include <stdio.h>
-# define PhyLog(a)               printf a
-#else /* PHY_UNIT_TEST */
+# ifdef CPP_UNIT
+#  include <stdio.h>
+#  define PhyLog(a)               printf a
+# else
+#  include <iprt/test.h>
+#  define PhyLogC99(...)         RTTestIPrintf(RTTESTLVL_ALWAYS, __VA_ARGS__)
+#  define PhyLog(a)              PhyLogC99 a
+# endif
+#else  /* !PHY_UNIT_TEST */
 # define PhyLog(a)               Log(a)
-#endif /* PHY_UNIT_TEST */
+#endif /* !PHY_UNIT_TEST */
 
 #define REG(x) pPhy->au16Regs[x##_IDX]

trunk/src/VBox/Devices/Network/DevEEPROM.cpp

@@ -43 +43 @@
 void EEPROM93C46::init(const uint16_t *pu16Initial)
 {
-    if ( pu16Initial ) {
+    if ( pu16Initial )
         memcpy(this->m_au16Data, pu16Initial, sizeof(this->m_au16Data));
-    } else {
+    else
         memset(this->m_au16Data, 0, sizeof(this->m_au16Data));
-    }
     m_fWriteEnabled = false;
     m_u32InternalWires = 0;

trunk/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp

@@ -26 +26 @@
  */
 
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#ifdef USE_CPPUNIT
+# include <cppunit/ui/text/TestRunner.h>
+# include <cppunit/extensions/HelperMacros.h>
+#else
+# include "CppUnitEmulation.h"
+#endif
 #include <VBox/vmm/pdmdev.h>
 #include "../DevEEPROM.h"
 
-static const uint16_t initialContent[] = {
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static const uint16_t g_abInitialContent[] =
+{
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
     0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
@@ -43 +55 @@
 };
 
+
 /**
  * Test fixture for 93C46-compatible EEPROM device emulation.
  */
-class EEPROMTest : public CppUnit::TestFixture  {
-    CPPUNIT_TEST_SUITE( EEPROMTest );
+class EEPROMTest
+#ifdef USE_CPPUNIT
+    : public CppUnit::TestFixture
+#endif
+{
+    CPPUNIT_TEST_SUITE( tstDevEEPROM );
 
     CPPUNIT_TEST( testRead );
@@ -106 +123 @@
     {
         eeprom = new EEPROM93C46;
-        eeprom->init(initialContent);
+        eeprom->init(g_abInitialContent);
     }
 
@@ -116 +133 @@
     void testSize()
     {
-        CPPUNIT_ASSERT_EQUAL( sizeof(initialContent), (size_t)EEPROM93C46::SIZE );
+        CPPUNIT_ASSERT_EQUAL( sizeof(g_abInitialContent), (size_t)EEPROM93C46::SIZE );
     }
 
@@ -126 +143 @@
             shiftOutBits(wordAddr, READ_ADDR_BITS);
 
-            CPPUNIT_ASSERT_EQUAL( initialContent[wordAddr], (uint16_t)wordAddr );
-            CPPUNIT_ASSERT_EQUAL( initialContent[wordAddr], shiftInBits(DATA_BITS) );
+            CPPUNIT_ASSERT_EQUAL( g_abInitialContent[wordAddr], (uint16_t)wordAddr );
+            CPPUNIT_ASSERT_EQUAL( g_abInitialContent[wordAddr], shiftInBits(DATA_BITS) );
             standby();
         }
@@ -139 +156 @@
         shiftOutBits(0, READ_ADDR_BITS);
         for ( int wordAddr=0; wordAddr < EEPROM93C46::SIZE; wordAddr++ ) {
-            CPPUNIT_ASSERT_EQUAL( initialContent[wordAddr], shiftInBits(DATA_BITS) );
+            CPPUNIT_ASSERT_EQUAL( g_abInitialContent[wordAddr], shiftInBits(DATA_BITS) );
         }
         stop();
@@ -520 +537 @@
 }
 
-// Create text test runner and run all tests.
 int main()
 {
+#ifdef USE_CPPUNIT
     CppUnit::TextUi::TestRunner runner;
     runner.addTest( EEPROMTest::suite() );
     return runner.run() ? 0 : 1;
-}
-
+#else
+    EEPROMTest Test;
+    return Test.run();
+#endif
+}
+

trunk/src/VBox/Devices/Network/testcase/tstDevPhy.cpp

@@ -26 +26 @@
  */
 
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#ifdef USE_CPPUNIT
+# include <cppunit/ui/text/TestRunner.h>
+# include <cppunit/extensions/HelperMacros.h>
+#else
+# include "CppUnitEmulation.h"
+#endif
 
 #include "../DevE1000Phy.h"
+
 
 /**
  * Test fixture for PHY MDIO/MDC interface emulation.
  */
-class PhyTest : public CppUnit::TestFixture  {
-    CPPUNIT_TEST_SUITE( PhyTest );
+class PhyTest
+#ifdef USE_CPPUNIT
+    : public CppUnit::TestFixture
+#endif
+{
+    CPPUNIT_TEST_SUITE( tstDevPhy );
 
     CPPUNIT_TEST(testSize);
@@ -168 +181 @@
 int main()
 {
+#ifdef USE_CPPUNIT
     CppUnit::TextUi::TestRunner runner;
     runner.addTest( PhyTest::suite() );
     return runner.run() ? 0 : 1;
+#else
+    PhyTest Test;
+    return Test.run();
+#endif
 }