Mercurial > hg > release > thermostat-0.13
changeset 179:2e2cb086b621
Merge
author | Roman Kennke <rkennke@redhat.com> |
---|---|
date | Fri, 30 Mar 2012 21:41:45 +0200 |
parents | cbc3b73ac685 (current diff) 7180587aed68 (diff) |
children | 4bced100ed3f 70bc509ad120 |
files | |
diffstat | 2 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/client/pom.xml Fri Mar 30 10:19:08 2012 -0400 +++ b/client/pom.xml Fri Mar 30 21:41:45 2012 +0200 @@ -70,12 +70,6 @@ <version>1.2.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-common</artifactId>
--- a/client/src/test/java/com/redhat/thermostat/client/ui/MainWindowTest.java Fri Mar 30 10:19:08 2012 -0400 +++ b/client/src/test/java/com/redhat/thermostat/client/ui/MainWindowTest.java Fri Mar 30 21:41:45 2012 +0200 @@ -43,8 +43,8 @@ import static org.mockito.Mockito.when; import java.beans.PropertyChangeEvent; +import java.util.Objects; -import org.apache.commons.lang3.ObjectUtils; import org.fest.swing.edt.GuiActionRunner; import org.fest.swing.edt.GuiTask; import org.fest.swing.fixture.FrameFixture; @@ -78,9 +78,9 @@ public boolean matches(Object argument) { PropertyChangeEvent other = (PropertyChangeEvent) argument; return event.getSource() == other.getSource() - && ObjectUtils.equals(event.getPropertyName(), other.getPropertyName()) - && ObjectUtils.equals(event.getNewValue(), other.getNewValue()) - && ObjectUtils.equals(event.getOldValue(), other.getOldValue()); + && Objects.equals(event.getPropertyName(), other.getPropertyName()) + && Objects.equals(event.getNewValue(), other.getNewValue()) + && Objects.equals(event.getOldValue(), other.getOldValue()); } @Override