Skip to content

Underscore values #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmcubel wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Underscore values #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68ffb0f
Added atlassian-3rdparty in order to resolve org.powermock.modules:po…
jmcubel Jul 17, 2017
f289f42
Set org.kohsuke:access-modifier-checker version to 1.4 so the project…
jmcubel Jul 17, 2017
11d3932
Added underscore (_) as a valid NONWORD token in metadata query search.
jmcubel Jul 18, 2017
2053756
javassist:javassist:jar:3.13.0.GA dependency is not available at any …
jmcubel Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powermock.version>1.4.5</powermock.version>
<javassist.version>3.13.0-GA</javassist.version>
</properties>

<repositories>
Expand All @@ -66,6 +67,10 @@
<id>powermock-repo</id>
<url>http://powermock.googlecode.com/svn/repo/</url>
</repository>
<repository>
<id>atlassian-3rdparty</id>
<url>https://maven.atlassian.com/3rdparty/</url>
</repository>
</repositories>

<dependencies>
Expand All @@ -92,7 +97,21 @@
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.powermock.api</groupId>
<artifactId>powermock-api-mockito</artifactId>
Expand Down Expand Up @@ -131,6 +150,11 @@
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-checker</artifactId>
<version>1.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
1 change: 1 addition & 0 deletions src/main/antlr3/com/sonyericsson/hudson/plugins/metadata/search/antlr/Query.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ NONWORD
|';'
|'?'
|'-'
|'_'
|'.'
|':'
)
Expand Down
30 changes: 30 additions & 0 deletions src/test/java/com/sonyericsson/hudson/plugins/metadata/search/MetadataQuerySearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,36 @@ public void testSearchEqualOperator() throws Exception {
itemList.add(tli2);
assertEquals(1, mqs.searchQuery(itemList).size());
}


/**
* Tests a search with Equal operator. Value contains underscore character
*
* @throws Exception if so.
*/
public void testSearchEqualOperatorWithUnderscores() throws Exception {
FreeStyleProject project = createFreeStyleProject("open");
FreeStyleProject project2 = createFreeStyleProject("secure");
List<MetadataValue> list = new LinkedList<MetadataValue>();
StringMetadataValue name = new StringMetadataValue("name", "description", "somc");
StringMetadataValue dept = new StringMetadataValue("dept", "description", "tool_1");
list.add(name);
list.add(dept);
MetadataJobProperty property = project.getProperty(MetadataJobProperty.class);
property.addChildren(list);
list = new LinkedList<MetadataValue>();
name = new StringMetadataValue("name", "description", "somc");
list.add(name);
MetadataJobProperty property2 = project2.getProperty(MetadataJobProperty.class);
property2.addChildren(list);
MetadataQuerySearch mqs = MetadataQuerySearch.parseQuery("dept=tool_1");
TopLevelItem tli1 = project;
TopLevelItem tli2 = project2;
List itemList = new ArrayList();
itemList.add(tli1);
itemList.add(tli2);
assertEquals(1, mqs.searchQuery(itemList).size());
}

/**
* Tests a search with Greater than or Equal to operator.
Expand Down