Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Changeset 5315

Show
Ignore:
Timestamp:
08/19/08 14:18:17 (3 months ago)
Author:
tmdugan
Message:

-- openmrs logic-api-refactoring

* changed test cases to use a common concepts file

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/LogicBasicTest.java

    r5314 r5315  
    3636                initializeInMemoryDatabase(); 
    3737                executeDataSet("org/openmrs/test/logic/include/LogicTests-patients.xml"); 
    38                  
     38                executeDataSet("org/openmrs/test/logic/include/concepts.xml"); 
     39 
    3940                authenticate(); 
    4041        } 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/LogicCountTest.java

    r5314 r5315  
    2929         
    3030                executeDataSet("org/openmrs/test/logic/include/LogicNTest.xml"); 
     31                executeDataSet("org/openmrs/test/logic/include/concepts.xml"); 
     32 
    3133                // authenticate to the temp database 
    3234                authenticate(); 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/LogicEvalTest.java

    r5314 r5315  
    3535                initializeInMemoryDatabase(); 
    3636                executeDataSet("org/openmrs/test/logic/include/LogicTests-patients.xml"); 
    37                 executeDataSet("org/openmrs/test/logic/include/LogicEvalTest.testSimpleLogic.xml"); 
     37                executeDataSet("org/openmrs/test/logic/include/concepts.xml"); 
     38 
    3839                authenticate(); 
    3940        } 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/LogicNTest.java

    r5314 r5315  
    2828        
    2929                executeDataSet("org/openmrs/test/logic/include/LogicNTest.xml"); 
     30                executeDataSet("org/openmrs/test/logic/include/concepts.xml"); 
     31 
    3032                // authenticate to the temp database 
    3133                authenticate(); 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/LogicServiceTest.java

    r4752 r5315  
    3030        initializeInMemoryDatabase(); 
    3131        executeDataSet("org/openmrs/test/logic/include/LogicTests-patients.xml"); 
    32         executeDataSet("org/openmrs/test/logic/include/LogicBasicTest.concepts.xml"); 
    33         authenticate(); 
     32        executeDataSet("org/openmrs/test/logic/include/LogicBasicTest.xml"); 
     33                executeDataSet("org/openmrs/test/logic/include/concepts.xml"); 
     34 
     35        authenticate(); 
    3436    } 
    3537 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/ObsDataSourceTest.java

    r4158 r5315  
    2424        initializeInMemoryDatabase(); 
    2525        executeDataSet("org/openmrs/test/logic/include/ObsDataSourceTest.xml"); 
    26         authenticate(); 
     26                executeDataSet("org/openmrs/test/logic/include/concepts.xml"); 
     27 
     28        authenticate(); 
    2729    } 
    2830 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/include/LogicBasicTest.xml

    r4752 r5315  
    11<?xml version='1.0' encoding='UTF-8'?> 
    22<dataset> 
    3   <concept concept_id="1" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" is_set="false" class_id="1" datatype_id="1" /> 
    4   <concept_name concept_name_id="1" concept_id="1" name="CD4 COUNT" locale="en" description="# of cd4 cells in the body" creator="1" date_created="2005-01-01 00:00:00.0"/> 
    5   <concept_class concept_class_id="1" name="Finding" description="A medical discovery" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/> 
    6   <concept_datatype concept_datatype_id="1" name="Numeric" hl7_abbreviation="NM" description="Numeric value, including integer or float" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/> 
    7    
    8   <concept concept_id="2" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" is_set="false" class_id="2" datatype_id="2" /> 
    9   <concept_name concept_name_id="2" concept_id="2" name="CURRENT ANTIRETROVIRAL DRUGS USED FOR TREATMENT" locale="en" description="Active meds" creator="1" date_created="2005-01-01 00:00:00.0"/> 
    10   <concept_class concept_class_id="2" name="Question" description="Question on a form" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/> 
    11   <concept_datatype concept_datatype_id="2" name="Coded" hl7_abbreviation="CWE" description="Coded answer" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/> 
    12    
    13   <concept concept_id="3" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" is_set="false" class_id="1" datatype_id="1" /> 
    14   <concept_name concept_name_id="3" concept_id="3" name="WEIGHT (KG)" locale="en" description="mass" creator="1" date_created="2005-01-01 00:00:00.0"/> 
    15    
     3 
    164  <!-- A cd4 count obs older than 6 months --> 
    175  <obs obs_id="1" person_id="2" concept_id="1" obs_datetime="2006-02-10 00:00:00.0" location_id="1" value_numeric="100" creator="1"  date_created="2006-02-11 15:57:35.0" voided="false"/> 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/include/LogicNTest.xml

    r5314 r5315  
    11<?xml version='1.0' encoding='UTF-8'?> 
    22<dataset> 
    3   <obs obs_id="22" person_id="9393" concept_id="1353" encounter_id="3" obs_datetime="2008-08-15 13:57:21.0" location_id="1" value_numeric="1.0" creator="1" date_created="2008-08-15 13:57:21.0" voided="false"/> 
    4   <obs obs_id="25" person_id="9393" concept_id="1353" encounter_id="3" obs_datetime="2008-08-15 14:03:18.0" location_id="1" value_numeric="2.0" creator="1" date_created="2008-08-15 14:03:18.0" voided="false"/> 
    5   <obs obs_id="28" person_id="9393" concept_id="1353" encounter_id="3" obs_datetime="2008-08-15 14:03:39.0" location_id="1" value_numeric="3.0" creator="1" date_created="2008-08-15 14:03:39.0" voided="false"/> 
     3  <obs obs_id="22" person_id="9393" concept_id="4" encounter_id="3" obs_datetime="2008-08-15 13:57:21.0" location_id="1" value_numeric="1.0" creator="1" date_created="2008-08-15 13:57:21.0" voided="false"/> 
     4  <obs obs_id="25" person_id="9393" concept_id="4" encounter_id="3" obs_datetime="2008-08-15 14:03:18.0" location_id="1" value_numeric="2.0" creator="1" date_created="2008-08-15 14:03:18.0" voided="false"/> 
     5  <obs obs_id="28" person_id="9393" concept_id="4" encounter_id="3" obs_datetime="2008-08-15 14:03:39.0" location_id="1" value_numeric="3.0" creator="1" date_created="2008-08-15 14:03:39.0" voided="false"/> 
    66  <encounter encounter_id="3" patient_id="9393" provider_id="9394" location_id="1" encounter_datetime="2008-04-04 09:09:00.0" creator="1" date_created="2008-08-01 09:21:39.0" voided="false" /> 
    77  
    …… 
    1414 
    1515  <location location_id="1" name="Test Location" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/> 
    16   <concept_class concept_class_id="7" name="Question" description="Question (eg, patient history, SF36 items)" creator="1" date_created="2004-03-02 00:00:00.0" retired="false"/> 
    17   <concept_datatype concept_datatype_id="1" name="Numeric" hl7_abbreviation="NM" description="Numeric value, including integer or float (e.g., creatinine, weight)" creator="1" date_created="2004-02-02 00:00:00.0" retired="false"/> 
    18   <concept concept_id="1353" retired="false" datatype_id="1" class_id="7" is_set="false" creator="1" date_created="2007-11-06 11:02:43.0" version="1" changed_by="1" date_changed="2008-01-03 14:12:30.0"/> 
    19   <concept_name concept_name_id="1" concept_id="1353" name="HEIGHT (IN)" short_name="" description="" locale="en" creator="1" date_created="2007-11-06 11:02:43.0"/> 
    20   <concept_numeric concept_id="1353" units="IN" precise="false"/> 
    21    
     16 
    2217</dataset> 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/include/LogicTests-patients.xml

    r5314 r5315  
    1414  <location location_id="1" name="Test Location" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/> 
    1515 
    16   <concept_class concept_class_id="7" name="Question" description="Question (eg, patient history, SF36 items)" creator="1" date_created="2004-03-02 00:00:00.0" retired="false"/> 
    17   <concept_datatype concept_datatype_id="1" name="Numeric" hl7_abbreviation="NM" description="Numeric value, including integer or float (e.g., creatinine, weight)" creator="1" date_created="2004-02-02 00:00:00.0" retired="false"/> 
    18   <concept_datatype concept_datatype_id="2" name="Coded" hl7_abbreviation="CE" description="Coded value" creator="1" date_created="2004-02-02 00:00:00.0" retired="false"/> 
    19    
    20   <concept concept_id="5497" retired="false" datatype_id="1" class_id="7" is_set="false" creator="1" date_created="2004-08-12 00:00:00.0" version="0.1" changed_by="1" date_changed="2006-06-09 14:57:33.0"/> 
    21   <concept_name concept_name_id="1" concept_id="5497" name="CD4 COUNT" description="Measure of CD4 (T-helper cells) in blood" locale="en" creator="1" date_created="2004-08-12 00:00:00.0"/> 
    22   <concept_numeric concept_id="5497" hi_normal="1497.0" low_critical="99.0" low_normal="445.0" units="cells/L" precise="false"/> 
    23  
    24   <concept concept_id="1354" retired="false" datatype_id="1" class_id="7" is_set="false" creator="1" date_created="2007-11-06 11:02:43.0" version="1" changed_by="1" date_changed="2008-01-03 14:12:30.0"/> 
    25   <concept_name concept_name_id="2" concept_id="1354" name="WEIGHT (KG)" short_name="" description="" locale="en" creator="1" date_created="2007-11-06 11:02:43.0"/> 
    26   <concept_numeric concept_id="1354"  precise="false"/> 
    27    
    28   <concept concept_id="1355" retired="false" datatype_id="2" class_id="7" is_set="false" creator="1" date_created="2007-11-06 11:02:43.0" version="1" changed_by="1" date_changed="2008-01-03 14:12:30.0"/> 
    29   <concept_name concept_name_id="4" concept_id="1355" name="CURRENT ANTIRETROVIRAL DRUGS USED FOR TREATMENT" short_name="" description="" locale="en" creator="1" date_created="2007-11-06 11:02:43.0"/> 
    30 </dataset> 
     16  </dataset> 

  • openmrs/branches/logic-api-refactoring/test/api/org/openmrs/test/logic/include/ObsDataSourceTest.xml

    r4752 r5315  
    11<?xml version='1.0' encoding='UTF-8'?> 
    22<dataset> 
    3   <concept_datatype concept_datatype_id="1" name="Numeric" hl7_abbreviation="NM" description="Numeric value, including integer or float" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" /> 
    4   <concept_class concept_class_id="1" name="Finding" description="A medical discovery" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" /> 
    5          
    6   <concept concept_id="1" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" is_set="false" datatype_id="1" class_id="1" /> 
    7   <concept_name concept_name_id="1" concept_id="1" name="CD4 COUNT" locale="en" description="cd4 count" creator="1" date_created="2005-01-01 00:00:00.0" /> 
    8    
     3  
    94  <encounter encounter_id="1" creator="1" encounter_datetime="2005-01-01 00:00:00.0" date_created="2005-02-01 00:00:00.0" patient_id="2" location_id="1" voided="false" /> 
    105  <encounter encounter_id="2" creator="1" encounter_datetime="2005-02-01 00:00:00.0" date_created="2005-03-01 00:00:00.0" patient_id="2" location_id="1" voided="false" />