Ticket #7025: tests_kits_storage.patch

File tests_kits_storage.patch, 5.4 KB (added by Karvjorm, 13 years ago)

Changing BList to BObjectList in src/tests/kits/storage/

  • src/tests/kits/storage/virtualdrive/Jamfile

     
    11SubDir HAIKU_TOP src tests kits storage virtualdrive ;
    22
     3SubDir HAIKU_TOP src kits storage ;
     4
    35KernelAddon virtualdrive :
    46    virtualdrive.cpp ;
    57

  • src/tests/kits/storage/FindDirectoryTest.cpp

     
    237237        case B_COMMON_BOOT_DIRECTORY:
    238238            error = path.SetTo("/boot/home/config/boot");
    239239            break;
     240        case B_COMMON_DATA_DIRECTORY:
     241            error = path.SetTo("/boot/home/config/data");
     242            break;
    240243        case B_COMMON_FONTS_DIRECTORY:
    241244            error = path.SetTo("/boot/home/config/fonts");
    242245            break;
    … …  
    287290        case B_USER_DIRECTORY:
    288291            error = path.SetTo("/boot/home");
    289292            break;
     293        case B_USER_CACHE_DIRECTORY:
     294            error = path.SetTo("/boot/common/cache");
     295            break;
    290296        case B_USER_CONFIG_DIRECTORY:
    291297            error = path.SetTo("/boot/home/config");
    292298            break;
    … …  
    296302        case B_USER_BOOT_DIRECTORY:
    297303            error = path.SetTo("/boot/home/config/boot");
    298304            break;
     305        case B_USER_DATA_DIRECTORY:
     306            error = path.SetTo("/boot/home/config/data");
     307            break;
    299308        case B_USER_FONTS_DIRECTORY:
    300309            error = path.SetTo("/boot/home/config/fonts");
    301310            break;
    … …  
    320329        case B_USER_SOUNDS_DIRECTORY:
    321330            error = path.SetTo("/boot/home/config/sounds");
    322331            break;
     332        case B_SYSTEM_DATA_DIRECTORY:
     333            error = path.SetTo("/boot/system/data");
     334            break;
    323335        // Global directories.
    324336        case B_APPS_DIRECTORY:
    325337            error = path.SetTo("/boot/apps");

  • src/tests/kits/storage/ResourcesTest.cpp

     
    513513        CPPUNIT_ASSERT( file.InitCheck() == B_ENTRY_NOT_FOUND );
    514514        CPPUNIT_ASSERT( resources.SetTo(&file, false) == B_ENTRY_NOT_FOUND );
    515515    }
     516/*
     517#ifdef TEST_R5
    516518    // NULL file
    517519    NextSubTest();
    518520    {
    … …  
    521523//      CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_BAD_VALUE );
    522524        CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_OK );
    523525    }
     526#endif
     527*/
    524528}
    525529
    526530// ReadResTest
    … …  
    917921        CPPUNIT_ASSERT( resources.SetTo(&file, false) == B_ENTRY_NOT_FOUND );
    918922        ReadBadResTest(resources, testResource1);
    919923    }
     924/*
     925#ifdef TEST_R5
    920926    // NULL file
    921927    NextSubTest();
    922928    {
    … …  
    926932        CPPUNIT_ASSERT( resources.SetTo(NULL, false) == B_OK );
    927933        ReadBadResTest(resources, testResource1);
    928934    }
     935#endif
     936*/
    929937    // bad args
    930938    NextSubTest();
    931939    {

  • src/tests/kits/storage/Jamfile

     
    44AddSubDirSupportedPlatforms libbe_test ;
    55
    66UsePrivateHeaders storage ;
     7UsePrivateHeaders shared ;
    78
     9SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
     10
    811UnitTestLib libstoragetest.so
    912    : StorageKitTestAddon.cpp
    1013        AppFileInfoTest.cpp

  • src/tests/kits/storage/disk_device/Jamfile

     
    11SubDir HAIKU_TOP src tests kits storage disk_device ;
    22
     3SubDir HAIKU_TOP src kits storage ;
     4
    35#UsePrivateHeaders $(DOT) ;
    46#UsePrivateHeaders app ;
    57UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
    68UsePrivateHeaders shared ;
     9UsePrivateHeaders notification ;
    710UsePrivateHeaders storage ;
    811
    912SimpleTest DiskDeviceTest

  • src/tests/kits/storage/QueryTest.cpp

     
    1313#include <MessageQueue.h>
    1414#include <Messenger.h>
    1515#include <NodeMonitor.h>
     16#include <ObjectList.h>
    1617#include <OS.h>
    1718#include <Path.h>
    1819#include <Query.h>
    … …  
    263264        return (PredicateNode*)children.ItemAt(index);
    264265    }
    265266
    266     BList children;
     267    BObjectList<PredicateNode> children;
    267268};
    268269
    269270// OpNode

  • src/tests/kits/storage/testapps/Jamfile

     
    55SetSubDirSupportedPlatformsBeOSCompatible ;
    66AddSubDirSupportedPlatforms libbe_test ;
    77
    8 SEARCH_SOURCE += [ FDirName $(TOP) src kits storage ] ;
     8SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
    99
    1010SimpleTest <test>clipboard
    1111    : clipboard.cpp : be ;

  • src/tests/kits/storage/TestApp.h

     
    44#define _beos_test_app_h_
    55
    66#include <Application.h>
    7 #include <List.h>
     7#include <ObjectList.h>
    88#include <MessageQueue.h>
    99
    1010// TestHandler
    … …  
    4141    static int32 _AppThreadStart(void *data);
    4242
    4343private:
     44    typedef BObjectList<BTestHandler> TestHandlers;
    4445    thread_id       fAppThread;
    45     BList           fHandlers;
     46    TestHandlers    fHandlers;
    4647};
    4748
    4849#endif  // _beos_test_app_h_