From 8da8efcc36a53765750fbd515b0eab2d85e901c6 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 4 Jan 2017 16:14:18 +0100
Subject: [PATCH] Cleanup (minor optimization in tests)

---
 .../util/io/FileAttributesReadingTest.java    | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java b/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
index 002924272e85..09dd2d15eb29 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,10 +34,9 @@ import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 public abstract class FileAttributesReadingTest {
-
   public static class MainTest extends FileAttributesReadingTest {
     @BeforeClass
-    public static void checkMediator() {
+    public static void setUpClass() {
       FileSystemUtil.resetMediator();
       assertEquals(SystemInfo.isWindows ? "IdeaWin32" : "JnaUnix", FileSystemUtil.getMediatorName());
     }
@@ -46,18 +45,10 @@ public abstract class FileAttributesReadingTest {
   public static class Nio2Test extends FileAttributesReadingTest {
     @BeforeClass
     public static void setUpClass() {
-      assumeTrue(SystemInfo.isJavaVersionAtLeast("1.7"));
-
       System.setProperty(FileSystemUtil.FORCE_USE_NIO2_KEY, "true");
       FileSystemUtil.resetMediator();
       assertEquals("Nio2", FileSystemUtil.getMediatorName());
     }
-
-    @AfterClass
-    public static void tearDownClass() {
-      System.clearProperty(FileSystemUtil.FORCE_USE_NIO2_KEY);
-      FileSystemUtil.resetMediator();
-    }
   }
 
   public static class FallbackTest extends FileAttributesReadingTest {
@@ -68,12 +59,6 @@ public abstract class FileAttributesReadingTest {
       assertEquals("Fallback", FileSystemUtil.getMediatorName());
     }
 
-    @AfterClass
-    public static void tearDownClass() {
-      System.clearProperty(FileSystemUtil.FORCE_USE_FALLBACK_KEY);
-      FileSystemUtil.resetMediator();
-    }
-
     @Override public void linkToFile() { }
     @Override public void doubleLink() { }
     @Override public void linkToDirectory() { }
@@ -82,6 +67,13 @@ public abstract class FileAttributesReadingTest {
     @Override public void junction() { }
   }
 
+  @AfterClass
+  public static void tearDownClass() {
+    System.clearProperty(FileSystemUtil.FORCE_USE_NIO2_KEY);
+    System.clearProperty(FileSystemUtil.FORCE_USE_FALLBACK_KEY);
+    FileSystemUtil.resetMediator();
+  }
+
   private final byte[] myTestData = {'t', 'e', 's', 't'};
   private File myTempDirectory;