Cleanup test exemplars and fix subsequent @#generate@ calls generating same values...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7458 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/exemplars/auth_source_exemplar.rb b/test/exemplars/auth_source_exemplar.rb
index da277e2adfe77ef7babc1da37ef85090680af2ae..3976aebb8de013dba571cafe62f02b29c160c25d 100644 (file)
--- a/test/exemplars/auth_source_exemplar.rb
+++ b/test/exemplars/auth_source_exemplar.rb
@@ -1,9 +1,4 @@
 class AuthSource < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'Auth0'
 
-  def self.next_name
-    @last_name ||= 'Auth0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/board_exemplar.rb b/test/exemplars/board_exemplar.rb
index 264ea8107260010eebb4659cf81c6b02935f3e17..eb8643dcdfb02d1311dd1740e9c9881192084d4d 100644 (file)
--- a/test/exemplars/board_exemplar.rb
+++ b/test/exemplars/board_exemplar.rb
@@ -1,20 +1,8 @@
 class Board < ActiveRecord::Base
-  generator_for :name, :method => :next_name
-  generator_for :description, :method => :next_description
+  generator_for :name, :start => 'A Forum'
+  generator_for :description, :start => 'Some description here'
   generator_for :project, :method => :generate_project
 
-  def self.next_name
-    @last_name ||= 'A Forum'
-    @last_name.succ!
-    @last_name
-  end
-
-  def self.next_description
-    @last_description ||= 'Some description here'
-    @last_description.succ!
-    @last_description
-  end
-
   def self.generate_project
     Project.generate!
   end

diff --git a/test/exemplars/change_exemplar.rb b/test/exemplars/change_exemplar.rb
index 97985fbf5dd94f4d8c7d5167975a55d18cd6b320..07f30ecef79d131d6c42505cb1078ad6fb170b44 100644 (file)
--- a/test/exemplars/change_exemplar.rb
+++ b/test/exemplars/change_exemplar.rb
@@ -1,14 +1,8 @@
 class Change < ActiveRecord::Base
   generator_for :action => 'A'
-  generator_for :path, :method => :next_path
+  generator_for :path, :start => 'test/dir/aaa0001'
   generator_for :changeset, :method => :generate_changeset
 
-  def self.next_path
-    @last_path ||= 'test/dir/aaa0001'
-    @last_path.succ!
-    @last_path
-  end
-
   def self.generate_changeset
     Changeset.generate!
   end

diff --git a/test/exemplars/changeset_exemplar.rb b/test/exemplars/changeset_exemplar.rb
index a14997759aa5b46422203cb253eb332722969ff0..62d6ee34c6b5c5073dc224156c7ee779b608ac4f 100644 (file)
--- a/test/exemplars/changeset_exemplar.rb
+++ b/test/exemplars/changeset_exemplar.rb
@@ -1,14 +1,8 @@
 class Changeset < ActiveRecord::Base
-  generator_for :revision, :method => :next_revision
+  generator_for :revision, :start => '1'
   generator_for :committed_on => Date.today
   generator_for :repository, :method => :generate_repository
 
-  def self.next_revision
-    @last_revision ||= '1'
-    @last_revision.succ!
-    @last_revision
-  end
-
   def self.generate_repository
     Repository::Subversion.generate!
   end

diff --git a/test/exemplars/custom_field_exemplar.rb b/test/exemplars/custom_field_exemplar.rb
index b9577bb9318939e9187ccf32bf903ee55e15a873..81e77884d011033290f8278055083510f7cbc0b6 100644 (file)
--- a/test/exemplars/custom_field_exemplar.rb
+++ b/test/exemplars/custom_field_exemplar.rb
@@ -1,10 +1,5 @@
 class CustomField < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'CustomField0'
   generator_for :field_format => 'string'
 
-  def self.next_name
-    @last_name ||= 'CustomField0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/document_category_exemplar.rb b/test/exemplars/document_category_exemplar.rb
index 5ffe9a94ab2aa639ef94fb0b287a52e50a6f56db..758b6d4c14a188e7d40fc9626633c58fb8ee6f15 100644 (file)
--- a/test/exemplars/document_category_exemplar.rb
+++ b/test/exemplars/document_category_exemplar.rb
@@ -1,10 +1,5 @@
 class DocumentCategory < Enumeration
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'DocumentCategory0'
   generator_for :type => 'DocumentCategory'
 
-  def self.next_name
-    @last_name ||= 'DocumentCategory0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/document_exemplar.rb b/test/exemplars/document_exemplar.rb
index ae9a4a25a2e1c22364dd411f6d76c91fcde654da..1d8e710288958ef81c2820e6052f2e6ca78a3edc 100644 (file)
--- a/test/exemplars/document_exemplar.rb
+++ b/test/exemplars/document_exemplar.rb
@@ -1,9 +1,4 @@
 class Document < ActiveRecord::Base
-  generator_for :title, :method => :next_title
+  generator_for :title, :start => 'Document001'
 
-  def self.next_title
-    @last_title ||= 'Document001'
-    @last_title.succ!
-    @last_title
-  end
 end

diff --git a/test/exemplars/enabled_module_exemplar.rb b/test/exemplars/enabled_module_exemplar.rb
index 85a38b509debbae24ec828fe87e3c0ea6420f6c1..60f0631cf19d36617e79de5fc07a6640cf74820a 100644 (file)
--- a/test/exemplars/enabled_module_exemplar.rb
+++ b/test/exemplars/enabled_module_exemplar.rb
@@ -1,10 +1,4 @@
 class EnabledModule < ActiveRecord::Base
-  generator_for :name, :method => :next_name
-
-  def self.next_name
-    @last_name ||= 'module_001'
-    @last_name.succ!
-    @last_name
-  end
+  generator_for :name, :start => 'module_001'
 
 end

diff --git a/test/exemplars/enumeration_exemplar.rb b/test/exemplars/enumeration_exemplar.rb
index 6665a6d5df6182d5ca39561eacedb08a60a7c48e..29e4f45d45c4d695163b169c4b414d2a855d7dcc 100644 (file)
--- a/test/exemplars/enumeration_exemplar.rb
+++ b/test/exemplars/enumeration_exemplar.rb
@@ -1,10 +1,5 @@
 class Enumeration < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'Enumeration0'
   generator_for :type => 'TimeEntryActivity'
 
-  def self.next_name
-    @last_name ||= 'Enumeration0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/group_exemplar.rb b/test/exemplars/group_exemplar.rb
index 5d2cd747b179a32ffea27c593e1d38dadfa85239..a6851b4225f9016c7f38cec176e1eef7dd19d528 100644 (file)
--- a/test/exemplars/group_exemplar.rb
+++ b/test/exemplars/group_exemplar.rb
@@ -1,10 +1,4 @@
 class Group < Principal
-  generator_for :lastname, :method => :next_lastname
-
-  def self.next_lastname
-    @last_lastname ||= 'Group'
-    @last_lastname.succ!
-    @last_lastname
-  end
+  generator_for :lastname, :start => 'Group'
 
 end

diff --git a/test/exemplars/issue_category_exemplar.rb b/test/exemplars/issue_category_exemplar.rb
index 318947c29aa12482d0ce2c97afd6ed897ffee38c..246eafcfb95f74e2bc2dafe25d6fc90662dc6031 100644 (file)
--- a/test/exemplars/issue_category_exemplar.rb
+++ b/test/exemplars/issue_category_exemplar.rb
@@ -1,9 +1,4 @@
 class IssueCategory < ActiveRecord::Base
-  generator_for :name, :method => :next_name
-  
-  def self.next_name
-    @last_name ||= 'Category 0001'
-    @last_name.succ!
-    @last_name
-  end
+  generator_for :name, :start => 'Category 0001'
+
 end

diff --git a/test/exemplars/issue_exemplar.rb b/test/exemplars/issue_exemplar.rb
index 568f054ce03f371429dedcb6bd76d8f99140657b..17868e6a4a8e0061c765e936f79918a8a317896d 100644 (file)
--- a/test/exemplars/issue_exemplar.rb
+++ b/test/exemplars/issue_exemplar.rb
@@ -1,13 +1,7 @@
 class Issue < ActiveRecord::Base
-  generator_for :subject, :method => :next_subject
+  generator_for :subject, :start => 'Subject 0'
   generator_for :author, :method => :next_author
   generator_for :priority, :method => :fetch_priority
-  
-  def self.next_subject
-    @last_subject ||= 'Subject 0'
-    @last_subject.succ!
-    @last_subject
-  end
 
   def self.next_author
     User.generate_with_protected!
@@ -16,5 +10,4 @@ class Issue < ActiveRecord::Base
   def self.fetch_priority
     IssuePriority.first || IssuePriority.generate!
   end
-
 end

diff --git a/test/exemplars/issue_priority_exemplar.rb b/test/exemplars/issue_priority_exemplar.rb
index 0819a8dc250cfe63b501561cb7cca2223ff7ab4e..5059da5a1c12db57f31bf47b740eb861f8171a75 100644 (file)
--- a/test/exemplars/issue_priority_exemplar.rb
+++ b/test/exemplars/issue_priority_exemplar.rb
@@ -1,10 +1,5 @@
 class IssuePriority < Enumeration
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'IssuePriority0'
   generator_for :type => 'IssuePriority'
 
-  def self.next_name
-    @last_name ||= 'IssuePriority0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/issue_status_exemplar.rb b/test/exemplars/issue_status_exemplar.rb
index 9d3ccdc1b377a08d6ebaec7f8408698b2588843f..0576568dd9d1d42ccca3a64fb93b935ee8290f3f 100644 (file)
--- a/test/exemplars/issue_status_exemplar.rb
+++ b/test/exemplars/issue_status_exemplar.rb
@@ -1,9 +1,4 @@
 class IssueStatus < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'Status 0'
 
-  def self.next_name
-    @last_name ||= 'Status 0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/message_exemplar.rb b/test/exemplars/message_exemplar.rb
index 0a310fc9d3b8a59a6dc52f8a7e78ecd01c1b2084..67c5b67e2a2938cc29bebf9f8cef12bfddb22af1 100644 (file)
--- a/test/exemplars/message_exemplar.rb
+++ b/test/exemplars/message_exemplar.rb
@@ -1,20 +1,8 @@
 class Message < ActiveRecord::Base
-  generator_for :subject, :method => :next_subject
-  generator_for :content, :method => :next_content
+  generator_for :subject, :start => 'A Message'
+  generator_for :content, :start => 'Some content here'
   generator_for :board, :method => :generate_board
 
-  def self.next_subject
-    @last_subject ||= 'A Message'
-    @last_subject.succ!
-    @last_subject
-  end
-
-  def self.next_content
-    @last_content ||= 'Some content here'
-    @last_content.succ!
-    @last_content
-  end
-
   def self.generate_board
     Board.generate!
   end

diff --git a/test/exemplars/news_exemplar.rb b/test/exemplars/news_exemplar.rb
index c7e22c5a7115e09980b459dbafc5be41bb58413c..d58a2924f754d583ea8f8a459216315b5f1f8e05 100644 (file)
--- a/test/exemplars/news_exemplar.rb
+++ b/test/exemplars/news_exemplar.rb
@@ -1,16 +1,5 @@
 class News < ActiveRecord::Base
-  generator_for :title, :method => :next_title
-  generator_for :description, :method => :next_description
+  generator_for :title, :start => 'A New Item'
+  generator_for :description, :start => 'Some content here'
 
-  def self.next_title
-    @last_title ||= 'A New Item'
-    @last_title.succ!
-    @last_title
-  end
-
-  def self.next_description
-    @last_description ||= 'Some content here'
-    @last_description.succ!
-    @last_description
-  end
 end

diff --git a/test/exemplars/project_exemplar.rb b/test/exemplars/project_exemplar.rb
index a28c3331226a7dce6f00c0be402c58f93ed93cb4..ceda2be295209ef30bddb11b1bc83283761196d8 100644 (file)
--- a/test/exemplars/project_exemplar.rb
+++ b/test/exemplars/project_exemplar.rb
@@ -1,21 +1,8 @@
 class Project < ActiveRecord::Base
-  generator_for :name, :method => :next_name
-  generator_for :identifier, :method => :next_identifier_from_object_daddy
+  generator_for :name, :start => 'Project 0'
+  generator_for :identifier, :start => 'project-0000'
   generator_for :enabled_modules, :method => :all_modules
   generator_for :trackers, :method => :next_tracker
-  
-  def self.next_name
-    @last_name ||= 'Project 0'
-    @last_name.succ!
-    @last_name
-  end
-
-  # Project#next_identifier is defined on Redmine
-  def self.next_identifier_from_object_daddy
-    @last_identifier ||= 'project-0000'
-    @last_identifier.succ!
-    @last_identifier
-  end
 
   def self.all_modules
     [].tap do |modules|

diff --git a/test/exemplars/query_exemplar.rb b/test/exemplars/query_exemplar.rb
index db32e938afa5f0f47a0b9121a0853e85b73d76e1..2b0847c8090b31d8cfcf8cb76bdd8e0374985949 100644 (file)
--- a/test/exemplars/query_exemplar.rb
+++ b/test/exemplars/query_exemplar.rb
@@ -1,9 +1,4 @@
 class Query < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'Query 0'
 
-  def self.next_name
-    @last_name ||= 'Query 0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/repository_exemplar.rb b/test/exemplars/repository_exemplar.rb
index 42d11fca9417f03e22b03748b4523aa1748766df..7b596ea361dd4eebb97f00e1712dcdb7db65c938 100644 (file)
--- a/test/exemplars/repository_exemplar.rb
+++ b/test/exemplars/repository_exemplar.rb
@@ -1,11 +1,5 @@
 class Repository < ActiveRecord::Base
   generator_for :type => 'Subversion'
-  generator_for :url, :method => :next_url
-
-  def self.next_url
-    @last_url ||= 'file:///test/svn'
-    @last_url.succ!
-    @last_url
-  end
+  generator_for :url, :start => 'file:///test/svn'
 
 end

diff --git a/test/exemplars/role_exemplar.rb b/test/exemplars/role_exemplar.rb
index 9f17e13823bfa59528ad04754417058c120bd19c..00bad921296f5a733324707cf4602c04294329e8 100644 (file)
--- a/test/exemplars/role_exemplar.rb
+++ b/test/exemplars/role_exemplar.rb
@@ -1,8 +1,4 @@
 class Role < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'Role0'
 
-  def self.next_name
-    @last_name ||= 'Role0'
-    @last_name.succ!
-  end
 end

diff --git a/test/exemplars/subversion_repository_exemplar.rb b/test/exemplars/subversion_repository_exemplar.rb
index 2d48cb2f333b699223ca040a349b58c219388efb..93c9fd1619115e089e189dfb457ca2b07db7d8b7 100644 (file)
--- a/test/exemplars/subversion_repository_exemplar.rb
+++ b/test/exemplars/subversion_repository_exemplar.rb
@@ -1,11 +1,5 @@
 class Repository::Subversion < Repository
   generator_for :type, :method => 'Subversion'
-  generator_for :url, :method => :next_url
-
-  def self.next_url
-    @last_url ||= 'file:///test/svn'
-    @last_url.succ!
-    @last_url
-  end
+  generator_for :url, :start => 'file:///test/svn'
 
 end

diff --git a/test/exemplars/time_entry_activity.rb b/test/exemplars/time_entry_activity.rb
index 8473c2f8135e673b186a4816335c91ceaa953fa0..e5e318d74bc26e84522f32e067384041ee510638 100644 (file)
--- a/test/exemplars/time_entry_activity.rb
+++ b/test/exemplars/time_entry_activity.rb
@@ -1,10 +1,5 @@
 class TimeEntryActivity < Enumeration
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'TimeEntryActivity0'
   generator_for :type => 'TimeEntryActivity'
 
-  def self.next_name
-    @last_name ||= 'TimeEntryActivity0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/time_entry_exemplar.rb b/test/exemplars/time_entry_exemplar.rb
index b15b9562ded07e95f895d6cc4314dbc17cff8668..c8f2e203cf71081d98f3107bebb0b11c8cbebf8a 100644 (file)
--- a/test/exemplars/time_entry_exemplar.rb
+++ b/test/exemplars/time_entry_exemplar.rb
@@ -6,5 +6,4 @@ class TimeEntry < ActiveRecord::Base
   def self.generate_user
     User.generate_with_protected!
   end
-  
 end

diff --git a/test/exemplars/tracker_exemplar.rb b/test/exemplars/tracker_exemplar.rb
index 94523f79b17d4d292385cc10f3a156fd9344b326..0aa0d3b948fa30376afeb350a0420af505a8c8f7 100644 (file)
--- a/test/exemplars/tracker_exemplar.rb
+++ b/test/exemplars/tracker_exemplar.rb
@@ -1,9 +1,4 @@
 class Tracker < ActiveRecord::Base
-  generator_for :name, :method => :next_name
+  generator_for :name, :start => 'Tracker 0'
 
-  def self.next_name
-    @last_name ||= 'Tracker 0'
-    @last_name.succ!
-    @last_name
-  end
 end

diff --git a/test/exemplars/user_exemplar.rb b/test/exemplars/user_exemplar.rb
index def8dc423d517ebd668ac94d56b97dbbc9f49d6c..7aee1453138c6c95bee57e49e2b3a3ae61eecc7d 100644 (file)
--- a/test/exemplars/user_exemplar.rb
+++ b/test/exemplars/user_exemplar.rb
@@ -1,30 +1,12 @@
 class User < Principal
-  generator_for :login, :method => :next_login
+  generator_for :login, :start => 'user1'
   generator_for :mail, :method => :next_email
-  generator_for :firstname, :method => :next_firstname
-  generator_for :lastname, :method => :next_lastname
-  
-  def self.next_login
-    @gen_login ||= 'user1'
-    @gen_login.succ!
-    @gen_login
-  end
-  
+  generator_for :firstname, :start => 'Bob'
+  generator_for :lastname, :start => 'Doe'
+
   def self.next_email
     @last_email ||= 'user1'
     @last_email.succ!
     "#{@last_email}@example.com"
   end
-
-  def self.next_firstname
-    @last_firstname ||= 'Bob'
-    @last_firstname.succ!
-    @last_firstname
-  end
-
-  def self.next_lastname
-    @last_lastname ||= 'Doe'
-    @last_lastname.succ!
-    @last_lastname
-  end
 end

diff --git a/test/exemplars/version_exemplar.rb b/test/exemplars/version_exemplar.rb
index 04335549fbe57ff78323e41fe02afd43e543563c..ee421fea4e93295701c65f62080cb683c49bb79c 100644 (file)
--- a/test/exemplars/version_exemplar.rb
+++ b/test/exemplars/version_exemplar.rb
@@ -1,11 +1,5 @@
 class Version < ActiveRecord::Base\r
-  generator_for :name, :method => :next_name\r
+  generator_for :name, :start => 'Version 1.0.0'\r
   generator_for :status => 'open'\r
-  \r
-  def self.next_name\r
-    @last_name ||= 'Version 1.0.0'\r
-    @last_name.succ!\r
-    @last_name\r
-  end\r
 \r
 end\r

diff --git a/test/exemplars/wiki_page_exemplar.rb b/test/exemplars/wiki_page_exemplar.rb
index d70cc22785f192aae5db66ccfcda17e32ed2d497..8db9a0e95c7d791a907ba9a56dc470dba6fce624 100644 (file)
--- a/test/exemplars/wiki_page_exemplar.rb
+++ b/test/exemplars/wiki_page_exemplar.rb
@@ -1,13 +1,7 @@
 class WikiPage < ActiveRecord::Base
-  generator_for :title, :method => :next_title
+  generator_for :title, :start => 'AWikiPage'
   generator_for :wiki, :method => :generate_wiki
 
-  def self.next_title
-    @last_title ||= 'AWikiPage'
-    @last_title.succ!
-    @last_title
-  end
-
   def self.generate_wiki
     Wiki.generate!
   end

diff --git a/test/exemplars/wiki_redirect_exemplar.rb b/test/exemplars/wiki_redirect_exemplar.rb
index 0b380acc55325bf42fc53114ac76cb668900e63c..cedb5bd00e08c0055389f682cf8b7b335940a5fd 100644 (file)
--- a/test/exemplars/wiki_redirect_exemplar.rb
+++ b/test/exemplars/wiki_redirect_exemplar.rb
@@ -1,20 +1,8 @@
 class WikiRedirect < ActiveRecord::Base
-  generator_for :title, :method => :next_title
-  generator_for :redirects_to, :method => :next_redirects_to
+  generator_for :title, :start => 'AWikiPage'
+  generator_for :redirects_to, :start => '/a/path/000001'
   generator_for :wiki, :method => :generate_wiki
 
-  def self.next_title
-    @last_title ||= 'AWikiPage'
-    @last_title.succ!
-    @last_title
-  end
-
-  def self.next_redirects_to
-    @last_redirect ||= '/a/path/000001'
-    @last_redirect.succ!
-    @last_redirect
-  end
-
   def self.generate_wiki
     Wiki.generate!
   end