Attachment #106713 for bug #189359

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 189359
Collapse All | Expand All

Lines 666-672 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/PhpUnit.java (-1 / +1 lines)
666		666
667	static final class OutputProcessorFactory implements ExecutionDescriptor.InputProcessorFactory {	667	static final class OutputProcessorFactory implements ExecutionDescriptor.InputProcessorFactory {
668	// PHPUnit 3.3.1 by Sebastian Bergmann.	668	// PHPUnit 3.3.1 by Sebastian Bergmann.
669	private static final Pattern PHPUNIT_VERSION = Pattern.compile("PHPUnit\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\s+"); // NOI18N	669	private static final Pattern PHPUNIT_VERSION = Pattern.compile("PHPUnit\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\w*\\s+"); // NOI18N
670		670
671	@Override	671	@Override
672	public InputProcessor newInputProcessor(final InputProcessor defaultProcessor) {	672	public InputProcessor newInputProcessor(final InputProcessor defaultProcessor) {

Lines 74-81 Link Here

(-)a/php.project/test/unit/src/org/netbeans/modules/php/project/phpunit/PhpUnitTest.java (-2 / +3 lines)
74	version = PhpUnit.OutputProcessorFactory.match("PHPUnit 3.3x.1 by Sebastian Bergmann.");	74	version = PhpUnit.OutputProcessorFactory.match("PHPUnit 3.3x.1 by Sebastian Bergmann.");
75	assertNull(version);	75	assertNull(version);
76		76
77	version = PhpUnit.OutputProcessorFactory.match("PHPUnit 3.3.1a by Sebastian Bergmann.");	77	version = PhpUnit.OutputProcessorFactory.match("PHPUnit 3.3.1RC by Sebastian Bergmann.");
78	assertNull(version);	78	assertNotNull(version);
		79	assertTrue(Arrays.equals(new int[] {3, 3, 1}, version));
79		80
80	version = PhpUnit.OutputProcessorFactory.match("PHPUnit 3.3.1 by Sebastian Bergmann.");	81	version = PhpUnit.OutputProcessorFactory.match("PHPUnit 3.3.1 by Sebastian Bergmann.");
81	assertNotNull(version);	82	assertNotNull(version);

Return to bug 189359