lportal 1.0.18 → 1.0.19

data/test/unit/contact_test.rb

@@ -1,23 +1,30 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class ContactTest < ActiveSupport::TestCase
-  fixtures :contact_, :account_
+  fixtures :Contact_, :Account_, :Company, :User_
 
   def setup
     @contacts = Contact.all
     assert !@contacts.empty?, "No contacts found"
   end
 
-  # each company must have an account
   def test_account
     @contacts.each do |c|
-      assert_not_nil c.account, "#{c} has no account"
+      assert_not_nil c.account, "#{c.inspect} has no account"
+    end
+  end
+
+  def test_company
+    @contacts.each do |c|
+      assert_not_nil c.company
     end
   end
 
   def test_user
     @contacts.each do |c|
-      assert_not_nil c.user, "#{c} has no user"
+      assert_not_nil c.user, "#{c.inspect} has no user"
     end
   end
 

data/test/unit/country_test.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require 'test/test_helper'
+
+class CountryTest < ActiveSupport::TestCase
+  fixtures [
+    :Country
+  ]
+
+  def setup
+    @countries = Country.find :all
+    assert @countries.size > 0, 'No countries'
+  end
+
+  def test_countries
+    @countries.each do |x|
+      assert_not_nil x.name
+      assert_not_nil x.a2
+      assert_not_nil x.a3
+      assert_not_nil x.number_
+      assert_not_nil x.idd_
+      assert_not_nil x.active_
+    end
+  end
+
+end

data/test/unit/dl_file_test.rb

@@ -1,12 +1,20 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class DlFileTest < ActiveSupport::TestCase
-  fixtures [:dlfileentry, :company, :user_, :tagsasset]
+  fixtures [:DLFileEntry, :DLFolder, :Company, :User_, :TagsAsset]
 
   def setup
     @files = DlFile.all
   end
 
+  def test_folder
+    @files.each do |dlf|
+      assert_not_nil dlf.folder
+    end
+  end
+
   def test_company
     @files.each do |dlf|
       assert_not_nil dlf.company
@@ -28,10 +36,8 @@ class DlFileTest < ActiveSupport::TestCase
   def test_path
     @files.each do |dlf|
       assert_not_nil dlf.path
+      assert dlf.path[/#{dlf.folderid}/]
+      assert dlf.path[/#{dlf.name}/]
     end
   end
-
-
-
-
 end

data/test/unit/dl_folder_test.rb

@@ -1,8 +1,37 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class DlFolderTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  fixtures [:DLFileEntry, :DLFolder, :Company, :User_, :Group_]
+
+  def setup
+    @folders = DlFolder.all
+  end
+
+  def test_files
+    @folders.each do |dlf|
+      dlf.files.each do |f|
+        assert_not_nil f
+      end
+    end
+  end
+
+  def test_company
+    @folders.each do |dlf|
+      assert_not_nil dlf.company
+    end
+  end
+
+  def test_user
+    @folders.each do |dlf|
+      assert_not_nil dlf.user
+    end
+  end
+
+  def test_group
+    @folders.each do |dlf|
+      assert_not_nil dlf.group
+    end
   end
 end

data/test/unit/emailaddress_test.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+require 'test/test_helper'
+
+class EmailaddressTest < ActiveSupport::TestCase
+  fixtures [
+    :Company,
+    :User_,
+    :EmailAddress
+  ]
+
+  def setup
+    @addrs = Emailaddress.all
+    flunk 'No addresses to test' unless @addrs.any?
+  end
+
+  def test_company
+    @addrs.each do |x|
+      assert_not_nil x.company
+    end
+  end
+
+  def test_user
+    @addrs.each do |x|
+      assert_not_nil x.user
+    end
+  end
+end

data/test/unit/group_test.rb

@@ -1,26 +1,33 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class GroupTest < ActiveSupport::TestCase
   fixtures [
-    :organization_,
-    :groups_orgs,
-    :users_orgs,
-    :usergroup,
-    :role_,
-    :classname_
+    :Company,
+    :Group_,
+    :User_,
+    :Organization_,
+    :Groups_Orgs,
+    :Users_Groups,
+    :Users_Orgs,
+    :UserGroup,
+    :Role_,
+    :ClassName_,
+    :Release_
   ]
   # to test asset_viewer_portlet, these are required
   fixtures << [
-    :portlet, :portletproperties, :portletpreferences,
-    :layout,
-    :tagsasset,
-    :igimage,
-    :mbmessage,
-    :blogsentry,
-    :wikipage,
-    :bookmarksentry,
-    :journalarticle,
-    :dlfileentry
+    :Portlet, :portletproperties, :PortletPreferences,
+    :Layout, :LayoutSet,
+    :TagsAsset,
+    :IGImage,
+    :MBMessage,
+    :BlogsEntry,
+    :WikiPage,
+    :BookmarksEntry,
+    :JournalArticle,
+    :DLFileEntry
   ]
 
   def setup
@@ -103,14 +110,28 @@ class GroupTest < ActiveSupport::TestCase
 
   end
 
-  # each group must belong to a company
   def test_company
     @groups.each do |x|
       assert_not_nil x.company
     end
   end
 
+  def test_creator
+    @groups.each do |x|
+      assert_not_nil x.creator
+    end
+  end
+
+  def test_parent
+    @groups.each do |x|
+      next if x.parentgroupid==0
+      assert_not_nil x.parent
+    end
+  end
+
   def test_organizations
+    flunk mysql_bug if defined?(mysql_bug)
+
     @groups.each do |x|
       x.organizations.each do |org|
         assert_not_nil org
@@ -119,6 +140,8 @@ class GroupTest < ActiveSupport::TestCase
   end
 
   def test_roles
+    flunk mysql_bug if defined?(mysql_bug)
+
     @groups.each do |x|
       x.roles.each do |role|
         assert_not_nil role
@@ -127,6 +150,8 @@ class GroupTest < ActiveSupport::TestCase
   end
 
   def test_permissions
+    flunk mysql_bug if defined?(mysql_bug)
+
     @groups.each do |x|
       x.permissions.each do |permission|
         assert_not_nil permission
@@ -135,6 +160,8 @@ class GroupTest < ActiveSupport::TestCase
   end
 
   def test_usergroups
+    flunk mysql_bug if defined?(mysql_bug)
+
     @groups.each do |x|
       x.usergroups.each do |usergroup|
         assert_not_nil usergroup
@@ -220,11 +247,18 @@ class GroupTest < ActiveSupport::TestCase
 
       portletpreferences = group.asset_viewer_portlet
       assert_equal Web::PortletPreferences, portletpreferences.class
-      assert_not_nil portletpreferences.path(:asset => asset)
 
       assert_not_nil portletpreferences.layout
       assert_equal group, portletpreferences.layout.group
-      assert_equal group.companyid, portletpreferences.layout.companyid
+      assert_equal group.company, portletpreferences.layout.company
+
+      if Lportal::Schema.buildnumber < 5200
+        assert_equal 'tagged_content', portletpreferences.name
+      else
+        assert_equal 'asset_publisher', portletpreferences.name
+      end
+
+      assert_not_nil portletpreferences.path(:asset => asset)
 
       # 2nd time the portlet should be retrieved from DB
       group.reload
@@ -232,11 +266,4 @@ class GroupTest < ActiveSupport::TestCase
     end
   end
 
-#   def test_resource
-#     @groups.each do |x|
-# #       assert !x.resource.nil?, "#{x.id} has no resource"
-#     end
-#   end
-
-
 end

data/test/unit/ig/folder_test.rb

@@ -1,7 +1,9 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class IG::FolderTest < ActiveSupport::TestCase
-  fixtures  :igimage, :igfolder
+  fixtures  :IGImage, :IGFolder, :Company, :User_, :Group_
 
   def setup
     @folders = IG::Folder.all

data/test/unit/ig/image_test.rb

@@ -1,7 +1,9 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class IG::ImageTest < ActiveSupport::TestCase
-  fixtures  :igimage, :igfolder
+  fixtures  :IGImage, :IGFolder, :Company, :User_, :TagsAsset
 
   def setup
     @igimages = IG::Image.all
@@ -25,4 +27,10 @@ class IG::ImageTest < ActiveSupport::TestCase
     end
   end
 
+  def test_asset
+    @igimages.each do |x|
+      assert_not_nil x.asset
+    end
+  end
+
 end

data/test/unit/image_test.rb

@@ -1,25 +1,33 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class ImageTest < ActiveSupport::TestCase
+  fixtures [
+    :Image,
+    :IGImage
+  ]
+
   def setup
     @images = Image.find :all
   end
 
   def test_type
     @images.each do |x|
-      assert !x.type_.nil?, "#{x.id} type is null"
+      assert_not_nil x.type_, "#{x.id} type is null"
     end
   end
 
   def test_dimensions
     @images.each do |x|
-      assert !x.width.nil? && !x.height.nil?, "#{x.id} has no width && height"
+      assert_not_nil x.width
+      assert_not_nil x.height
     end
   end
 
   def test_size
     @images.each do |x|
-      assert !x.size_.nil?, "#{x.id} size is null"
+      assert_not_nil x.size_, "#{x.id} size is null"
       assert x.size_ > 0, "#{x.id} size is not positive"
     end
   end

data/test/unit/journal/article_image_test.rb

@@ -1,9 +1,11 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class Journal::ArticleImageTest < ActiveSupport::TestCase
-  fixtures [
-    :journalarticle,
-    :journalarticleresource,
-    :tagsasset
-  ]
+#   fixtures [
+#     :JournalArticle,
+#     :JournalArticleResource,
+#     :TagsAsset
+#   ]
 end

data/test/unit/journal/article_resource_test.rb

@@ -1,10 +1,15 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class Journal::ArticleResourceTest < ActiveSupport::TestCase
   fixtures [
-    :journalarticle,
-    :journalarticleresource,
-    :tagsasset
+    :Company,
+#     :User_,
+    :Group_,
+    :JournalArticle,
+    :JournalArticleResource,
+    :TagsAsset
   ]
 
   def setup
@@ -29,5 +34,4 @@ class Journal::ArticleResourceTest < ActiveSupport::TestCase
     end
   end
 
-
 end

data/test/unit/journal/article_test.rb

@@ -1,19 +1,23 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class Journal::ArticleTest < ActiveSupport::TestCase
   fixtures [
-    :journalarticle,
-    :journalarticleresource,
-    :tagsasset,
-    :tagsproperty,
-    :portlet
+    :Company,
+    :User_,
+    :Group_,
+    :JournalArticle,
+    :JournalArticleResource,
+    :TagsAsset,
+    :TagsProperty,
+    :Portlet
   ]
 
   def setup
     @articles = Journal::Article.all
   end
 
-  # each article must belong to a company
   def test_company
     @articles.each do |x|
       assert_not_nil x.company, "#{x.id} belongs to no company"
@@ -23,12 +27,13 @@ class Journal::ArticleTest < ActiveSupport::TestCase
   def test_group
     @articles.each do |x|
       assert_not_nil x.group, "#{x.id} belongs to no group!"
+      assert_equal x.group, x.resource.group
     end
   end
 
-  def test_owner
+  def test_user
     @articles.each do |x|
-      assert_not_nil x.owner, "#{x.id} belongs to no user!"
+      assert_not_nil x.user, "#{x.id} belongs to no user!"
     end
   end
 
@@ -50,16 +55,18 @@ class Journal::ArticleTest < ActiveSupport::TestCase
     end
   end
 
-#   def test_properties
-#     @articles.each do |x|
-#       assert_not_nil x.properties
-#       assert !x.properties.empty?
-#     end
-#   end
-
   def test_path
     @articles.each do |x|
-      assert_not_nil x.path
+      # path is defined in Lportal::Portlets
+      path = x.path
+      assert_not_nil path
+      assert !path.empty?
+
+      if Lportal::Schema.buildnumber < 5200
+        assert path[/_assetId=#{x.asset.id}/]
+      else
+        assert path[/content\/#{x.asset.resource.id}/]
+      end
     end
   end