From 6589c7b1f3ee173351d2b9c1effc68d34390bef6 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Sun, 29 Apr 2018 18:12:25 +0200
Subject: [PATCH] Extract fixtures

---
 .../tools/ant/util/Base64ConverterTest.java    | 18 ++++++++++++------
 .../tools/ant/util/GlobPatternMapperTest.java  | 12 ++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/tests/junit/org/apache/tools/ant/util/Base64ConverterTest.java b/src/tests/junit/org/apache/tools/ant/util/Base64ConverterTest.java
index 61fdfba39..81d84963c 100644
--- a/src/tests/junit/org/apache/tools/ant/util/Base64ConverterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/Base64ConverterTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.tools.ant.util;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -27,17 +28,22 @@ import static org.junit.Assert.assertEquals;
  */
 public class Base64ConverterTest {
 
+    private Base64Converter base64Converter;
+
+    @Before
+    public void setUp() {
+        base64Converter = new Base64Converter();
+    }
+
     @Test
     public void testOneValue() {
-        byte[] mybytes = {0, 0, (byte) 0xFF};
-        Base64Converter base64Converter = new Base64Converter();
-        assertEquals("AAD/", base64Converter.encode(mybytes));
+        assertEquals("AAD/",
+                base64Converter.encode(new byte[]{0, 0, (byte) 0xFF}));
     }
 
     @Test
     public void testHelloWorld() {
-        byte[] mybytes = "Hello World".getBytes();
-        Base64Converter base64Converter = new Base64Converter();
-        assertEquals("SGVsbG8gV29ybGQ=", base64Converter.encode(mybytes));
+        assertEquals("SGVsbG8gV29ybGQ=",
+                base64Converter.encode("Hello World".getBytes()));
     }
 }
diff --git a/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java b/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java
index 4d437ab06..e9fad391f 100644
--- a/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.tools.ant.util;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -30,9 +31,15 @@ import static org.junit.Assert.assertNull;
  */
 public class GlobPatternMapperTest {
 
+    private GlobPatternMapper m;
+
+    @Before
+    public void setUp() {
+        m = new GlobPatternMapper();
+    }
+
     @Test
     public void testNoPatternAtAll() {
-        GlobPatternMapper m = new GlobPatternMapper();
         m.setFrom("foobar");
         m.setTo("baz");
         assertNull("Shouldn\'t match foobar", m.mapFileName("plonk"));
@@ -44,7 +51,6 @@ public class GlobPatternMapperTest {
 
     @Test
     public void testPostfixOnly() {
-        GlobPatternMapper m = new GlobPatternMapper();
         m.setFrom("*foo");
         m.setTo("*plonk");
         assertNull("Shouldn\'t match *foo", m.mapFileName("bar.baz"));
@@ -61,7 +67,6 @@ public class GlobPatternMapperTest {
 
     @Test
     public void testPrefixOnly() {
-        GlobPatternMapper m = new GlobPatternMapper();
         m.setFrom("foo*");
         m.setTo("plonk*");
         assertNull("Shouldn\'t match foo*", m.mapFileName("bar.baz"));
@@ -78,7 +83,6 @@ public class GlobPatternMapperTest {
 
     @Test
     public void testPreAndPostfix() {
-        GlobPatternMapper m = new GlobPatternMapper();
         m.setFrom("foo*bar");
         m.setTo("plonk*pling");
         assertNull("Shouldn\'t match foo*bar", m.mapFileName("bar.baz"));