Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 25, 2015, 12:13:34 AM (9 years ago)
Author:
landauf
Message:

define ScopeID as integer constants instead of an enum. this allows to extend it and add new scopes outside of core.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core7/test/core/singleton/ScopeTest.cc

    r10460 r10464  
    1818        };
    1919
    20         ManageScopedSingleton(TestSingletonRoot, ScopeID::Root, false);
    21         ManageScopedSingleton(TestSingletonGraphics, ScopeID::Graphics, false);
     20        ManageScopedSingleton(TestSingletonRoot, ScopeID::ROOT, false);
     21        ManageScopedSingleton(TestSingletonGraphics, ScopeID::GRAPHICS, false);
    2222
    2323        // Fixture
    … …  
    3939    TEST_F(ScopeTest, ScopesDoNotExist)
    4040    {
    41         EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
    42         EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
     41        EXPECT_FALSE(Scope<ScopeID::ROOT>::isActive());
     42        EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
    4343    }
    4444
    … …  
    5151    TEST_F(ScopeTest, RootScope)
    5252    {
    53         EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
     53        EXPECT_FALSE(Scope<ScopeID::ROOT>::isActive());
    5454        {   // create root scope
    55             Scope<ScopeID::Root> scope;
    56             EXPECT_TRUE(Scope<ScopeID::Root>::isActive());
     55            Scope<ScopeID::ROOT> scope;
     56            EXPECT_TRUE(Scope<ScopeID::ROOT>::isActive());
    5757        }   // destroy root scope
    58         EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
     58        EXPECT_FALSE(Scope<ScopeID::ROOT>::isActive());
    5959    }
    6060
    6161    TEST_F(ScopeTest, DISABLED_RootAndGraphicsScope)
    6262    {
    63         EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
     63        EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
    6464        {   // create root scope
    65             Scope<ScopeID::Root> scope;
    66             EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
     65            Scope<ScopeID::ROOT> scope;
     66            EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
    6767            {   // create graphics scope
    68                 Scope<ScopeID::Graphics> scope;
    69                 EXPECT_TRUE(Scope<ScopeID::Graphics>::isActive());
     68                Scope<ScopeID::GRAPHICS> scope;
     69                EXPECT_TRUE(Scope<ScopeID::GRAPHICS>::isActive());
    7070            }   // destroy graphics scope
    71             EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
     71            EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
    7272        }   // destroy root scope
    73         EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
     73        EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
    7474    }
    7575
    … …  
    7878        EXPECT_FALSE(TestSingletonRoot::exists());
    7979        {   // create root scope
    80             Scope<ScopeID::Root> scope;
     80            Scope<ScopeID::ROOT> scope;
    8181            EXPECT_TRUE(TestSingletonRoot::exists());
    8282        }   // destroy root scope
    … …  
    8888        EXPECT_FALSE(TestSingletonGraphics::exists());
    8989        {   // create root scope
    90             Scope<ScopeID::Root> scope;
     90            Scope<ScopeID::ROOT> scope;
    9191            EXPECT_FALSE(TestSingletonGraphics::exists());
    9292            {   // create graphics scope
    93                 Scope<ScopeID::Graphics> scope;
     93                Scope<ScopeID::GRAPHICS> scope;
    9494                EXPECT_TRUE(TestSingletonGraphics::exists());
    9595            }   // destroy graphics scope
Note: See TracChangeset for help on using the changeset viewer.