LPS-54421 SF

natecavanaugh · Apr 20, 2015 · 971c0c6 · 971c0c6
1 parent 159b87c
commit 971c0c6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/...test/unit/com/liferay/portal/search/lucene/internal/dump/DumpIndexDeletionPolicyTest.java b/...test/unit/com/liferay/portal/search/lucene/internal/dump/DumpIndexDeletionPolicyTest.java
@@ -263,8 +263,8 @@ private void _assertContent(
 		for (long i = 0; i < sourceIndexInput.length(); i++) {
 			Assert.assertEquals(
 				fileName + " has different source and target byte value at " +
-					i, sourceIndexInput.readByte(),
-				targetIndexInput.readByte());
+					i,
+				sourceIndexInput.readByte(), targetIndexInput.readByte());
 		}
 
 		sourceIndexInput.close();
@@ -286,8 +286,8 @@ private void _assertDirectory(
 		Assert.assertEquals(
 			Arrays.toString(sourceFileNames) +
 				" does not have the same length as " +
-				Arrays.toString(targetFileNames), sourceFileNames.length,
-			targetFileNames.length);
+				Arrays.toString(targetFileNames),
+			sourceFileNames.length, targetFileNames.length);
 
 		for (String fileName : sourceFileNames) {
 			long sourceLength = sourceDirectory.fileLength(fileName);

diff --git a/...e-freemarker/test/unit/com/liferay/portal/template/freemarker/FreeMarkerTemplateTest.java b/...e-freemarker/test/unit/com/liferay/portal/template/freemarker/FreeMarkerTemplateTest.java
@@ -273,8 +273,8 @@ public void testProcessTemplate6() throws Exception {
 
 			Assert.fail();
 		}
-		catch (TemplateException e) {
-			String message = e.getMessage();
+		catch (TemplateException te) {
+			String message = te.getMessage();
 
 			Assert.assertTrue(message.contains(_WRONG_ERROR_TEMPLATE_ID));
 		}

diff --git a/.../portal-template-velocity/test/unit/com/liferay/portal/velocity/VelocityTemplateTest.java b/.../portal-template-velocity/test/unit/com/liferay/portal/velocity/VelocityTemplateTest.java
@@ -263,8 +263,8 @@ public void testProcessTemplate2() throws Exception {
 
 			Assert.fail();
 		}
-		catch (TemplateException e) {
-			String message = e.getMessage();
+		catch (TemplateException te) {
+			String message = te.getMessage();
 
 			Assert.assertTrue(message.contains(_WRONG_TEMPLATE_ID));
 		}
@@ -340,8 +340,8 @@ public void testProcessTemplate6() throws Exception {
 
 			Assert.fail();
 		}
-		catch (TemplateException e) {
-			String message = e.getMessage();
+		catch (TemplateException te) {
+			String message = te.getMessage();
 
 			Assert.assertTrue(message.contains(_WRONG_ERROR_TEMPLATE_ID));
 		}

diff --git a/portal-impl/test/integration/com/liferay/portal/service/persistence/RoleFinderTest.java b/portal-impl/test/integration/com/liferay/portal/service/persistence/RoleFinderTest.java
@@ -117,7 +117,8 @@ public void testFindByC_N_S_P_A() throws Exception {
 
 		Assert.assertTrue(
 			"The method findByC_N_S_P_A should have returned the role " +
-				_arbitraryRole.getRoleId(), exists);
+				_arbitraryRole.getRoleId(),
+			exists);
 	}
 
 	@SuppressWarnings("PMD.JUnitUseAssertFailPropertly")

diff --git a/portal-impl/test/integration/com/liferay/portlet/service/persistence/GroupFinderTest.java b/portal-impl/test/integration/com/liferay/portlet/service/persistence/GroupFinderTest.java
@@ -126,7 +126,8 @@ public void testFindByC_C_N_DJoinByRoleResourcePermissions()
 
 		Assert.assertTrue(
 			"The method findByC_C_N_D should have returned the group " +
-				_group.getGroupId(), exists);
+				_group.getGroupId(),
+			exists);
 	}
 
 	@Test
@@ -150,7 +151,8 @@ public void testFindByC_C_N_DJoinByRoleResourceTypePermissions()
 
 		Assert.assertTrue(
 			"The method findByC_C_N_D should have returned the group " +
-				_group.getGroupId(), exists);
+				_group.getGroupId(),
+			exists);
 	}
 
 	@Test

diff --git a/portal-impl/test/unit/com/liferay/portal/scripting/ScriptingExecutorTestCase.java b/portal-impl/test/unit/com/liferay/portal/scripting/ScriptingExecutorTestCase.java
@@ -101,9 +101,7 @@ protected String getScript(String name) throws IOException {
 		InputStream inputStream = clazz.getResourceAsStream(
 			"dependencies/" + name);
 
-		String script = StringUtil.read(inputStream);
-
-		return script;
+		return StringUtil.read(inputStream);
 	}
 
 	@Mock

diff --git a/portal-service/src/com/liferay/portal/kernel/template/TemplateManagerUtil.java b/portal-service/src/com/liferay/portal/kernel/template/TemplateManagerUtil.java
@@ -265,10 +265,10 @@ public TemplateManager addingService(
 
 				_templateManagers.put(serviceReference, templateManager);
 			}
-			catch (TemplateException e) {
+			catch (TemplateException te) {
 				if (_log.isWarnEnabled()) {
 					_log.warn(
-						"unable to init " + name + " Template Manager ", e);
+						"unable to init " + name + " Template Manager ", te);
 				}
 			}