Code cleanup.
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_isDefaultValueOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_isDefaultValueOption_Test.java
index a0e4b81..6ae600f 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_isDefaultValueOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_isDefaultValueOption_Test.java
@@ -10,14 +10,13 @@
import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import com.google.eclipse.protobuf.junit.core.XtextRule;
-import com.google.eclipse.protobuf.protobuf.*;
+import static org.junit.Assert.*;
import org.junit.*;
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.protobuf.FieldOption;
+
/**
* Tests for <code>{@link FieldOptions#isDefaultValueOption(FieldOption)}</code>.
*
@@ -38,8 +37,7 @@
// }
@Test public void should_return_true_if_FieldOption_is_default_value_one() {
FieldOption option = xtext.find("default", FieldOption.class);
- boolean result = fieldOptions.isDefaultValueOption(option);
- assertThat(result, equalTo(true));
+ assertTrue(fieldOptions.isDefaultValueOption(option));
}
// message Person {
@@ -47,7 +45,6 @@
// }
@Test public void should_return_false_if_FieldOption_is_not_default_value_one() {
FieldOption option = xtext.find("deprecated", FieldOption.class);
- boolean result = fieldOptions.isDefaultValueOption(option);
- assertThat(result, equalTo(false));
+ assertFalse(fieldOptions.isDefaultValueOption(option));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue148_FixDuplicateNameError_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue148_FixDuplicateNameError_Test.java
index 79c99ee..f9bc489 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue148_FixDuplicateNameError_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue148_FixDuplicateNameError_Test.java
@@ -10,15 +10,14 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import com.google.eclipse.protobuf.junit.core.XtextRule;
-import com.google.eclipse.protobuf.validation.ProtobufJavaValidator;
+import static org.junit.Assert.assertTrue;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.junit.*;
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.validation.ProtobufJavaValidator;
+
/**
* Tests fix for <a href="http://code.google.com/p/protobuf-dt/issues/detail?id=91">Issue 91</a>.
*
@@ -39,6 +38,6 @@
// message abc {}
@Test public void should_allow_elements_of_different_types_have_same_name() {
boolean isValid = validator.validate(xtext.root(), new BasicDiagnostic(), null);
- assertThat(isValid, equalTo(true));
+ assertTrue(isValid);
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_hasValue_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_hasValue_Test.java
index 4062a60..5ea16b3 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_hasValue_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_hasValue_Test.java
@@ -9,8 +9,7 @@
package com.google.eclipse.protobuf.grammar;
import static com.google.eclipse.protobuf.grammar.CommonKeyword.*;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.junit.Test;
@@ -22,22 +21,21 @@
public class CommonKeyword_hasValue_Test {
@Test public void should_return_true_if_value_is_equal_to_String() {
- assertThat(BOOL.hasValue("bool"), equalTo(true));
- assertThat(TRUE.hasValue("true"), equalTo(true));
- assertThat(FALSE.hasValue("false"), equalTo(true));
- assertThat(BYTES.hasValue("bytes"), equalTo(true));
- assertThat(OPENING_BRACKET.hasValue("["), equalTo(true));
- assertThat(CLOSING_BRACKET.hasValue("]"), equalTo(true));
- assertThat(OPENING_CURLY_BRACKET.hasValue("{"), equalTo(true));
- assertThat(CLOSING_CURLY_BRACKET.hasValue("}"), equalTo(true));
- assertThat(DEFAULT.hasValue("default"), equalTo(true));
- assertThat(EQUAL.hasValue("="), equalTo(true));
- assertThat(SEMICOLON.hasValue(";"), equalTo(true));
- assertThat(STRING.hasValue("string"), equalTo(true));
+ assertTrue(BOOL.hasValue("bool"));
+ assertTrue(TRUE.hasValue("true"));
+ assertTrue(FALSE.hasValue("false"));
+ assertTrue(BYTES.hasValue("bytes"));
+ assertTrue(OPENING_BRACKET.hasValue("["));
+ assertTrue(CLOSING_BRACKET.hasValue("]"));
+ assertTrue(OPENING_CURLY_BRACKET.hasValue("{"));
+ assertTrue(CLOSING_CURLY_BRACKET.hasValue("}"));
+ assertTrue(DEFAULT.hasValue("default"));
+ assertTrue(EQUAL.hasValue("="));
+ assertTrue(SEMICOLON.hasValue(";"));
+ assertTrue(STRING.hasValue("string"));
}
@Test public void should_return_false_if_value_is_not_equal_to_String() {
- assertThat(STRING.hasValue(";"), equalTo(false));
+ assertFalse(STRING.hasValue(";"));
}
-
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/GeneratedProtoFiles.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/GeneratedProtoFiles.java
index bed18ac..0980053 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/GeneratedProtoFiles.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/GeneratedProtoFiles.java
@@ -9,8 +9,7 @@
package com.google.eclipse.protobuf.junit.core;
import static java.io.File.separator;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import java.io.File;
@@ -28,7 +27,7 @@
static void ensureParentDirectoryExists() {
File parent = new File(PARENT_DIRECTORY_NAME);
if (!parent.isDirectory()) {
- assertThat(parent.mkdir(), equalTo(true));
+ assertTrue(parent.mkdir());
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToCommentOrString_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToCommentOrString_Test.java
index bc97c43..e3b60f6 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToCommentOrString_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToCommentOrString_Test.java
@@ -11,8 +11,7 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.eclipse.xtext.nodemodel.*;
import org.junit.*;
@@ -38,14 +37,14 @@
// message Person {}
@Test public void should_return_true_if_node_belongs_to_single_line_comment() {
ILeafNode commentNode = xtext.find("// This is a test.");
- assertThat(nodes.belongsToCommentOrString(commentNode), equalTo(true));
+ assertTrue(nodes.belongsToCommentOrString(commentNode));
}
// /* This is a test. */
// message Person {}
@Test public void should_return_true_if_node_belongs_to_multiple_line_comment() {
ILeafNode commentNode = xtext.find("/* This is a test. */");
- assertThat(nodes.belongsToCommentOrString(commentNode), equalTo(true));
+ assertTrue(nodes.belongsToCommentOrString(commentNode));
}
// message Person {
@@ -53,12 +52,12 @@
// }
@Test public void should_return_true_if_node_belongs_to_string() {
ILeafNode node = xtext.find("'Alex'");
- assertThat(nodes.belongsToCommentOrString(node), equalTo(true));
+ assertTrue(nodes.belongsToCommentOrString(node));
}
// message Person {}
@Test public void should_return_false_if_node_does_not_belong_to_any_comment_or_string() {
ICompositeNode node = getNode(xtext.root());
- assertThat(nodes.belongsToCommentOrString(node), equalTo(false));
+ assertFalse(nodes.belongsToCommentOrString(node));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToComment_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToComment_Test.java
index 34279ca..6b8d178 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToComment_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToComment_Test.java
@@ -11,8 +11,7 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.eclipse.xtext.nodemodel.*;
import org.junit.*;
@@ -38,19 +37,19 @@
// message Person {}
@Test public void should_return_true_if_node_belongs_to_single_line_comment() {
ILeafNode commentNode = xtext.find("// This is a test.");
- assertThat(nodes.belongsToComment(commentNode), equalTo(true));
+ assertTrue(nodes.belongsToComment(commentNode));
}
// /* This is a test. */
// message Person {}
@Test public void should_return_true_if_node_belongs_to_multiple_line_comment() {
ILeafNode commentNode = xtext.find("/* This is a test. */");
- assertThat(nodes.belongsToComment(commentNode), equalTo(true));
+ assertTrue(nodes.belongsToComment(commentNode));
}
// message Person {}
@Test public void should_return_false_if_node_does_not_belong_to_any_comment() {
ICompositeNode node = getNode(xtext.root());
- assertThat(nodes.belongsToComment(node), equalTo(false));
+ assertFalse(nodes.belongsToComment(node));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToMultipleLineComment_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToMultipleLineComment_Test.java
index dd19efe..c948855 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToMultipleLineComment_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToMultipleLineComment_Test.java
@@ -11,8 +11,7 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.eclipse.xtext.nodemodel.*;
import org.junit.*;
@@ -38,12 +37,12 @@
// message Person {}
@Test public void should_return_true_if_node_belongs_to_multiple_line_comment() {
ILeafNode commentNode = xtext.find("/* This is a test. */");
- assertThat(nodes.belongsToMultipleLineComment(commentNode), equalTo(true));
+ assertTrue(nodes.belongsToMultipleLineComment(commentNode));
}
// message Person {}
@Test public void should_return_false_if_node_does_not_belong_to_single_line_comment() {
ICompositeNode node = getNode(xtext.root());
- assertThat(nodes.belongsToMultipleLineComment(node), equalTo(false));
+ assertFalse(nodes.belongsToMultipleLineComment(node));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToSingleLineComment_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToSingleLineComment_Test.java
index 27bf92f..1f715a0 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToSingleLineComment_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToSingleLineComment_Test.java
@@ -11,8 +11,7 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.eclipse.xtext.nodemodel.*;
import org.junit.*;
@@ -38,12 +37,12 @@
// message Person {}
@Test public void should_return_true_if_node_belongs_to_single_line_comment() {
ILeafNode commentNode = xtext.find("// This is a test.");
- assertThat(nodes.belongsToSingleLineComment(commentNode), equalTo(true));
+ assertTrue(nodes.belongsToSingleLineComment(commentNode));
}
// message Person {}
@Test public void should_return_false_if_node_does_not_belong_to_single_line_comment() {
ICompositeNode node = getNode(xtext.root());
- assertThat(nodes.belongsToSingleLineComment(node), equalTo(false));
+ assertFalse(nodes.belongsToSingleLineComment(node));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToString_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToString_Test.java
index d7a95e6..c519fae 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToString_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_belongsToString_Test.java
@@ -11,8 +11,7 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.eclipse.xtext.nodemodel.*;
import org.junit.*;
@@ -39,12 +38,12 @@
// }
@Test public void should_return_true_if_node_belongs_to_string() {
ILeafNode node = xtext.find("'Alex'");
- assertThat(nodes.belongsToString(node), equalTo(true));
+ assertTrue(nodes.belongsToString(node));
}
// message Person {}
@Test public void should_return_false_if_node_does_not_belong_to_string() {
ICompositeNode node = getNode(xtext.root());
- assertThat(nodes.belongsToString(node), equalTo(false));
+ assertFalse(nodes.belongsToString(node));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_isHiddenLeafNode_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_isHiddenLeafNode_Test.java
index a500533..80993ed 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_isHiddenLeafNode_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_isHiddenLeafNode_Test.java
@@ -8,8 +8,7 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import org.eclipse.xtext.nodemodel.*;
@@ -31,16 +30,17 @@
@Test public void should_return_true_if_given_node_is_an_ILeafNode_and_is_hidden() {
ILeafNode node = mock(ILeafNode.class);
when(node.isHidden()).thenReturn(true);
- assertThat(nodes.isHiddenLeafNode(node), equalTo(true));
+ assertTrue(nodes.isHiddenLeafNode(node));
}
@Test public void should_return_false_if_given_node_is_an_ILeafNode_but_is_not_hidden() {
ILeafNode node = mock(ILeafNode.class);
when(node.isHidden()).thenReturn(false);
- assertThat(nodes.isHiddenLeafNode(node), equalTo(false));
+ assertFalse(nodes.isHiddenLeafNode(node));
}
@Test public void should_return_false_if_given_node_is_not_an_ILeafNode() {
- assertThat(nodes.isHiddenLeafNode(mock(INode.class)), equalTo(false));
+ INode node = mock(INode.class);
+ assertFalse(nodes.isHiddenLeafNode(node));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java
index 145ecd4..bfb904d 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java
@@ -8,13 +8,11 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
import org.junit.*;
-import com.google.eclipse.protobuf.junit.stubs.protobuf.PackageStub;
-import com.google.eclipse.protobuf.model.util.Packages;
import com.google.eclipse.protobuf.protobuf.Package;
/**
@@ -44,37 +42,37 @@
"may.the",
"may"
};
- p1 = new PackageStub(baseName);
- p2 = new PackageStub();
+ p1 = mock(Package.class);
+ when(p1.getName()).thenReturn(baseName);
+ p2 = mock(Package.class);
}
@Test public void should_return_true_if_packages_are_equal() {
- p2.setName(p1.getName());
- assertThat(packages.areRelated(p1, p2), equalTo(true));
+ when(p2.getName()).thenReturn(baseName);
+ assertTrue(packages.areRelated(p1, p2));
}
@Test public void should_return_true_second_is_subPackage_of_first() {
for (String name : subpackageNames) {
- p2.setName(name);
- assertThat(packages.areRelated(p1, p2), equalTo(true));
+ when(p2.getName()).thenReturn(name);
+ assertTrue(packages.areRelated(p1, p2));
}
}
@Test public void should_return_true_first_is_subPackage_of_second() {
- p2.setName(baseName);
for (String name : subpackageNames) {
- p1.setName(name);
- assertThat(packages.areRelated(p1, p2), equalTo(true));
+ when(p2.getName()).thenReturn(name);
+ assertTrue(packages.areRelated(p2, p1));
}
}
@Test public void should_return_false_if_second_starts_with_few_segments_of_first_but_is_not_subpackage() {
- p2.setName("may.the.ring");
- assertThat(packages.areRelated(p1, p2), equalTo(false));
+ when(p2.getName()).thenReturn("may.the.ring");
+ assertFalse(packages.areRelated(p1, p2));
}
@Test public void should_return_false_if_names_are_completely_different() {
- p2.setName("peace.dog");
- assertThat(packages.areRelated(p1, p2), equalTo(false));
+ when(p2.getName()).thenReturn("peace.dog");
+ assertFalse(packages.areRelated(p1, p2));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isBool_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isBool_Test.java
index 7bb8e3d..0bb5a02 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isBool_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isBool_Test.java
@@ -10,14 +10,13 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import com.google.eclipse.protobuf.junit.core.XtextRule;
-import com.google.eclipse.protobuf.protobuf.*;
+import static org.junit.Assert.*;
import org.junit.*;
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.protobuf.Property;
+
/**
* Tests for <code>{@link Properties#isBool(Property)}</code>.
*
@@ -34,18 +33,18 @@
}
// message Person {
- // optional bool active = 1;
+ // optional bool code = 1;
// }
@Test public void should_return_true_if_property_is_bool() {
- Property active = xtext.find("active", Property.class);
- assertThat(properties.isBool(active), equalTo(true));
+ Property p = xtext.find("code", Property.class);
+ assertTrue(properties.isBool(p));
}
// message Person {
// optional string name = 1;
// }
@Test public void should_return_false_if_property_is_not_bool() {
- Property name = xtext.find("name", Property.class);
- assertThat(properties.isBool(name), equalTo(false));
+ Property p = xtext.find("name", Property.class);
+ assertFalse(properties.isBool(p));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isPrimitive_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isPrimitive_Test.java
index 0c7cd73..2e9a180 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isPrimitive_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isPrimitive_Test.java
@@ -11,14 +11,13 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
import static org.eclipse.xtext.EcoreUtil2.getAllContentsOfType;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import com.google.eclipse.protobuf.junit.core.XtextRule;
-import com.google.eclipse.protobuf.protobuf.*;
+import static org.junit.Assert.*;
import org.junit.*;
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.protobuf.Property;
+
/**
* Tests for <code>{@link Properties#isPrimitive(Property)}</code>.
*
@@ -48,7 +47,7 @@
// }
@Test public void should_return_true_if_property_is_primitive() {
for (Property p : getAllContentsOfType(xtext.root(), Property.class))
- assertThat(properties.isPrimitive(p), equalTo(true));
+ assertTrue(properties.isPrimitive(p));
}
// message Types {
@@ -62,6 +61,6 @@
// }
@Test public void should_return_false_if_property_is_not_primitive() {
for (Property p : getAllContentsOfType(xtext.root(), Property.class))
- assertThat(properties.isPrimitive(p), equalTo(false));
+ assertFalse(properties.isPrimitive(p));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isString_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isString_Test.java
index 4086f33..95388ef 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isString_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Properties_isString_Test.java
@@ -10,14 +10,13 @@
import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import com.google.eclipse.protobuf.junit.core.XtextRule;
-import com.google.eclipse.protobuf.protobuf.*;
+import static org.junit.Assert.*;
import org.junit.*;
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.protobuf.Property;
+
/**
* Tests for <code>{@link Properties#isString(Property)}</code>.
*
@@ -37,15 +36,15 @@
// optional string name = 1;
// }
@Test public void should_return_true_if_property_is_string() {
- Property name = xtext.find("name", Property.class);
- assertThat(properties.isString(name), equalTo(true));
+ Property p = xtext.find("name", Property.class);
+ assertTrue(properties.isString(p));
}
// message Person {
- // optional bool active = 1;
+ // optional double code = 1;
// }
@Test public void should_return_false_if_property_is_not_string() {
- Property active = xtext.find("active", Property.class);
- assertThat(properties.isString(active), equalTo(false));
+ Property p = xtext.find("code", Property.class);
+ assertFalse(properties.isString(p));
}
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/util/Closeables_closeQuietly_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/util/Closeables_closeQuietly_Test.java
index 7f3c153..781fdb0 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/util/Closeables_closeQuietly_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/util/Closeables_closeQuietly_Test.java
@@ -8,8 +8,7 @@
*/
package com.google.eclipse.protobuf.util;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.io.*;
@@ -30,20 +29,17 @@
}
@Test public void should_ignore_null_Closeable() {
- boolean result = Closeables.closeQuietly(null);
- assertThat(result, equalTo(false));
+ assertFalse(Closeables.closeQuietly(null));
}
@Test public void should_close_Closeable() throws IOException {
- boolean result = Closeables.closeQuietly(closeable);
+ assertTrue(Closeables.closeQuietly(closeable));
verify(closeable).close();
- assertThat(result, equalTo(true));
}
@Test public void should_ignore_exceptions_thrown_when_closing_Closeable() throws IOException {
doThrow(new RuntimeException()).when(closeable).close();
- boolean result = Closeables.closeQuietly(closeable);
+ assertTrue(Closeables.closeQuietly(closeable));
verify(closeable).close();
- assertThat(result, equalTo(true));
}
}
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_hasValue_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_hasValue_Test.java
index eca3df3..81c198c 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_hasValue_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_hasValue_Test.java
@@ -9,8 +9,7 @@
package com.google.eclipse.protobuf.ui.grammar;
import static com.google.eclipse.protobuf.ui.grammar.CompoundElement.*;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.junit.Test;
@@ -22,14 +21,14 @@
public class CompoundElement_hasValue_Test {
@Test public void should_return_true_if_value_is_equal_to_String() {
- assertThat(DEFAULT_EQUAL.hasValue("default = "), equalTo(true));
- assertThat(DEFAULT_EQUAL_IN_BRACKETS.hasValue("[default = ]"), equalTo(true));
- assertThat(EMPTY_STRING.hasValue("\"\""), equalTo(true));
- assertThat(DEFAULT_EQUAL_STRING.hasValue("default = \"\""), equalTo(true));
- assertThat(DEFAULT_EQUAL_STRING_IN_BRACKETS.hasValue("[default = \"\"]"), equalTo(true));
+ assertTrue(DEFAULT_EQUAL.hasValue("default = "));
+ assertTrue(DEFAULT_EQUAL_IN_BRACKETS.hasValue("[default = ]"));
+ assertTrue(EMPTY_STRING.hasValue("\"\""));
+ assertTrue(DEFAULT_EQUAL_STRING.hasValue("default = \"\""));
+ assertTrue(DEFAULT_EQUAL_STRING_IN_BRACKETS.hasValue("[default = \"\"]"));
}
@Test public void should_return_false_if_value_is_not_equal_to_String() {
- assertThat(DEFAULT_EQUAL.hasValue("packed ="), equalTo(false));
+ assertFalse(DEFAULT_EQUAL.hasValue("packed ="));
}
}
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/BooleanPreference_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/BooleanPreference_Test.java
index a24871a..f349712 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/BooleanPreference_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/BooleanPreference_Test.java
@@ -8,8 +8,7 @@
*/
package com.google.eclipse.protobuf.ui.preferences;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -35,13 +34,13 @@
@Test public void should_read_value_from_IPreferenceStore() {
when(store.getBoolean(name)).thenReturn(true);
- assertThat(preference.value(), equalTo(true));
+ assertTrue(preference.value());
verify(store).getBoolean(name);
}
@Test public void should_read_default_value_from_IPreferenceStore() {
when(store.getDefaultBoolean(name)).thenReturn(true);
- assertThat(preference.defaultValue(), equalTo(true));
+ assertTrue(preference.defaultValue());
verify(store).getDefaultBoolean(name);
}
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPath_parse_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPath_parse_Test.java
index bd216d7..bd3a501 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPath_parse_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPath_parse_Test.java
@@ -9,12 +9,10 @@
package com.google.eclipse.protobuf.ui.preferences.pages.paths;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
import org.junit.Test;
-import com.google.eclipse.protobuf.ui.preferences.pages.paths.DirectoryPath;
-
/**
* Tests for <code>{@link DirectoryPath#parse(String)}</code>
*
@@ -25,12 +23,12 @@
@Test public void should_parse_workspace_path() {
DirectoryPath path = DirectoryPath.parse("${workspace_loc:/test/src}");
assertThat(path.value(), equalTo("/test/src"));
- assertThat(path.isWorkspacePath(), equalTo(true));
+ assertTrue(path.isWorkspacePath());
}
@Test public void should_parse_file_system_path() {
DirectoryPath path = DirectoryPath.parse("/test/src");
assertThat(path.value(), equalTo("/test/src"));
- assertThat(path.isWorkspacePath(), equalTo(false));
+ assertFalse(path.isWorkspacePath());
}
}
