34. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/10/2017 1:01:43 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

34.1 Files compared

# Location File Last Modified
1 C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\CoreValueObjects\main\test\java\gov\va\med\imaging\exchange\business LoadDictionaryContentsTest.java Thu Jun 29 17:22:15 2017 UTC
2 C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\CoreValueObjects\main\test\java\gov\va\med\imaging\exchange\business LoadDictionaryContentsTest.java Thu Jul 6 15:00:24 2017 UTC

34.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 270
Changed 1 2
Inserted 0 0
Removed 0 0

34.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

34.4 Active regular expressions

No regular expressions were active.

34.5 Comparison detail

  1   /**
  2    * 
  3     Package:  MAG - Vis tA Imaging
  4     WARNING:  Per VHA D irective 2 004-038, t his routin e should n ot be modi fied.
  5     Date Cre ated: Augu st 24, 200 6
  6     Site Nam e:  Washin gton OI Fi eld Office , Silver S pring, MD
  7       Developer:          
PETRB
  8     Descript ion: 
  9  
  10           ;;  +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
  11           ;;  Property  of the US  Government .
  12           ;;  No permis sion to co py or redi stribute t his softwa re is give n.
  13           ;;  Use of un released v ersions of  this soft ware requi res the us er
  14           ;;   to execu te a writt en test ag reement wi th the Vis tA Imaging
  15           ;;   Developm ent Office  of the De partment o f Veterans  Affairs,
  16           ;;   telephon e (301) 73 4-0100.
  17           ;;
  18           ;;  The Food  and Drug A dministrat ion classi fies this  software a s
  19           ;;  a Class I I medical  device.  A s such, it  may not b e changed
  20           ;;  in any wa y.  Modifi cations to  this soft ware may r esult in a n
  21           ;;  adulterat ed medical  device un der 21CFR8 20, the us e of which
  22           ;;  is consid ered to be  a violati on of US F ederal Sta tutes.
  23           ;;  +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
  24    */
  25   package go v.va.med.i maging.exc hange.busi ness;
  26  
  27   import gov .va.med.im aging.exch ange.busin ess.dicom. DicomGatew ayConfigur ation;
  28   import gov .va.med.im aging.exch ange.busin ess.dicom. GatewayDic tionaryCon tents;
  29   import gov .va.med.im aging.exch ange.busin ess.dicom. ModalityDi cInfo;
  30   import gov .va.med.im aging.exch ange.busin ess.dicom. ParameterD eviceInfo;
  31   import gov .va.med.im aging.exch ange.busin ess.dicom. exceptions .DicomDict ionaryExce ption;
  32  
  33   import jav a.io.File;
  34   import jav a.util.Vec tor;
  35  
  36   /**
  37    *
  38    * @author  William P eterson
  39    *
  40    */
  41   public cla ss LoadDic tionaryCon tentsTest  extends Di comCommonT estBase {
  42  
  43           pr ivate Stri ng getRela tiveDictio naryFilena me(String  filename)
  44           {
  45                    Stri ng dicFile name = fil ename; 
  46                    File  dicFile =  new File( dicFilenam e);
  47                    if ( !dicFile.e xists())
  48                    {
  49                             // we  are runnin g from Ima gingExchan ge project 's buildal lspi.cmd f ile
  50                             dicFil ename = ". ./ImagingD icomCommon /" + filen ame; 
  51                             dicFil e = new Fi le(dicFile name);
  52                    }
  53                    retu rn dicFile name;
  54           }
  55  
  56       /*
  57        * @se e DicomCom monTestBas e#setUp()
  58        */
  59       protec ted void s etUp() thr ows Except ion {
  60           su per.setUp( );
  61       }
  62  
  63       /*
  64        * @se e DicomCom monTestBas e#tearDown ()
  65        */
  66       protec ted void t earDown()  throws Exc eption {
  67           su per.tearDo wn();
  68       }
  69  
  70       /**
  71        * Con structor f or LoadDic tionaryCon tentsTest.
  72        * @pa ram arg0
  73        */
  74       public  LoadDicti onaryConte ntsTest(St ring arg0)  {
  75           su per(arg0);
  76       }
  77       
  78       public  void test LoadingMod alityDICFi le(){
  79           St ring filen ame = getR elativeDic tionaryFil ename("Mod ality_test .dic");
  80           
  81           tr y{
  82                GatewayD ictionaryC ontents.ge tInstance( ).loadModa lityDictio naryList(f ilename);
  83                Vector<M odalityDic Info> moda lityList =  GatewayDi ctionaryCo ntents.get Instance() .getModali tyDictiona ryEntries( );
  84                //Iterat or i = mod alityList. iterator() ;
  85                //while( i.hasNext( )){
  86                //    Mo dalityDicI nfo lineEn try;
  87                //    li neEntry =  (ModalityD icInfo)i.n ext();
  88                //    TE STLOGGER.i nfo("Mfg:  "+lineEntr y.getManuf acturer()) ;
  89                //    TE STLOGGER.i nfo("Model : "+ lineE ntry.getMo del());
  90                //    TE STLOGGER.i nfo("Modal ity Code:  "+ lineEnt ry.getModa lityCode() +"\n");
  91                //}
  92                
  93                if(modal ityList.is Empty()){
  94                    fail ("Modality _test.dic  file is em pty.");
  95                }
  96                TESTLOGG ER.info("M odality_te st.dic con tains "+mo dalityList .size()+"  entries.") ;
  97           }
  98           ca tch (Dicom Dictionary Exception  dde){
  99                TESTLOGG ER.info("E xception t hrown.");
  100                TESTLOGG ER.info("F ailed load ing modali ty.dic fil e.");
  101                dde.prin tStackTrac e();
  102                fail("Fa iled loadi ng Modalit y_test.dic  file.\n") ;
  103           }
  104           TE STLOGGER.i nfo("Succe ssfully lo aded Modal ity_test.d ic file.\n ");
  105       }
  106       
  107       public  void test LoadingCTP armsDICFil e(){
  108           St ring filen ame = getR elativeDic tionaryFil ename("CT_ Param_test .dic");
  109           Di comGateway Configurat ion.getIns tance().se tLocation( "660");
  110           tr y{
  111                GatewayD ictionaryC ontents.ge tInstance( ).loadCTPa rameterLis t(filename );
  112                Vector<P arameterDe viceInfo>  parameterL ist = Gate wayDiction aryContent s.getInsta nce().getC TParameter sList();
  113                //Iterat or i = par ameterList .iterator( );
  114                //while( i.hasNext( )){
  115                //    Pa rameterDev iceInfo li neEntry;
  116                //    li neEntry =  (Parameter DeviceInfo )i.next();
  117                //    TE STLOGGER.i nfo("Site:  "+lineEnt ry.getSite ID());
  118                //    TE STLOGGER.i nfo("Mfg:  "+lineEntr y.getManuf acturer()) ;
  119                //    TE STLOGGER.i nfo("Model : "+ lineE ntry.getMo del());
  120                //    TE STLOGGER.i nfo("Date:  "+lineEnt ry.getChan geDate().t oString()+ "\n");
  121                //}
  122                
  123                if(param eterList.i sEmpty()){
  124                    fail ("CT_Param _test.dic  file is em pty.");
  125                }
  126                TESTLOGG ER.info("C T_Param_te st.dic con tains "+pa rameterLis t.size()+"  entries." );             
  127           }
  128           ca tch (Dicom Dictionary Exception  dde){
  129                TESTLOGG ER.info("E xception t hrown.");
  130                TESTLOGG ER.info("F ailed load ing CT_Par am_test.di c file.");
  131                dde.prin tStackTrac e();
  132                fail("Fa iled loadi ng CT_Para m_test.dic  file.\n") ;
  133           }
  134           TE STLOGGER.i nfo("Succe sfully loa ded CT_Par am_test.di c file.\n" );
  135       }    
  136   }

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.