Commit e9d6601

author

Federico Fissore

committed

Windows: reg query uses different separators on xp, fooling parser. Fixed

1 parent 3c98275 commit e9d6601Copy full SHA for e9d6601

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,17 @@ public void testRegQueryParser2() throws Exception {`
`26`	`26`	`String folderPath = new RegQueryParser(output).getValueOfKey();`
`27`	`27`	`assertEquals("C:\\Users\\username\\AppData\\Local", folderPath);`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ @Test`
	`31`	`+ public void testRegQueryParserXP() throws Exception {`
	`32`	`+ String output = "! REG.EXE VERSION 3.0\n" +`
	`33`	`+ "\n" +`
	`34`	`+ "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\n" +`
	`35`	`+ "\n" +`
	`36`	`+ "\tLocal AppData REG_SZ C:\\Documents and Settings\\username\\My Documents";`
	`37`	`+`
	`38`	`+ String folderPath = new RegQueryParser(output).getValueOfKey();`
	`39`	`+ assertEquals("C:\\Documents and Settings\\username\\My Documents", folderPath);`
	`40`	`+ }`
	`41`	`+`
`29`	`42`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,16 @@ public RegQueryParser(String regQueryOutput) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`private void parse(String regQueryOutput) {`
`18`		`- List<String> rows = Arrays.asList(regQueryOutput.replace("\r", "\n").replace("\n\n", "\n").split("\n"));`
	`18`	`+ List<String> rows = Arrays.asList(regQueryOutput.replace(" ", "\t").replace("\r", "\n").replace("\n\n", "\n").split("\n"));`
`19`	`19`
`20`	`20`	`String row = Iterables.find(rows, new Predicate<String>() {`
`21`	`21`	`@Override`
`22`	`22`	`public boolean apply(String input) {`
`23`		`- return input.startsWith("");`
	`23`	`+ return input.startsWith("\t");`
`24`	`24`	`}`
`25`	`25`	`});`
`26`	`26`
`27`		`- String[] cols = row.split("");`
	`27`	`+ String[] cols = row.split("\t");`
`28`	`28`	`assert cols.length == 4;`
`29`	`29`	`this.valueOfKey = cols[3];`
`30`	`30`	`}`

Comments

(0)