Reenabled tests.

test/Run_Test.m

@@ -20,7 +20,7 @@ pkg load caosdb;
 
 all_tests = true;
 all_tests &= moxunit_runtests("-verbose", "test_query_retrieve.m");
-% all_tests &= moxunit_runtests("-verbose", "test_transaction.m");
+all_tests &= moxunit_runtests("-verbose", "test_transaction.m");
 
 if not(all_tests)
   exit(1);

test/test_query_retrieve.m

@@ -138,7 +138,7 @@ function test_retrieve_multiple()
 end
 
 %% Test query execution
-function __test_execute_query()
+function test_execute_query()
   c = Caosdb();
   % FIND query
   query = ['FIND Record Violin WITH name="Sherlock Holmes' "'" ' violin"'];
@@ -163,7 +163,7 @@ end
 % Error handling tests %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Test retrieval with errors
-function _test_retrieve_failure()
+function test_retrieve_failure()
   % Default connection configuration is sufficient.
   c = Caosdb();
 
@@ -179,7 +179,7 @@ function _test_retrieve_failure()
 end
 
 %% Test querying with errors
-function _test_execute_query_failure()
+function test_execute_query_failure()
   c = Caosdb();
   results = c.query("FIND Record I-Do-Not-Exist"); % Must not segfault.
   assertTrue(isempty(results));

test/test_transaction.m

@@ -156,106 +156,60 @@ function test_insert_entity()
   compare_parents(retrieved.get_parents{1}, par, {"name"});
 
   % Check errors
-  assertFalse(inserted.has_errors());
-  assertFalse(inserted.has_warnings());
-  assertFalse(inserted.has_infos());
-  assertFalse(retrieved.has_errors());
-  assertFalse(retrieved.has_warnings());
-  assertFalse(retrieved.has_infos());
+  assertFalse(inserted.has_errors(), print_messages(inserted.get_errors(), "error"));
+  assertFalse(inserted.has_warnings(), print_messages(inserted.get_warnings(), "warning"));
+  assertFalse(inserted.has_infos(), print_messages(inserted.get_infos(), "info"));
+  assertFalse(retrieved.has_errors(), print_messages(retrieved.get_errors(), "error"));
+  assertFalse(retrieved.has_warnings(), print_messages(retrieved.get_warnings(), "warning"));
+  assertFalse(retrieved.has_infos(), print_messages(retrieved.get_infos(), "info"));
+  cleanup();
 end
 
 %% Test updating of Entities
-function xtest_update_entity()
+function test_update_entity()
   % Default connection configuration is sufficient.
   cleanup();
+  disp("================ test_update_entity ==============");
   c = Caosdb();
 
   % Create & insert Properties first (TODO Insert in a single step)
   P1 = Entity();
   P1.role = "PROPERTY";
   P1.name = "Prop 1";
-  P1.set_datatype("DOUBLE");
-
-  P2 = Entity();
-  P2.role = "PROPERTY";
-  P2.name = "Prop 2";
-  P2.set_datatype("BOOLEAN");
-  P2.unit = "MegaTruths";
+  %% TODO(dh) units
+  % P1.unit = "Whales";
+  P1.set_datatype("INTEGER", false, true);
+  P1.value = int64([1, 2, 3, 4, 2^31-1, -2^31]);
 
   P1_id = c.insert({P1}){1}.id;
-  P2_id = c.insert({P2}){1}.id;
-  return
-  % set plain Octave properties, reuse IDs
-  p1 = Property();
-  p1.id = P1_id;
-  p1.name = P1.name;
-  p1.description = "";
-  p1.importance = "SUGGESTED";
-  p1.set_datatype("DOUBLE");
-  p1.unit = "Mt";
-  % p1.value = 0;
-  p2 = Property();
-  p2.id = P2_id;
-  p2.name = P2.name;
-  p2.description = "None";
-  p2.importance = "SUGGESTED";
-  p2.set_datatype("BOOLEAN");
-  p2.value = logical(1);
-
-  % Get ID of parent first
-  violin_id = c.query("FIND RECORDTYPE Violin"){1}.id;
-  par = Parent();
-  par.id = violin_id;
-  par.name = "Violin";
-  par.description = "Some description";
-
-  e = Entity();
-  e.role = "RecordType";
-  e.name = "Test RecordType";
-
-  % merge objects
-  e.set_properties({p1, p2});
-  % e.set_parents({par});
-
-  % There are 3 steps:
-  % 1. Insert
-  inserted = c.insert({e});
-  % 2. Look at insertion result
-  assertEqual(numel(inserted), 1);
-  inserted = inserted{1};
-  assertTrue(isinteger(int64(str2num (inserted.id))));
-  assertFalse(isempty(inserted.id));
-  % 3. Retrieve the inserted entity again, by ID
-  retrieved = c.retrieve_by_id(inserted.id){1};
-
-  % Compare results
-  assertEqual(e.role, retrieved.role);
-  assertEqual(e.name, retrieved.name);
-  assertEqual(numel(e.get_properties()), numel(retrieved.get_properties()));
-  props = retrieved.get_properties();
-  prop_names = cellfun(@(x)(getfield(x.to_struct(), "name")), props, "UniformOutput", false);
-  assertTrue(all(ismember({"Prop 1", "Prop 2"}, prop_names)));
-  i_1 = find(cellfun(@(x)isequal(x, "Prop 1"), prop_names));
-  i_2 = find(cellfun(@(x)isequal(x, "Prop 2"), prop_names));
-  prop_1 = props{i_1};
-  prop_2 = props{i_2};
-
-  disp("====================");
-  disp(p1.to_struct);
-  disp("....................");
-  disp(prop_1.to_struct());
+  % disp(P1)
+  P1_upd = c.retrieve_by_id(P1_id){1};
+  % disp(P1_upd);
+  P1_upd.name = "Prop 1a";
+  P1_upd.description = "This is a described Property.";
+  P1_upd.set_datatype("DOUBLE", false, false);  % Double scalar
+  %% TODO(dh) units
+  % P1_upd.unit = "Wales"
+  P1_upd.value = 1e-300;
+
+  P1_upd_result = c.update({P1_upd}){1};
+  assertFalse(P1_upd_result.has_errors(), print_messages(P1_upd_result.get_errors(), "error"));
+  % TODO(dh) unit warning is currently existing
+  % assertFalse(P1_upd_result.has_warnings(),
+  %             print_messages(P1_upd_result.get_warnings(), "warning"));
+  assertFalse(P1_upd_result.has_infos(), print_messages(P1_upd_result.get_infos(), "info"));
+
+  assertEqual(P1_upd_result.id, P1_id);
+  retrieved = c.retrieve_by_id(P1_id);
+  P1_upd_retr = retrieved{1};
+  % disp(P1_upd_retr);
+  assertFalse(P1_upd_retr.has_errors(), print_messages(P1_upd_retr.get_errors(), "error"));
+  assertFalse(P1_upd_retr.has_warnings(), print_messages(P1_upd_retr.get_warnings(), "warning"));
+  assertFalse(P1_upd_retr.has_infos(), print_messages(P1_upd_retr.get_infos(), "info"));
+
+  compare_properties(P1_upd_retr, P1_upd);
 
-  assertTrue(isequal(prop_1.to_struct(), p1.to_struct()));
-  assertTrue(isequal(prop_2.to_struct(), p2.to_struct()));
-  assertTrue(isequal(retrieved.get_parents{1}.to_struct(), par.to_struct()));
-
-  % Check errors
-  assertFalse(inserted.has_errors());
-  assertFalse(inserted.has_warnings());
-  assertFalse(inserted.has_infos());
-  assertFalse(retrieved.has_errors());
-  assertFalse(retrieved.has_warnings());
-  assertFalse(retrieved.has_infos());
+  cleanup();
 end
 
 % Utility functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%