Improved creation of XtextRule, by specifying overriding modules.
Cleaned up code.
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue131_AddOptionsForService_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue131_AddOptionsForService_Test.java
index 8243be9..bc9af49 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue131_AddOptionsForService_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue131_AddOptionsForService_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.bugs;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue131_AddOptionsForService_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue147_AddSupportForGroupOptions_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue147_AddSupportForGroupOptions_Test.java
index d03a371..a35623e 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue147_AddSupportForGroupOptions_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue147_AddSupportForGroupOptions_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.bugs;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllFields.containAll;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static org.junit.Assert.assertThat;
@@ -32,14 +32,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue147_AddSupportForGroupOptions_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue156_AddSupportForEnumValueOptions_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue156_AddSupportForEnumValueOptions_Test.java
index f354856..bb06d58 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue156_AddSupportForEnumValueOptions_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue156_AddSupportForEnumValueOptions_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.bugs;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue156_AddSupportForEnumValueOptions_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue157_GroupsShouldBeTypes_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue157_GroupsShouldBeTypes_Test.java
index 25f5c3c..17bb46e 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue157_GroupsShouldBeTypes_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue157_GroupsShouldBeTypes_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.bugs;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainNames.contain;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue157_GroupsShouldBeTypes_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue161_PackageScoping_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue161_PackageScoping_Test.java
index db4e3fc..7a9eba4 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue161_PackageScoping_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue161_PackageScoping_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.bugs;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainNames.contain;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue161_PackageScoping_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue167_PackageScopingWithNestedTypes_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue167_PackageScopingWithNestedTypes_Test.java
index 19637f7..3e77ae7 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue167_PackageScopingWithNestedTypes_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue167_PackageScopingWithNestedTypes_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.bugs;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainNames.contain;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue167_PackageScopingWithNestedTypes_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue169_AddSupportForExtendingGroups_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue169_AddSupportForExtendingGroups_Test.java
index c4215e7..7cf46ed 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue169_AddSupportForExtendingGroups_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/bugs/Issue169_AddSupportForExtendingGroups_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue169_AddSupportForExtendingGroups_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
// // Create file types.proto
//
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/IEObjectDescriptions.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/IEObjectDescriptions.java
index 4cbff1e..9829089 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/IEObjectDescriptions.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/IEObjectDescriptions.java
@@ -22,7 +22,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IEObjectDescriptions {
-
public static IEObjectDescriptions descriptionsIn(IScope scope) {
return descriptions(scope.getAllElements());
}
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java
index bb6827b..18b486c 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ContainAllFields extends BaseMatcher<IEObjectDescriptions> {
-
private final Collection<MessageField> fields = newArrayList();
public static ContainAllFields containAll(Collection<MessageField> fields) {
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java
index 1d55270..a4fb223 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ContainAllFieldsInMessage extends BaseMatcher<IEObjectDescriptions> {
-
private final EObject container;
public static ContainAllFieldsInMessage containAllFieldsIn(Group group) {
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java
index 4a667e0..40312dd 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java
@@ -25,7 +25,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ContainAllLiteralsInEnum extends BaseMatcher<IEObjectDescriptions> {
-
private final Enum anEnum;
public static ContainAllLiteralsInEnum containAllLiteralsIn(Enum anEnum) {
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllNames.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllNames.java
index 3103edf..2fb0457 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllNames.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllNames.java
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ContainAllNames extends BaseMatcher<IEObjectDescriptions> {
-
private final String[] expectedNames;
public static ContainAllNames containAll(String... names) {
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainNames.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainNames.java
index a6f9ee8..456e079 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainNames.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainNames.java
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ContainNames extends BaseMatcher<IEObjectDescriptions> {
-
private final List<String> expectedNames;
public static ContainNames contain(String... names) {
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_isDefaultValueOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_isDefaultValueOption_Test.java
index 27461e5..9cc8cc5 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_isDefaultValueOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_isDefaultValueOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.*;
import org.junit.*;
@@ -23,8 +23,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_isDefaultValueOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_nameOf_FieldOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_nameOf_FieldOption_Test.java
index a1166c0..e60a9d3 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_nameOf_FieldOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_nameOf_FieldOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_nameOf_FieldOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_FieldOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_FieldOption_Test.java
index dec3cea..6c0a3bf 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_FieldOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_FieldOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_rootSourceOf_FieldOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Option_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Option_Test.java
index a9abb79..f42e800 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Option_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Option_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_rootSourceOf_Option_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomFieldOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomFieldOption_Test.java
index c702f82..3f4a400 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomFieldOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomFieldOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* alruiz@google.com (Alex Ruiz)
*/
public class Options_sourceOfLastFieldIn_CustomFieldOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options fieldOptions;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomOption_Test.java
index e146b82..5c2f14b 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOfLastFieldIn_CustomOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* alruiz@google.com (Alex Ruiz)
*/
public class Options_sourceOfLastFieldIn_CustomOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomFieldOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomFieldOption_Test.java
index 26d7783..601a19e 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomFieldOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomFieldOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_sourceOf_CustomFieldOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomOption_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomOption_Test.java
index 8a8af1d..b08e1a4 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomOption_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_CustomOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_sourceOf_CustomOption_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java
index 82c21e3..475dc5b 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.common.collect.Maps.newHashMap;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.FieldHasType.*;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -30,8 +30,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtoDescriptor_availableOptionsFor_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private Options options;
private ProtoDescriptor descriptor;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java
index e59b78a..2879d6d 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.scoping;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.scoping.OptionType.FILE;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtoDescriptor_enumTypeOf_Test {
-
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtoDescriptor descriptor;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_ComplexTypeLink_target_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_ComplexTypeLink_target_Test.java
index ebf6dfe..e8851a4 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_ComplexTypeLink_target_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_ComplexTypeLink_target_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -28,14 +28,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_ComplexTypeLink_target_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_ExtensionFieldName_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_ExtensionFieldName_Test.java
index 0e1c5bc..e89fcd0 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_ExtensionFieldName_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_ExtensionFieldName_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -28,14 +28,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_FieldName_target_with_ExtensionFieldName_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_NormalFieldName_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_NormalFieldName_Test.java
index 472e6b1..61dc31c 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_NormalFieldName_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_FieldName_target_with_NormalFieldName_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllFieldsInMessage.containAllFieldsIn;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -28,14 +28,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_FieldName_target_with_NormalFieldName_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_LiteralLink_target_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_LiteralLink_target_Test.java
index ddcbb5e..1096ba3 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_LiteralLink_target_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_LiteralLink_target_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllLiteralsInEnum.containAllLiteralsIn;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_LiteralLink_target_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_ExtensionOptionField_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_ExtensionOptionField_Test.java
index 4e8ef3c..8e76601 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_ExtensionOptionField_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_ExtensionOptionField_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -28,14 +28,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_OptionField_target_with_ExtensionOptionField_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_MessageOptionField_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_MessageOptionField_Test.java
index 789ed68..2522415 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_MessageOptionField_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionField_target_with_MessageOptionField_Test.java
@@ -9,9 +9,9 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
import static com.google.eclipse.protobuf.junit.core.SearchOption.IGNORE_CASE;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllFieldsInMessage.containAllFieldsIn;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -29,14 +29,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_OptionField_target_with_MessageOptionField_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionSource_target_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionSource_target_Test.java
index bc47d00..4dce2c2 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionSource_target_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtobufScopeProvider_scope_OptionSource_target_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.scoping;
import static com.google.eclipse.protobuf.junit.IEObjectDescriptions.descriptionsIn;
-import static com.google.eclipse.protobuf.junit.core.Setups.integrationTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.IntegrationTestModule.integrationTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllFields.containAll;
import static com.google.eclipse.protobuf.junit.matchers.ContainAllNames.containAll;
import static com.google.eclipse.protobuf.scoping.OptionType.*;
@@ -32,14 +32,13 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufScopeProvider_scope_OptionSource_target_Test {
-
private static EReference reference;
@BeforeClass public static void setUpOnce() {
reference = mock(EReference.class);
}
- @Rule public XtextRule xtext = createWith(integrationTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(integrationTestModule());
private ProtobufScopeProvider provider;
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 f3c6637..8f513c9 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
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertTrue;
import org.eclipse.emf.common.util.BasicDiagnostic;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue148_FixDuplicateNameError_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ProtobufJavaValidator validator;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue150_AddSupportForExtendMessageToGroups_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue150_AddSupportForExtendMessageToGroups_Test.java
index 778762b..386f71d 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue150_AddSupportForExtendMessageToGroups_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue150_AddSupportForExtendMessageToGroups_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertNotNull;
import org.junit.*;
@@ -22,8 +22,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue150_AddSupportForExtendMessageToGroups_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue152_SupportEscapedCharactersInStrings_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue152_SupportEscapedCharactersInStrings_Test.java
index 547ba43..20af375 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue152_SupportEscapedCharactersInStrings_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue152_SupportEscapedCharactersInStrings_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertNotNull;
import org.junit.*;
@@ -22,8 +22,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue152_SupportEscapedCharactersInStrings_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue153_AddSupportForNegativeInf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue153_AddSupportForNegativeInf_Test.java
index 89d1391..e84de58 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue153_AddSupportForNegativeInf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue153_AddSupportForNegativeInf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertNotNull;
import org.junit.*;
@@ -22,8 +22,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue153_AddSupportForNegativeInf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue154_AllowMultipleSemicolons_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue154_AllowMultipleSemicolons_Test.java
index 8ff3e4b..17deb47 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue154_AllowMultipleSemicolons_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue154_AllowMultipleSemicolons_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertNotNull;
import org.junit.*;
@@ -22,8 +22,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue154_AllowMultipleSemicolons_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue165_Support64BitNumbers_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue165_Support64BitNumbers_Test.java
index b2cc4cd..04b900a 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue165_Support64BitNumbers_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue165_Support64BitNumbers_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue165_Support64BitNumbers_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INode node;
private LONGValueConverter converter;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue166_SupportOptionalDecimals_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue166_SupportOptionalDecimals_Test.java
index fc9d409..8b05dc7 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue166_SupportOptionalDecimals_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue166_SupportOptionalDecimals_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue166_SupportOptionalDecimals_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue168_GroupsCanHaveMessagesAndExtensions_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue168_GroupsCanHaveMessagesAndExtensions_Test.java
index c170026..10a910e 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue168_GroupsCanHaveMessagesAndExtensions_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue168_GroupsCanHaveMessagesAndExtensions_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import org.junit.*;
@@ -21,8 +21,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue168_GroupsCanHaveMessagesAndExtensions_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue91_AddSupportForUTF16Strings_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue91_AddSupportForUTF16Strings_Test.java
index 57b5cf7..d2c043a 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue91_AddSupportForUTF16Strings_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue91_AddSupportForUTF16Strings_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.bugs;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertNotNull;
import org.junit.*;
@@ -22,8 +22,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Issue91_AddSupportForUTF16Strings_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
// syntax = "proto2";
//
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_Test.java
index d0411c0..60814f7 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.conversion;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static java.lang.Double.*;
import static java.util.Arrays.asList;
import static org.hamcrest.core.IsEqual.equalTo;
@@ -33,8 +33,7 @@
*/
@RunWith(Parameterized.class)
public class DOUBLEValueConverter_toValue_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private final String input;
private final Double expected;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_withInvalidInput_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_withInvalidInput_Test.java
index 9d8bb99..961237e 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_withInvalidInput_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter_toValue_withInvalidInput_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.conversion;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.*;
@@ -29,8 +29,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class DOUBLEValueConverter_toValue_withInvalidInput_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
@Rule public ExpectedException thrown = none();
private DOUBLEValueConverter converter;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_Test.java
index f20884b..06b64fa 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.conversion;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static java.util.Arrays.asList;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -32,8 +32,7 @@
*/
@RunWith(Parameterized.class)
public class HEXValueConverter_toValue_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private final String input;
private final Long expected;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_withInvalidInput_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_withInvalidInput_Test.java
index b17ee06..b98eceb 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_withInvalidInput_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/HEXValueConverter_toValue_withInvalidInput_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.conversion;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.*;
@@ -29,8 +29,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class HEXValueConverter_toValue_withInvalidInput_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
@Rule public ExpectedException thrown = none();
private HEXValueConverter converter;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/LONGValueConverter_toValue_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/LONGValueConverter_toValue_Test.java
index 3e3bf22..001b0f9 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/LONGValueConverter_toValue_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/LONGValueConverter_toValue_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.conversion;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.*;
@@ -29,8 +29,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class LONGValueConverter_toValue_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
@Rule public ExpectedException thrown = none();
private LONGValueConverter converter;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter_toValue_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter_toValue_Test.java
index 48523b6..03c6227 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter_toValue_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter_toValue_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.conversion;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static java.util.Arrays.asList;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -32,8 +32,7 @@
*/
@RunWith(Parameterized.class)
public class STRINGValueConverter_toValue_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private final String input;
private final String expected;
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 5ea16b3..3efebb0 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
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CommonKeyword_hasValue_Test {
-
@Test public void should_return_true_if_value_is_equal_to_String() {
assertTrue(BOOL.hasValue("bool"));
assertTrue(TRUE.hasValue("true"));
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_toString_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_toString_Test.java
index 50ec6f0..6042f1a 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_toString_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/CommonKeyword_toString_Test.java
@@ -20,9 +20,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CommonKeyword_toString_Test {
-
@Test public void should_return_value() {
assertThat(BOOL.toString(), equalTo("bool"));
}
-
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Keywords_isKeyword_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Keywords_isKeyword_Test.java
index e7a2378..66aecf0 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Keywords_isKeyword_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Keywords_isKeyword_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.grammar;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.GrammarUtil.getAllKeywords;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Keywords_isKeyword_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private IGrammarAccess grammarAccess;
private Keywords keywords;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Syntaxes_proto2_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Syntaxes_proto2_Test.java
index 87689b5..284c20f 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Syntaxes_proto2_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/grammar/Syntaxes_proto2_Test.java
@@ -9,7 +9,7 @@
package com.google.eclipse.protobuf.grammar;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
import org.junit.Test;
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Syntaxes_proto2_Test {
-
@Test public void should_return_proto2() {
assertThat(Syntaxes.proto2(), equalTo("proto2"));
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/CommentProcessor.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/CommentProcessor.java
index 99d16c0..6784a27 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/CommentProcessor.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/CommentProcessor.java
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
class CommentProcessor {
-
private static final Pattern CREATE_FILE_PATTERN = compile("// Create file (.*)");
Object processComment(String comment) {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java
index fcfbb68..6c63f05 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java
@@ -26,10 +26,9 @@
* @author alruiz@google.com (Alex Ruiz)
*/
class Finder {
-
// TODO remove feature names that are not used or don't exist any more.
- private static final String[] FEATURE_NAMES = {"extension", "target", "message", "name", "optionField", "property",
- "source", "type", "value"};
+ private static final String[] FEATURE_NAMES = { "extension", "target", "message", "name", "optionField", "property",
+ "source", "type", "value" };
private final String protoAsText;
private final AbstractNode root;
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 8aac327..967c557 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
@@ -17,7 +17,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
final class GeneratedProtoFiles {
-
private static final String PARENT_DIRECTORY_NAME = "test-protos";
static File protoFile(String fileName) {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/IntegrationTestSetup.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/IntegrationTestModule.java
similarity index 71%
rename from com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/IntegrationTestSetup.java
rename to com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/IntegrationTestModule.java
index 527bf13..eb33af2 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/IntegrationTestSetup.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/IntegrationTestModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Google Inc.
+* Copyright (c) 2011 Google Inc.
*
* All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
* Public License v1.0 which accompanies this distribution, and is available at
@@ -16,26 +16,23 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
-import com.google.eclipse.protobuf.*;
import com.google.eclipse.protobuf.scoping.IFileUriResolver;
-import com.google.inject.*;
+import com.google.inject.AbstractModule;
/**
+ * Guice module for unit testing.
+ *
* @author alruiz@google.com (Alex Ruiz)
*/
-public class IntegrationTestSetup extends ProtobufStandaloneSetup {
-
- protected IntegrationTestSetup() {}
-
- @Override
- public Injector createInjector() {
- return Guice.createInjector(new Module());
+public class IntegrationTestModule extends AbstractModule {
+ public static IntegrationTestModule integrationTestModule() {
+ return new IntegrationTestModule();
}
- protected static class Module extends ProtobufRuntimeModule {
- public Class<? extends IFileUriResolver> bindFileUriResolver() {
- return FileUriResolver.class;
- }
+ private IntegrationTestModule( ) {}
+
+ @Override protected void configure() {
+ binder().bind(IFileUriResolver.class).to(FileUriResolver.class);
}
private static class FileUriResolver implements IFileUriResolver {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/OverrideRuntimeModuleSetup.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/OverrideRuntimeModuleSetup.java
new file mode 100644
index 0000000..b1d1146
--- /dev/null
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/OverrideRuntimeModuleSetup.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2011 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.junit.core;
+import static com.google.inject.util.Modules.override;
+
+import com.google.eclipse.protobuf.*;
+import com.google.inject.*;
+/**
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+public class OverrideRuntimeModuleSetup extends ProtobufStandaloneSetup {
+ private final Module module;
+
+ OverrideRuntimeModuleSetup(Module module) {
+ this.module = module;
+ }
+
+ @Override public Injector createInjector() {
+ Module newModule = override(new ProtobufRuntimeModule()).with(module);
+ return Guice.createInjector(newModule);
+ }
+}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Setups.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Setups.java
deleted file mode 100644
index 04503df..0000000
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Setups.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc.
- *
- * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package com.google.eclipse.protobuf.junit.core;
-
-import org.eclipse.xtext.ISetup;
-
-/**
- * @author alruiz@google.com (Alex Ruiz)
- */
-public final class Setups {
-
- public static ISetup unitTestSetup() {
- return new UnitTestSetup();
- }
-
- public static ISetup integrationTestSetup() {
- return new IntegrationTestSetup();
- }
-
- private Setups() {}
-}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/TestSourceReader.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/TestSourceReader.java
index a370b6d..ba99394 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/TestSourceReader.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/TestSourceReader.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
class TestSourceReader {
-
private static final String COMMENT_START = "//";
private final Map<String, List<String>> comments = newHashMap();
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/UnitTestModule.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/UnitTestModule.java
new file mode 100644
index 0000000..5f8780a
--- /dev/null
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/UnitTestModule.java
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2011 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.junit.core;
+
+import static org.mockito.Mockito.mock;
+
+import org.eclipse.core.runtime.IExtensionRegistry;
+
+import com.google.inject.*;
+
+/**
+ * Guice module for unit testing.
+ *
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+public class UnitTestModule extends AbstractModule {
+ public static UnitTestModule unitTestModule() {
+ return new UnitTestModule();
+ }
+
+ private UnitTestModule( ) {}
+
+ @Override protected void configure() {
+ binder().bind(IExtensionRegistry.class).toProvider(ExtensionRegistryProvider.class);
+ }
+
+ private static class ExtensionRegistryProvider implements Provider<IExtensionRegistry> {
+ @Override public IExtensionRegistry get() {
+ return mock(IExtensionRegistry.class);
+ }
+ }
+}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/UnitTestSetup.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/UnitTestSetup.java
deleted file mode 100644
index e5612e6..0000000
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/UnitTestSetup.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc.
- *
- * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package com.google.eclipse.protobuf.junit.core;
-
-import static org.mockito.Mockito.mock;
-
-import org.eclipse.core.runtime.IExtensionRegistry;
-
-import com.google.eclipse.protobuf.*;
-import com.google.inject.*;
-
-/**
- * @author alruiz@google.com (Alex Ruiz)
- */
-public class UnitTestSetup extends ProtobufStandaloneSetup {
-
- protected UnitTestSetup() {}
-
- @Override
- public Injector createInjector() {
- return Guice.createInjector(new Module());
- }
-
- protected static class Module extends ProtobufRuntimeModule {
- public Module() {}
-
- @Override public void configureExtensionRegistry(Binder binder) {
- binder.bind(IExtensionRegistry.class).toProvider(ExtensionRegistryProvider.class);
- }
- }
-
- private static class ExtensionRegistryProvider implements Provider<IExtensionRegistry> {
- @Override public IExtensionRegistry get() {
- return mock(IExtensionRegistry.class);
- }
- }
-}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/XtextRule.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/XtextRule.java
index e37f964..9a2ae03 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/XtextRule.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/XtextRule.java
@@ -30,7 +30,7 @@
import org.junit.runners.model.*;
import com.google.eclipse.protobuf.protobuf.Protobuf;
-import com.google.inject.Injector;
+import com.google.inject.*;
/**
* Rule that performs configuration of a standalone Xtext environment.
@@ -38,7 +38,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class XtextRule implements MethodRule {
-
private final Injector injector;
private final TestSourceReader reader;
@@ -46,6 +45,10 @@
private XtextResource resource;
private Finder finder;
+ public static XtextRule overrideRuntimeModuleWith(Module testModule) {
+ return new XtextRule(new OverrideRuntimeModuleSetup(testModule));
+ }
+
public static XtextRule createWith(ISetup setup) {
return new XtextRule(setup);
}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java
index 92656ec..24717fb 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class EnumHasLiterals extends BaseMatcher<Enum> {
-
private final String[] literalNames;
public static EnumHasLiterals hasLiterals(String... literalNames) {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java
index 341fc20..c02ed9f 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java
@@ -16,7 +16,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class FieldHasType extends BaseMatcher<MessageField> {
-
private final String typeName;
public static FieldHasType isBool() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/FileStub.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/FileStub.java
index d6edac2..d1c59ee 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/FileStub.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/FileStub.java
@@ -25,7 +25,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class FileStub implements IFile {
-
private final Map<String, List<MarkerStub>> markersByType = newHashMap();
private IPath location;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/MarkerStub.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/MarkerStub.java
index f3a7c2b..cef018c 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/MarkerStub.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/MarkerStub.java
@@ -23,7 +23,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MarkerStub implements IMarker {
-
private final Map<String, Object> attributes = newHashMap();
private final String type;
private final long creationTime;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/ResourceStub.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/ResourceStub.java
index c5dc851..f69bd43 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/ResourceStub.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/resources/ResourceStub.java
@@ -22,7 +22,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ResourceStub implements Resource {
-
private URI uri;
public ResourceStub() {}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/util/MultiLineTextBuilder.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/util/MultiLineTextBuilder.java
index 5022fae..3ea5fcb 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/util/MultiLineTextBuilder.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/util/MultiLineTextBuilder.java
@@ -14,7 +14,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MultiLineTextBuilder {
-
private final StringBuilder builder = new StringBuilder();
public MultiLineTextBuilder() {}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_appendToMessage_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_appendToMessage_Test.java
index 0e7a134..43f9520 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_appendToMessage_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_appendToMessage_Test.java
@@ -21,7 +21,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufDiagnostic_appendToMessage_Test {
-
private ProtobufDiagnostic diagnostic;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_constructor_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_constructor_Test.java
index 9d54625..dbcb6cb 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_constructor_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufDiagnostic_constructor_Test.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufDiagnostic_constructor_Test {
-
private static INode node;
@BeforeClass public static void setUpOnce() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufResource_createDiagnostic_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufResource_createDiagnostic_Test.java
index 7a671c3..f7d51f4 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufResource_createDiagnostic_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/linking/ProtobufResource_createDiagnostic_Test.java
@@ -27,7 +27,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufResource_createDiagnostic_Test {
-
private static Triple<EObject, EReference, INode> triple;
@BeforeClass public static void setUpOnce() {
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 05d8f25..c33619c 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
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_belongsToCommentOrString_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INodes nodes;
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 22ef9e8..8f091bf 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
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_belongsToComment_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INodes nodes;
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 ecc1887..3601fd0 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
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_belongsToMultipleLineComment_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INodes nodes;
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 d07d0e4..630b218 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
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_belongsToSingleLineComment_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INodes nodes;
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 da828b4..113c3ec 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
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.nodemodel.util.NodeModelUtils.getNode;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_belongsToString_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INodes nodes;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_firstNodeForFeature_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_firstNodeForFeature_Test.java
index 1c5e898..577f4d5 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_firstNodeForFeature_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/INodes_firstNodeForFeature_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.MESSAGE_FIELD__NAME;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -27,8 +27,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_firstNodeForFeature_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private INodes nodes;
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 c4e6a92..9295c52 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
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class INodes_isHiddenLeafNode_Test {
-
private INodes nodes;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_calculateNewIndexFor_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_calculateNewIndexFor_Test.java
index e63b968..f36eb79 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_calculateNewIndexFor_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_calculateNewIndexFor_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IndexedElements_calculateNewIndexFor_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private IndexedElements indexedElements;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_fieldOptionsOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_fieldOptionsOf_Test.java
index d1b49c1..43f8019 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_fieldOptionsOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_fieldOptionsOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IndexedElements_fieldOptionsOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private IndexedElements indexedElements;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexFeatureOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexFeatureOf_Test.java
index 6a5ece0..eddcd89 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexFeatureOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexFeatureOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.*;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IndexedElements_indexFeatureOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private static IndexedElements indexedElements;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexOf_Test.java
index d15201d..930b3c7 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_indexOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IndexedElements_indexOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private IndexedElements indexedElements;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_setIndexOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_setIndexOf_Test.java
index 6021754..71fdb00 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_setIndexOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_setIndexOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IndexedElements_setIndexOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private IndexedElements indexedElements;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isBool_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isBool_Test.java
index 0a43f41..22a670c 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isBool_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isBool_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.*;
import org.junit.*;
@@ -23,8 +23,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MessageFields_isBool_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private MessageFields fields;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isPrimitive_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isPrimitive_Test.java
index ce25b1e..efbeb4c 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isPrimitive_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isPrimitive_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.eclipse.xtext.EcoreUtil2.getAllContentsOfType;
import static org.junit.Assert.*;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MessageFields_isPrimitive_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private MessageFields fields;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isString_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isString_Test.java
index 7c8a2c1..42eaf04 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isString_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_isString_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.*;
import org.junit.*;
@@ -23,8 +23,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MessageFields_isString_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private MessageFields fields;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_typeNameOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_typeNameOf_Test.java
index cc251bf..61778b2 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_typeNameOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/MessageFields_typeNameOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MessageFields_typeNameOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private MessageFields fields;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java
index 132cdc0..16179e9 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -25,8 +25,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_enumTypeOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_importsIn_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_importsIn_Test.java
index fba62a9..e89656c 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_importsIn_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_importsIn_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_importsIn_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private Protobuf root;
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_localExtensionsFrom_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_localExtensionsFrom_Test.java
index b81d23e..be4fffe 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_localExtensionsFrom_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_localExtensionsFrom_Test.java
@@ -9,8 +9,8 @@
package com.google.eclipse.protobuf.model.util;
import static com.google.common.collect.Lists.newArrayList;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.junit.Assert.assertSame;
import java.util.List;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_localExtensionsFrom_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java
index d49dc46..35a2b35 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@@ -25,8 +25,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_messageFrom_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java
index c4bf6b0..f3b3f89 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_packageOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_rootOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_rootOf_Test.java
index 615969a..7f453ed 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_rootOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_rootOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsSame.sameInstance;
import static org.junit.Assert.assertThat;
@@ -25,8 +25,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_rootOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_scalarTypeOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_scalarTypeOf_Test.java
index 08375f3..ae2aab7 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_scalarTypeOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_scalarTypeOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ModelFinder_scalarTypeOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ModelFinder finder;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java
index 3304ac8..f8f0cf9 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.model.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -23,8 +23,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Options_nameForOption_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private Options options;
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 bfb904d..32c625e 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
@@ -21,7 +21,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Packages_areRelated_Test {
-
private static Packages packages;
@BeforeClass public static void setUpOnce() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/LocalNamesProvider_names_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/LocalNamesProvider_names_Test.java
index d50d44e..3915817 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/LocalNamesProvider_names_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/LocalNamesProvider_names_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.naming;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -28,8 +28,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class LocalNamesProvider_names_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private LocalNamesProvider namesProvider;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java
index 0da4968..419189b 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.naming;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -27,8 +27,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class NameResolver_nameOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private NameResolver resolver;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider_getFullyQualifiedName_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider_getFullyQualifiedName_Test.java
index 87f968d..d17ea3d 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider_getFullyQualifiedName_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider_getFullyQualifiedName_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.naming;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufQualifiedNameProvider_getFullyQualifiedName_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private IProtobufQualifiedNameProvider provider;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java
index 358b4e9..9bbf840 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.naming;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -25,8 +25,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class QualifiedNames_addLeadingDot_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private QualifiedNames qualifiedNames;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/parser/Proto2OnlyParser_doParse_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/parser/Proto2OnlyParser_doParse_Test.java
deleted file mode 100644
index cb51d2b..0000000
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/parser/Proto2OnlyParser_doParse_Test.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc.
- *
- * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package com.google.eclipse.protobuf.parser;
-
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-import org.antlr.runtime.CharStream;
-import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder;
-import org.junit.*;
-
-import com.google.eclipse.protobuf.junit.core.*;
-import com.google.eclipse.protobuf.junit.util.MultiLineTextBuilder;
-import com.google.eclipse.protobuf.protobuf.Protobuf;
-import com.google.inject.*;
-
-/**
- * Tests for <code>{@link Proto2OnlyParser#doParse(String, CharStream, NodeModelBuilder, int)}</code>.
- *
- * @author alruiz@google.com (Alex Ruiz)
- */
-public class Proto2OnlyParser_doParse_Test {
-
- private static String proto1;
-
- @BeforeClass public static void setUpOnce() {
- MultiLineTextBuilder proto = new MultiLineTextBuilder();
- proto.append("// ignore errors")
- .append("c++header #include 'test/common/proto_class.h'");
- proto1 = proto.toString();
- }
-
- @Rule public XtextRule xtext = createWith(new Setup());
-
- private ParserChecksSettingsProvider settingsProvider;
-
- @Before public void setUp() {
- settingsProvider = xtext.getInstanceOf(ParserChecksSettingsProvider.class);
- }
-
- @Test public void should_recognize_proto1_syntax() {
- when(settingsProvider.shouldCheckProto2Only()).thenReturn(true);
- xtext.parseText(proto1);
- Protobuf root = xtext.root();
- assertThat(root, instanceOf(NonProto2Protobuf.class));
- }
-
- @Test public void should_not_recognize_proto1_syntax() {
- when(settingsProvider.shouldCheckProto2Only()).thenReturn(false);
- xtext.parseText(proto1);
- Protobuf root = xtext.root();
- assertNull(root);
- }
-
- private static class Setup extends UnitTestSetup {
- @Override public Injector createInjector() {
- return Guice.createInjector(new Module() {
- @SuppressWarnings("unused")
- public void configureParserChecksSettingsProvider(Binder binder) {
- binder.bind(ParserChecksSettingsProvider.class).toInstance(mock(ParserChecksSettingsProvider.class));
- }
- });
- }
- }
-
-}
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 781fdb0..01dfc6e 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
@@ -21,7 +21,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Closeables_closeQuietly_Test {
-
private Closeable closeable;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java
index bf2e636..3efa879 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.validation;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.PACKAGE__NAME;
import static com.google.eclipse.protobuf.validation.ProtobufJavaValidator.MORE_THAN_ONE_PACKAGE_ERROR;
import static org.eclipse.xtext.validation.ValidationMessageAcceptor.INSIGNIFICANT_INDEX;
@@ -27,8 +27,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ValidationMessageAcceptor messageAcceptor;
private ProtobufJavaValidator validator;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkSyntaxIsProto2_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkSyntaxIsProto2_Test.java
index bc0f27b..a6bb1c1 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkSyntaxIsProto2_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkSyntaxIsProto2_Test.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufJavaValidator_checkSyntaxIsProto2_Test {
-
private Syntax syntax;
private ValidationMessageAcceptor messageAcceptor;
private ProtobufJavaValidator validator;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsGreaterThanZero_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsGreaterThanZero_Test.java
index bd25629..5c1b33d 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsGreaterThanZero_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsGreaterThanZero_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.validation;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.MESSAGE_FIELD__INDEX;
import static com.google.eclipse.protobuf.validation.ProtobufJavaValidator.INVALID_FIELD_TAG_NUMBER_ERROR;
import static org.eclipse.xtext.validation.ValidationMessageAcceptor.INSIGNIFICANT_INDEX;
@@ -27,8 +27,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufJavaValidator_checkTagNumberIsGreaterThanZero_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ValidationMessageAcceptor messageAcceptor;
private ProtobufJavaValidator validator;
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsUnique_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsUnique_Test.java
index e8fcb92..d0da1d1 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsUnique_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkTagNumberIsUnique_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.validation;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.MESSAGE_FIELD__INDEX;
import static com.google.eclipse.protobuf.validation.ProtobufJavaValidator.INVALID_FIELD_TAG_NUMBER_ERROR;
import static org.eclipse.xtext.validation.ValidationMessageAcceptor.INSIGNIFICANT_INDEX;
@@ -27,8 +27,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufJavaValidator_checkTagNumberIsUnique_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private ValidationMessageAcceptor messageAcceptor;
private ProtobufJavaValidator validator;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/CodeGenerationErrorParser_parseAndAddMarkerIfNecessary_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/CodeGenerationErrorParser_parseAndAddMarkerIfNecessary_Test.java
index fc36213..9986005 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/CodeGenerationErrorParser_parseAndAddMarkerIfNecessary_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/CodeGenerationErrorParser_parseAndAddMarkerIfNecessary_Test.java
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CodeGenerationErrorParser_parseAndAddMarkerIfNecessary_Test {
-
private ProtocMarkerFactory markerFactory;
private CodeGenerationErrorParser outputParser;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/LineSpecificErrorParser_parseAndAddMarkerIfNecessary_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/LineSpecificErrorParser_parseAndAddMarkerIfNecessary_Test.java
index 4f0f512..f6f8782 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/LineSpecificErrorParser_parseAndAddMarkerIfNecessary_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/LineSpecificErrorParser_parseAndAddMarkerIfNecessary_Test.java
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class LineSpecificErrorParser_parseAndAddMarkerIfNecessary_Test {
-
private ProtocMarkerFactory markerFactory;
private LineSpecificErrorParser outputParser;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtoDescriptorPathFinder_findRootOf_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtoDescriptorPathFinder_findRootOf_Test.java
index 53bf906..81f8409 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtoDescriptorPathFinder_findRootOf_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtoDescriptorPathFinder_findRootOf_Test.java
@@ -21,7 +21,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtoDescriptorPathFinder_findRootOf_Test {
-
private static ProtoDescriptorPathFinder finder;
@BeforeClass public static void setUpOnce() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtocMarkerFactory_createErrorIfNecessary_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtocMarkerFactory_createErrorIfNecessary_Test.java
index 984fe8e..87ece3d 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtocMarkerFactory_createErrorIfNecessary_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtocMarkerFactory_createErrorIfNecessary_Test.java
@@ -26,7 +26,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtocMarkerFactory_createErrorIfNecessary_Test {
-
private static final String PROTOC = "com.google.eclipse.protobuf.ui.protocMarker";
private FileStub file;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder_matchingCommentNode_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder_matchingCommentNode_Test.java
index 0bfb102..38d5756 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder_matchingCommentNode_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder_matchingCommentNode_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.ui.commands;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.*;
@@ -29,8 +29,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CommentNodesFinder_matchingCommentNode_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private CommentNodesFinder finder;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionChooser_shortestQualifiedNamesIn_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionChooser_shortestQualifiedNamesIn_Test.java
index f13c218..ed46f58 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionChooser_shortestQualifiedNamesIn_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionChooser_shortestQualifiedNamesIn_Test.java
@@ -29,7 +29,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IEObjectDescriptionChooser_shortestQualifiedNamesIn_Test {
-
private List<IEObjectDescription> descriptions;
private Map<String, String> userData;
private IEObjectDescriptionChooser chooser;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionsHaveNames.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionsHaveNames.java
index 7227d79..392b247 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionsHaveNames.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/contentassist/IEObjectDescriptionsHaveNames.java
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class IEObjectDescriptionsHaveNames extends BaseMatcher<Collection<IEObjectDescription>> {
-
private final List<String> qualifiedNames;
public static IEObjectDescriptionsHaveNames containOnly(String...names) {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/MLCommentDocumentationProvider_getDocumentation_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/MLCommentDocumentationProvider_getDocumentation_Test.java
index d58fc4c..34687e1 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/MLCommentDocumentationProvider_getDocumentation_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/MLCommentDocumentationProvider_getDocumentation_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.ui.documentation;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static com.google.eclipse.protobuf.util.SystemProperties.lineSeparator;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -26,8 +26,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class MLCommentDocumentationProvider_getDocumentation_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private MLCommentDocumentationProvider provider;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/ProtobufDocumentationProvider_getDocumentation_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/ProtobufDocumentationProvider_getDocumentation_Test.java
index 5bb4354..f9c1bda 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/ProtobufDocumentationProvider_getDocumentation_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/ProtobufDocumentationProvider_getDocumentation_Test.java
@@ -21,7 +21,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufDocumentationProvider_getDocumentation_Test {
-
private static EObject o;
@BeforeClass public static void setUpOnce() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/SLCommentDocumentationProvider_getDocumentation_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/SLCommentDocumentationProvider_getDocumentation_Test.java
index 0438083..abce39e 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/SLCommentDocumentationProvider_getDocumentation_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/documentation/SLCommentDocumentationProvider_getDocumentation_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.ui.documentation;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -25,8 +25,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class SLCommentDocumentationProvider_getDocumentation_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private SLCommentDocumentationProvider provider;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink_open_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink_open_Test.java
index c7901f0..e9c11c3 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink_open_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink_open_Test.java
@@ -23,7 +23,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ImportHyperlink_open_Test {
-
private static IRegion region;
@BeforeClass public static void setUpOnce() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/model/ContentReader_contentsOf_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/model/ContentReader_contentsOf_Test.java
index 29988d0..1977e36 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/model/ContentReader_contentsOf_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/editor/model/ContentReader_contentsOf_Test.java
@@ -22,7 +22,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ContentReader_contentsOf_Test {
-
private ContentReader reader;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_charCount_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_charCount_Test.java
index 5a7f449..3b9fff7 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_charCount_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_charCount_Test.java
@@ -20,10 +20,8 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CompoundElement_charCount_Test {
-
@Test public void should_return_number_of_characters_in_value() {
assertThat(DEFAULT_EQUAL.charCount(), equalTo(DEFAULT_EQUAL.toString().length()));
assertThat(DEFAULT_EQUAL_IN_BRACKETS.charCount(), equalTo(DEFAULT_EQUAL_IN_BRACKETS.toString().length()));
}
-
}
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 81c198c..1bc3094 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
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CompoundElement_hasValue_Test {
-
@Test public void should_return_true_if_value_is_equal_to_String() {
assertTrue(DEFAULT_EQUAL.hasValue("default = "));
assertTrue(DEFAULT_EQUAL_IN_BRACKETS.hasValue("[default = ]"));
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_indexOf_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_indexOf_Test.java
index 647bbdf..aa3038e 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_indexOf_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_indexOf_Test.java
@@ -23,7 +23,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CompoundElement_indexOf_Test {
-
@Test public void should_return_index_of_keyword_as_substring() {
assertThat(DEFAULT_EQUAL.indexOf(EQUAL), equalTo(DEFAULT_EQUAL.toString().indexOf(EQUAL.toString())));
}
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_toString_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_toString_Test.java
index 66b0157..a49eb2c 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_toString_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/grammar/CompoundElement_toString_Test.java
@@ -20,9 +20,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CompoundElement_toString_Test {
-
@Test public void should_return_value() {
assertThat(DEFAULT_EQUAL.toString(), equalTo("default = "));
}
-
}
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 12483d6..32e2149 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
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class BooleanPreference_Test {
-
private String name;
private IPreferenceStore store;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/Buttons_add_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/ButtonGroup_add_Test.java
similarity index 96%
rename from com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/Buttons_add_Test.java
rename to com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/ButtonGroup_add_Test.java
index 0d3cd8a..fdf5571 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/Buttons_add_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/ButtonGroup_add_Test.java
@@ -21,8 +21,7 @@
*
* @author alruiz@google.com (Alex Ruiz)
*/
-public class Buttons_add_Test {
-
+public class ButtonGroup_add_Test {
private Button[] buttons;
private SelectionListener listener;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection_Test.java
index dc3f226..866792c 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection_Test.java
@@ -23,7 +23,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class BindingToButtonSelection_Test {
-
private Button button;
private BooleanPreference preference;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems_Test.java
index 8eef4ed..8f6fa05 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems_Test.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class BindingToListItems_Test {
-
private List list;
private StringListPreference preference;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue_Test.java
index c7782e7..b0b95ec 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue_Test.java
@@ -23,7 +23,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class BindingToTextValue_Test {
-
private Text text;
private StringPreference preference;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/PreferenceBinder_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/PreferenceBinder_Test.java
index 1765cd2..a7a33cf 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/PreferenceBinder_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/binding/PreferenceBinder_Test.java
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class PreferenceBinder_Test {
-
private Binding[] bindings;
private PreferenceBinder binder;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/DirectoryPath_parse_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/DirectoryPath_parse_Test.java
index 68ce183..79dcbe2 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/DirectoryPath_parse_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/DirectoryPath_parse_Test.java
@@ -21,7 +21,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class DirectoryPath_parse_Test {
-
private IProject project;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectNameWithProjectVariable_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectNameWithProjectVariable_Test.java
index 88527f5..c8252b4 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectNameWithProjectVariable_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectNameWithProjectVariable_Test.java
@@ -22,7 +22,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProjectVariable_replaceProjectNameWithProjectVariable_Test {
-
private IProject project;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectVariableWithProjectName_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectVariableWithProjectName_Test.java
index 145d576..117fcfe 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectVariableWithProjectName_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/preferences/paths/core/ProjectVariable_replaceProjectVariableWithProjectName_Test.java
@@ -22,7 +22,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProjectVariable_replaceProjectVariableWithProjectName_Test {
-
private IProject project;
@Before public void setUp() {
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver_resolveUri_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver_resolveUri_Test.java
index f4e29b3..2959a88 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver_resolveUri_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver_resolveUri_Test.java
@@ -26,7 +26,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class SingleDirectoryFileResolver_resolveUri_Test {
-
private static URI resourceUri;
private static PathsPreferences preferences;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/CommaSeparatedValues_splitCsv_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/CommaSeparatedValues_splitCsv_Test.java
index b903177..0b024a5 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/CommaSeparatedValues_splitCsv_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/CommaSeparatedValues_splitCsv_Test.java
@@ -19,7 +19,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class CommaSeparatedValues_splitCsv_Test {
-
@Test public void should_split_CSV() {
String[] values = CommaSeparatedValues.splitCsv("Yoda, Leia, Luke");
assertThat(values, equalTo(new String[] { "Yoda", "Leia", "Luke" }));
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Literals_calculateIndexOf_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Literals_calculateIndexOf_Test.java
index ca666f7..8fcf9ad 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Literals_calculateIndexOf_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Literals_calculateIndexOf_Test.java
@@ -8,8 +8,8 @@
*/
package com.google.eclipse.protobuf.ui.util;
-import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
-import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -24,8 +24,7 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Literals_calculateIndexOf_Test {
-
- @Rule public XtextRule xtext = createWith(unitTestSetup());
+ @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
private Literals literals;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Paths_segmentsOf_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Paths_segmentsOf_Test.java
index b282816..2efa7eb 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Paths_segmentsOf_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/util/Paths_segmentsOf_Test.java
@@ -20,7 +20,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class Paths_segmentsOf_Test {
-
@Test(expected = NullPointerException.class)
public void should_throw_error_if_path_is_null() {
Paths.segmentsOf(null);
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_createMarkers_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_createMarkers_Test.java
index 2006c77..7585835 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_createMarkers_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_createMarkers_Test.java
@@ -26,7 +26,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufResourceUIValidatorExtension_createMarkers_Test {
-
private static IFile file;
private static List<Issue> issues;
private static IProgressMonitor monitor;
diff --git a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_deleteMarkers_Test.java b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_deleteMarkers_Test.java
index 879bc68..67faf47 100644
--- a/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_deleteMarkers_Test.java
+++ b/com.google.eclipse.protobuf.ui.test/src/com/google/eclipse/protobuf/ui/validation/ProtobufResourceUIValidatorExtension_deleteMarkers_Test.java
@@ -24,7 +24,6 @@
* @author alruiz@google.com (Alex Ruiz)
*/
public class ProtobufResourceUIValidatorExtension_deleteMarkers_Test {
-
private static CheckMode checkMode;
private static IProgressMonitor monitor;
