Changeset 8228 for branches

Show
Ignore:
Timestamp:
18/11/11 16:10:11 (6 months ago)
Author:
westram
Message:
  • the whole concept of multiple folding lines is broken by design
    • no longer test it
Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/e4fix/EDIT4/ED4_root.cxx

    r8227 r8228  
    209209    ED4_folding_line *ver200 = foldable.insert_folding_line(200, 0, INFINITE, 0, NULL, ED4_P_VERTICAL); 
    210210 
    211     ED4_folding_line *hor200 = foldable.insert_folding_line(0, 200, 300, 0, NULL, ED4_P_HORIZONTAL); 
    212     ED4_folding_line *ver300 = foldable.insert_folding_line(300, 100, 200, 0, NULL, ED4_P_VERTICAL); 
    213  
    214211    // nothing folded yet 
    215212     
    … …  
    230227    TEST_ASSERT_WIN_UNFOLDED(400, 350); 
    231228 
    232     for (int FACTOR = 1; FACTOR <= 10; FACTOR ++) { 
     229    for (int FACTOR = 1; FACTOR <= 100; FACTOR += 9) { 
    233230        TEST_ANNOTATE_ASSERT(GBS_global_string("FACTOR=%i", FACTOR)); 
    234231        int H1 = FACTOR* 10; 
    235         int H2 = FACTOR* 40; 
    236232        int V1 = FACTOR* 20; 
    237         int V2 = FACTOR* 80; 
    238233 
    239234        hor100->dimension = H1; 
    240         hor200->dimension = H2; 
    241235        ver200->dimension = V1; 
    242         ver300->dimension = V2; 
    243236 
    244237        TEST_ASSERT_WIN_UNFOLDED(100, 50); // always in unfolded range 
    … …  
    246239        TEST_ASSERT_WIN_WORLD_FOLDING(400, 50, V1, 0); 
    247240 
    248         TEST_ASSERT_WIN_WORLD_FOLDING__BROKENIF(FACTOR >= 5, 100, 150, 0,     H1); 
    249         TEST_ASSERT_WIN_WORLD_FOLDING__BROKENIF(FACTOR >= 3, 250, 150, V1,    H1); 
    250         TEST_ASSERT_WIN_WORLD_FOLDING(400, 150, V1+V2, H1); 
    251         TEST_ASSERT_WIN_WORLD_FOLDING__BROKENIF(FACTOR >= 3, 250, 250, V1,    H1+H2); 
    252  
    253         TEST_ASSERT_WIN_WORLD_FOLDING(100, 250, 0,     H1+H2); 
    254         TEST_ASSERT_WIN_WORLD_FOLDING__BROKENIF(FACTOR >= 6, 400, 250, V1+V2, H1); 
    255  
    256         TEST_ASSERT_WIN_WORLD_FOLDING(100, 350, 0,  H1+H2); 
    257         TEST_ASSERT_WIN_WORLD_FOLDING__BROKENIF(FACTOR >= 3, 250, 350, V1, H1+H2); 
     241        TEST_ASSERT_WIN_WORLD_FOLDING(100, 150, 0,  H1); 
     242        TEST_ASSERT_WIN_WORLD_FOLDING(250, 150, V1, H1); 
     243        TEST_ASSERT_WIN_WORLD_FOLDING(400, 150, V1, H1); 
     244        TEST_ASSERT_WIN_WORLD_FOLDING(250, 250, V1, H1); 
     245 
     246        TEST_ASSERT_WIN_WORLD_FOLDING(100, 250, 0,  H1); 
     247        TEST_ASSERT_WIN_WORLD_FOLDING(400, 250, V1, H1); 
     248 
     249        TEST_ASSERT_WIN_WORLD_FOLDING(100, 350, 0,  H1); 
     250        TEST_ASSERT_WIN_WORLD_FOLDING(250, 350, V1, H1); 
    258251        TEST_ASSERT_WIN_WORLD_FOLDING(400, 350, V1, H1); 
    259252    }