fixed unit tests after merging ncbo/goo#138 and ncbo/goo#139

lib/ontologies_linked_data/models/users/user.rb

@@ -90,7 +90,11 @@ def custom_ontology_id_set
       end
 
       def to_s
-        self.username.to_s
+        if self.bring?(:username)
+          LinkedData::Utils::Triples.last_iri_fragment self.id.to_s
+        else
+          self.username.to_s
+        end
       end
 
       private

test/models/notes/test_note.rb

@@ -67,11 +67,11 @@ def test_note_lifecycle
         relatedOntology: [@@ontology],
       })
 
-      assert_equal false, n.exist?(reload=true)
+      assert_equal false, n.exist?
       n.save
-      assert_equal true, n.exist?(reload=true)
+      assert_equal true, n.exist?
       n.delete
-      assert_equal false, n.exist?(reload=true)
+      assert_equal false, n.exist?
     ensure
       n.delete if !n.nil? && n.persistent?
     end

test/models/test_ontology.rb

@@ -307,11 +307,11 @@ def test_ontology_delete
                                      })
     assert pc.valid?
     pc.save
-    assert_equal true, pc.exist?(reload=true)
+    assert_equal true, pc.exist?
 
     assert n.valid?
     n.save()
-    assert_equal true, n.exist?(reload=true)
+    assert_equal true, n.exist?
 
     review_params = {
         :creator => u,
@@ -328,12 +328,12 @@ def test_ontology_delete
 
     r = LinkedData::Models::Review.new(review_params)
     r.save()
-    assert_equal true, r.exist?(reload=true)
+    assert_equal true, r.exist?
 
     o1.delete()
-    assert_equal false, n.exist?(reload=true)
-    assert_equal false, r.exist?(reload=true)
-    assert_equal false, o1.exist?(reload=true)
+    assert_equal false, n.exist?
+    assert_equal false, r.exist?
+    assert_equal false, o1.exist?
     o2.delete()
   end
 
@@ -345,13 +345,13 @@ def test_ontology_lifecycle
     })
 
     # Create
-    assert_equal false, o.exist?(reload=true)
+    assert_equal false, o.exist?
     o.save
-    assert_equal true, o.exist?(reload=true)
+    assert_equal true, o.exist?
 
     # Delete
     o.delete
-    assert_equal false, o.exist?(reload=true)
+    assert_equal false, o.exist?
   end
 
   def test_next_submission_id

test/models/test_ontology_common.rb

@@ -91,7 +91,7 @@ def submission_parse(acronym, name, ontologyFile, id, parse_options={})
 
       ont_submission.save
 
-      assert_equal true, ont_submission.exist?(reload=true)
+      assert_equal true, ont_submission.exist?
       begin
         tmp_log = Logger.new(TestLogFile.new)
         ont_submission.process_submission(tmp_log, parse_options)
@@ -141,7 +141,7 @@ def init_test_ontology_msotest(acr)
       ont_submission.authorProperty = RDF::URI.new("http://bioportal.bioontology.org/ontologies/msotes#myAuthor")
       assert (ont_submission.valid?)
       ont_submission.save
-      assert_equal true, ont_submission.exist?(reload=true)
+      assert_equal true, ont_submission.exist?
       parse_options = {process_rdf: true, index_search: true, run_metrics: true, reasoning: true}
       begin
         tmp_log = Logger.new(TestLogFile.new)

test/models/test_project.rb

@@ -32,12 +32,12 @@ def setup
 
   def teardown
     super
-    delete_goo_models(LinkedData::Models::User.where.all)
     delete_goo_models(LinkedData::Models::Ontology.where.all)
     delete_goo_models(LinkedData::Models::Project.where.all)
-    @user = nil
+    delete_goo_models(LinkedData::Models::User.where.all)
     @ont = nil
     @project_params = nil
+    @user = nil
   end
 
   def test_project_acronym

test/models/test_provisional_class.rb

@@ -37,19 +37,19 @@ def test_provisional_class_lifecycle
 
     # Before save
     assert_equal LinkedData::Models::ProvisionalClass.where(label: label).all.count, 0
-    assert_equal false, pc.exist?(reload=true)
+    assert_equal false, pc.exist?
 
     pc.save
 
     # After save
     assert_equal LinkedData::Models::ProvisionalClass.where(label: label).all.count, 1
-    assert_equal true, pc.exist?(reload=true)
+    assert_equal true, pc.exist?
 
     pc.delete
 
     # After delete
     assert_equal LinkedData::Models::ProvisionalClass.where(label: label).all.count, 0
-    assert_equal false, pc.exist?(reload=true)
+    assert_equal false, pc.exist?
   end
 
   def test_provisional_class_valid

test/test_case.rb

@@ -218,11 +218,11 @@ def model_created_test(m)
     def model_lifecycle_test(m)
       assert_equal(true, m.is_a?(LinkedData::Models::Base), 'Expected is_a?(LinkedData::Models::Base).')
       assert_equal(true, m.valid?, "Expected valid model: #{m.errors}")
-      assert_equal(false, m.exist?(reload=true), 'Given model is already saved, expected one that is not.')
+      assert_equal(false, m.exist?, 'Given model is already saved, expected one that is not.')
       m.save
-      assert_equal(true, m.exist?(reload=true), 'Failed to save model.')
+      assert_equal(true, m.exist?, 'Failed to save model.')
       m.delete
-      assert_equal(false, m.exist?(reload=true), 'Failed to delete model.')
+      assert_equal(false, m.exist?, 'Failed to delete model.')
     end
 
     def self.count_pattern(pattern)