Pass expected result as expected, not actual

eclipse-pde · Apr 26, 2024 · 3980d24 · 3980d24
1 parent c8d834f
commit 3980d24
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/...ion.tests/src/org/eclipse/pde/genericeditor/extension/tests/Bug531602FormattingTests.java b/...ion.tests/src/org/eclipse/pde/genericeditor/extension/tests/Bug531602FormattingTests.java
@@ -13,13 +13,13 @@
  *******************************************************************************/
 package org.eclipse.pde.genericeditor.extension.tests;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Scanner;
 
@@ -50,8 +50,7 @@ public void testSettingNullPersists() throws Exception {
 		ByteArrayOutputStream actualOutput = new ByteArrayOutputStream();
 		targetDefinition.setProgramArguments(null);
 		TargetDefinitionPersistenceHelper.persistXML(targetDefinition, actualOutput);
-		assertEquals(expectedOutput.toString(StandardCharsets.UTF_8.toString()),
-				actualOutput.toString(StandardCharsets.UTF_8.toString()));
+		assertEquals(expectedOutput.toString(UTF_8.toString()), actualOutput.toString(UTF_8.toString()));
 	}
 
 	@Test
@@ -105,9 +104,6 @@ public void testITargetLocationExtensionSerialization() throws Exception {
 		confirmMatch(targetDefinition, "ITargetLocationExtensionTestCaseTarget.txt");
 	}
 
-	public static void assertEqualStringIgnoreDelim(String actual, String expected) throws IOException {
-		StringAsserts.assertEqualStringIgnoreDelim(actual, expected);
-	}
 	private void confirmMatch(ITargetDefinition targetDefinition, String expectedDefinitionPath) throws Exception {
 		try (Scanner s = new Scanner(FrameworkUtil.getBundle(this.getClass())
 				.getEntry("testing-files/target-files/" + expectedDefinitionPath).openStream()).useDelimiter("\\A")) {
@@ -123,7 +119,7 @@ private void confirmMatch(ITargetDefinition targetDefinition, String expectedDef
 			ByteArrayOutputStream actualOutput = new ByteArrayOutputStream();
 			TargetDefinitionPersistenceHelper.persistXML(targetDefinition, actualOutput);
 
-			assertEqualStringIgnoreDelim(result, actualOutput.toString(StandardCharsets.UTF_8.toString()));
+			StringAsserts.assertEqualStringIgnoreDelim(actualOutput.toString(UTF_8.toString()), result);
 		} catch (IOException e) {
 		}
 	}