Changeset 929 for trunk/test


Ignore:
Timestamp:
Dec 2, 2009, 9:02:12 AM (12 years ago)
Author:
Jari Häkkinen
Message:

Changed Colour to Color for consistency.

Location:
trunk/test
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/test/Makefile.am

    r919 r929  
    2222check_SCRIPTS = svn_update.sh
    2323
    24 check_PROGRAMS = cache_partial_test colour_test \
     24check_PROGRAMS = cache_partial_test color_test \
    2525  config_test copyright_test date_test \
    2626  parser_test stats_test trac_test utility_test
     
    5454
    5555cache_partial_test_SOURCES = cache_partial_test.cc
    56 colour_test_SOURCES = colour_test.cc
     56color_test_SOURCES = color_test.cc
    5757config_test_SOURCES = config_test.cc
    5858copyright_test_SOURCES = copyright_test.cc
  • trunk/test/color_test.cc

    r924 r929  
    2020*/
    2121
    22 #include "Colours.h"
     22#include "Colors.h"
    2323
    2424#include <iostream>
     
    3030  bool ok=true;
    3131
    32   // The loop adds new authors to the author colour map until all
    33   // colours are use. The colour map contains 12 colours and black
     32  // The loop adds new authors to the author color map until all
     33  // colors are use. The color map contains 12 colors and black
    3434  // (total 13). The loop is 14 iterations and therefore the first
    35   // colour is reused for the last author. This test checks that
    36   // colours are reused. If the colour map size changes, then the loop
     35  // color is reused for the last author. This test checks that
     36  // colors are reused. If the color map size changes, then the loop
    3737  // must be adjusted accordingly
    3838  unsigned char r_first, g_first, b_first;
     
    4141    std::stringstream ss;
    4242    ss << i;
    43     Colours::instance().get_colour(ss.str(), r, g, b);
    44     if (!i) r_first=r, g_first=g, b_first=b;  // remember first colour
     43    Colors::instance().get_color(ss.str(), r, g, b);
     44    if (!i) r_first=r, g_first=g, b_first=b;  // remember first color
    4545  }
    46   // Test first and last colour, expected to be the same.
     46  // Test first and last color, expected to be the same.
    4747  if (r!=r_first || g!=g_first || b!=b_first) {
    4848    ok=false;
Note: See TracChangeset for help on using the changeset viewer.