Produced by Araxis Merge on 7/20/2018 12:56:40 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 | CTT_Release_8_June_2018.zip\CTT_ISAAC\ISAAC\db-config-builder\src\test\java\test | ConverterOptionParamTest.java | Tue Jul 17 16:27:36 2018 UTC |
| 2 | CTT_Release_8_June_2018.zip\CTT_ISAAC\ISAAC\db-config-builder\src\test\java\test | ConverterOptionParamTest.java | Wed Jul 18 19:12:37 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 118 |
| Changed | 1 | 18 |
| 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 | * Copyrig ht Notice | |
| 3 | * | |
| 4 | * This is a work of the U.S. Government and is no t subject to copyrig ht | |
| 5 | * protect ion in the United St ates. Fore ign copyri ghts may a pply. | |
| 6 | * | |
| 7 | * License d under th e Apache L icense, Ve rsion 2.0 (the "Lice nse"); | |
| 8 | * you may not use t his file e xcept in c ompliance with the L icense. | |
| 9 | * You may obtain a copy of th e License at | |
| 10 | * | |
| 11 | * http:// www.apache .org/licen ses/LICENS E-2.0 | |
| 12 | * | |
| 13 | * Unless required b y applicab le law or agreed to in writing , software | |
| 14 | * distrib uted under the Licen se is dist ributed on an "AS IS " BASIS, | |
| 15 | * WITHOUT WARRANTIE S OR CONDI TIONS OF A NY KIND, e ither expr ess or imp lied. | |
| 16 | * See the License f or the spe cific lang uage gover ning permi ssions and | |
| 17 | * limitat ions under the Licen se. | |
| 18 | */ | |
| 19 | package te st; | |
| 20 | ||
| 21 | import jav a.io.File; | |
| 22 | import jav a.io.IOExc eption; | |
| 23 | import org .junit.Ass ert; | |
| 24 | import org .junit.Tes t; | |
| 25 | import gov .vha.isaac .ochre.pom builder.Gi tPublish; | |
| 26 | import gov .vha.isaac .ochre.pom builder.co nverter.Co nverterOpt ionParam; | |
| 27 | import gov .vha.isaac .ochre.pom builder.co nverter.Co nverterOpt ionParamSu ggestedVal ue; | |
| 28 | ||
| 29 | /** | |
| 30 | * {@link ConverterO ptionParam Test} | |
| 31 | * | |
| 32 | * @author <a href=" mailto:dan iel.armbru st.list@gm ail.com">D an Armbrus t</a> | |
| 33 | */ | |
| 34 | public cla ss Convert erOptionPa ramTest | |
| 35 | { | |
| 36 | @T est | |
| 37 | pu blic void testJson() throws Ex ception | |
| 38 | { | |
| 39 | Conv erterOptio nParam foo = new Con verterOpti onParam("c c", "a", " b", true, true, new ConverterO ptionParam SuggestedV alue("e", "e1"), | |
| 40 | new Conv erterOptio nParamSugg estedValue ("f")); | |
| 41 | Asse rt.assertE quals("e", foo.getSu ggestedPic kListValue s()[0].get Value()); | |
| 42 | Asse rt.assertE quals("e1" , foo.getS uggestedPi ckListValu es()[0].ge tDescripti on()); | |
| 43 | Asse rt.assertE quals("f", foo.getSu ggestedPic kListValue s()[1].get Value()); | |
| 44 | Asse rt.assertE quals("f", foo.getSu ggestedPic kListValue s()[1].get Descriptio n()); | |
| 45 | Conv erterOptio nParam foo 2 = new Co nverterOpt ionParam(" 33", "1", "2", true, false, ne w Converte rOptionPar amSuggeste dValue("3" , "31"), | |
| 46 | new Conv erterOptio nParamSugg estedValue ("4", "41" )); | |
| 47 | Conv erterOptio nParam.ser ialize(new Converter OptionPara m[] { foo, foo2 }, n ew File("f oo.json")) ; | |
| 48 | ||
| 49 | Conv erterOptio nParam[] f oo3 = Conv erterOptio nParam.fro mFile(new File("foo. json")); | |
| 50 | Asse rt.assertE quals(foo3 [0], foo); | |
| 51 | Asse rt.assertE quals(foo3 [1], foo2) ; | |
| 52 | new File("foo. json").del ete(); | |
| 53 | } | |
| 54 | ||
| 55 | @T est | |
| 56 | pu blic void testChange setURLRewr ite() thro ws IOExcep tion | |
| 57 | { | |
| 58 | Assert.ass ertEquals( "https:// DNS : PORT /git/r/con tentConfig urations.g it", | |
| 59 | GitPublish .construct ChangesetR epositoryU RL("https: // DNS : PORT /git/")); | |
| 60 | Assert.ass ertEquals( "https:// DNS : PORT /git/r/con tentConfig urations.g it", | |
| 61 | GitPublish .construct ChangesetR epositoryU RL("https: // DNS : PORT /git")); | |
| 62 | Assert.ass ertEquals( "http:// DNS : PORT /git/r/con tentConfig urations.g it", | |
| 63 | GitPublish .construct ChangesetR epositoryU RL("http:/ / DNS : PORT /git/")); | |
| 64 | Assert.ass ertEquals( "https:// DNS : PORT /git/r/con tentConfig urations.g it", | |
| 65 | GitPublish .construct ChangesetR epositoryU RL("https: // DNS : PORT /git/r/con tentConfig urations.g it")); | |
| 66 | Assert.ass ertEquals( "https:// DNS : PORT /git/r/foo .git", Git Publish.co nstructCha ngesetRepo sitoryURL( "https:// DNS : PORT /git/r/foo .git")); | |
| 67 | } | |
| 68 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.