Produced by Araxis Merge on 7/20/2018 12:56:41 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\sync-git\src\test\java\gov\va\isaac\sync\git | GitBlitUtilsTest.java | Tue Jul 17 16:27:57 2018 UTC |
| 2 | CTT_Release_8_June_2018.zip\CTT_ISAAC\ISAAC\sync-git\src\test\java\gov\va\isaac\sync\git | GitBlitUtilsTest.java | Wed Jul 18 20:32:11 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 86 |
| Changed | 2 | 30 |
| 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 go v.va.isaac .sync.git; | |
| 20 | ||
| 21 | import org .junit.Ass ert; | |
| 22 | import org .junit.Tes t; | |
| 23 | import gov .va.isaac. sync.git.g itblit.Git BlitUtils; | |
| 24 | ||
| 25 | /** | |
| 26 | * {@link GitBlitUti lsTest} | |
| 27 | * | |
| 28 | * @author <a href=" mailto:dan iel.armbru st.list@gm ail.com">D an Armbrus t</a> | |
| 29 | */ | |
| 30 | public cla ss GitBlit UtilsTest | |
| 31 | { | |
| 32 | @T est | |
| 33 | pu blic void TestURLAdj ust() thro ws Excepti on | |
| 34 | { | |
| 35 | Assert.ass ertEquals( "https:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http s:// DNS : PORT /")); | |
| 36 | Assert.ass ertEquals( "https:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http s:// DNS : PORT ")); | |
| 37 | Assert.ass ertEquals( "http:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http :// DNS : PORT /")); | |
| 38 | Assert.ass ertEquals( "http:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http :// DNS : PORT ")); | |
| 39 | Assert.ass ertEquals( "https:// DNS /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http s:// DNS /")); | |
| 40 | Assert.ass ertEquals( "https:// DNS /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http s:// DNS ")); | |
| 41 | Assert.ass ertEquals( "https:// DNS /fred/", G itBlitUtil s.adjustBa reUrlForGi tBlit("htt ps:// DNS /fred")); | |
| 42 | Assert.ass ertEquals( "https:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http s:// DNS : PORT /git")); | |
| 43 | Assert.ass ertEquals( "https:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("http s:// DNS : PORT /git/")); | |
| 44 | Assert.ass ertEquals( "https:// DNS : PORT /fred/", G itBlitUtil s.adjustBa reUrlForGi tBlit("htt ps:// DNS : PORT /fred")); | |
| 45 | Assert.ass ertEquals( "https:// DNS : PORT /fred/", G itBlitUtil s.adjustBa reUrlForGi tBlit("htt ps:// DNS : PORT /fred/")); | |
| 46 | Assert.ass ertEquals( "HTtps:// DNS : PORT /git/", Gi tBlitUtils .adjustBar eUrlForGit Blit("HTtp s:// DNS : PORT /")); | |
| 47 | } | |
| 48 | ||
| 49 | @T est | |
| 50 | pu blic void TestBaseUR LParse() t hrows Exce ption | |
| 51 | { | |
| 52 | Assert.ass ertEquals( "https:// DNS : PORT /git/", Gi tBlitUtils .parseBase RemoteAddr ess("https :// DNS : PORT /git/r/db_ test.git") ); | |
| 53 | Assert.ass ertEquals( "https:// DNS : PORT /git/", Gi tBlitUtils .parseBase RemoteAddr ess("https :// DNS : PORT /git/r/db_ test.GIT") ); | |
| 54 | Assert.ass ertEquals( "Https:// DNS : PORT /git/", Gi tBlitUtils .parseBase RemoteAddr ess("Https :// DNS : PORT /git/r/db_ -test.git" )); | |
| 55 | } | |
| 56 | ||
| 57 | ||
| 58 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.