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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\CoreValueObjects\main\test\java\gov\va\med\imaging\exchange\business | DicomCommonTestBase.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 | DicomCommonTestBase.java | Thu Jul 6 15:00:22 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 154 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 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:
|
|
| 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 jun it.framewo rk.TestCas e; | |
| 28 | ||
| 29 | import org .apache.lo g4j.Consol eAppender; | |
| 30 | import org .apache.lo g4j.Level; | |
| 31 | import org .apache.lo g4j.LogMan ager; | |
| 32 | import org .apache.lo g4j.Logger ; | |
| 33 | import org .apache.lo g4j.Patter nLayout; | |
| 34 | ||
| 35 | /** | |
| 36 | * | |
| 37 | * @author William P eterson | |
| 38 | * | |
| 39 | */ | |
| 40 | public cla ss DicomCo mmonTestBa se extends TestCase { | |
| 41 | ||
| 42 | public static Lo gger TESTL OGGER = Lo gManager.g etLogger(" JUNIT_TEST "); | |
| 43 | public static Lo gger logge r = LogMan ager.getLo gger(Dicom CommonTest Base.class ); | |
| 44 | public static Co nsoleAppen der append er; | |
| 45 | ||
| 46 | ||
| 47 | /* | |
| 48 | * @se e TestCase #setUp() | |
| 49 | */ | |
| 50 | protec ted void s etUp() thr ows Except ion { | |
| 51 | su per.setUp( ); | |
| 52 | ||
| 53 | ap pender = n ew Console Appender(n ew Pattern Layout()); | |
| 54 | TE STLOGGER.a ddAppender (appender) ; | |
| 55 | TE STLOGGER.s etLevel(Le vel.INFO); | |
| 56 | lo gger.addAp pender(app ender); | |
| 57 | lo gger.setLe vel(Level. ERROR); | |
| 58 | } | |
| 59 | ||
| 60 | /* | |
| 61 | * @se e TestCase #tearDown( ) | |
| 62 | */ | |
| 63 | protec ted void t earDown() throws Exc eption { | |
| 64 | su per.tearDo wn(); | |
| 65 | TE STLOGGER.r emoveAllAp penders(); | |
| 66 | Lo gManager.s hutdown(); | |
| 67 | ||
| 68 | } | |
| 69 | ||
| 70 | /** | |
| 71 | * Con structor f or DicomCo mmonTestBa se. | |
| 72 | * @pa ram arg0 | |
| 73 | */ | |
| 74 | public DicomComm onTestBase (String ar g0) { | |
| 75 | su per(arg0); | |
| 76 | } | |
| 77 | ||
| 78 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.