Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a4466fbe61 (719831b9) · Commits · e / os / android_frameworks_base

core/tests/utiltests/src/com/android/internal/util/FileRotatorTest.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ import android.util.Log;

		import com.android.internal.util.FileRotator.Reader;
		import com.android.internal.util.FileRotator.Writer;
		import com.android.internal.util.test.FsUtil;

		import com.google.android.collect.Lists;

		import java.io.DataInputStream;
		@@ -38,15 +40,10 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.net.ProtocolException;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Random;

		import junit.framework.Assert;

		import libcore.io.IoUtils;

		/**
		* Tests for {@link FileRotator}.
		*/
		@@ -67,7 +64,7 @@ public class FileRotatorTest extends AndroidTestCase {
		super.setUp();

		mBasePath = getContext().getFilesDir();
		IoUtils.deleteContents(mBasePath);
		FsUtil.deleteContents(mBasePath);
		}

		public void testEmpty() throws Exception {

+3 −2

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.frameworks.tests.net.R;
		import com.android.internal.util.test.FsUtil;

		import libcore.io.IoUtils;
		import libcore.io.Streams;
		@@ -71,7 +72,7 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest {
		public void setUp() throws Exception {
		mTestProc = new File(InstrumentationRegistry.getContext().getFilesDir(), "proc");
		if (mTestProc.exists()) {
		IoUtils.deleteContents(mTestProc);
		FsUtil.deleteContents(mTestProc);
		}

		// The libandroid_servers which have the native method is not available to
		@@ -87,7 +88,7 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest {
		mFactory = null;

		if (mTestProc.exists()) {
		IoUtils.deleteContents(mTestProc);
		FsUtil.deleteContents(mTestProc);
		}
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -112,13 +112,12 @@ import androidx.test.runner.AndroidJUnit4;

		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.test.BroadcastInterceptingContext;
		import com.android.internal.util.test.FsUtil;
		import com.android.server.net.NetworkStatsService.NetworkStatsSettings;
		import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;
		import com.android.testutils.HandlerUtils;
		import com.android.testutils.TestableNetworkStatsProviderBinder;

		import libcore.io.IoUtils;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Ignore;
		@@ -215,7 +214,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
		mServiceContext = new MockContext(context);
		mStatsDir = context.getFilesDir();
		if (mStatsDir.exists()) {
		IoUtils.deleteContents(mStatsDir);
		FsUtil.deleteContents(mStatsDir);
		}

		PowerManager powerManager = (PowerManager) mServiceContext.getSystemService(
		@@ -285,7 +284,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {

		@After
		public void tearDown() throws Exception {
		IoUtils.deleteContents(mStatsDir);
		FsUtil.deleteContents(mStatsDir);

		mServiceContext = null;
		mStatsDir = null;

+2 −2

Original line number	Diff line number	Diff line
		@@ -159,13 +159,13 @@ import androidx.test.runner.AndroidJUnit4;

		import com.android.internal.util.test.BroadcastInterceptingContext;
		import com.android.internal.util.test.BroadcastInterceptingContext.FutureIntent;
		import com.android.internal.util.test.FsUtil;
		import com.android.server.DeviceIdleInternal;
		import com.android.server.LocalServices;
		import com.android.server.usage.AppStandbyInternal;

		import com.google.common.util.concurrent.AbstractFuture;

		import libcore.io.IoUtils;
		import libcore.io.Streams;

		import org.junit.After;
		@@ -2347,7 +2347,7 @@ public class NetworkPolicyManagerServiceTest {
		private void setNetpolicyXml(Context context) throws Exception {
		mPolicyDir = context.getFilesDir();
		if (mPolicyDir.exists()) {
		IoUtils.deleteContents(mPolicyDir);
		FsUtil.deleteContents(mPolicyDir);
		}
		if (!TextUtils.isEmpty(mNetpolicyXml)) {
		final String assetPath = NETPOLICY_DIR + "/" + mNetpolicyXml;

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.util.test;

		import java.io.File;

		public class FsUtil {

		/**
		* Deletes all files under a given directory. Deliberately ignores errors, on the assumption
		* that test cleanup is only supposed to be best-effort.
		*
		* @param dir directory to clear its contents
		*/
		public static void deleteContents(File dir) {
		File[] files = dir.listFiles();
		if (files != null) {
		for (File file : files) {
		if (file.isDirectory()) {
		deleteContents(file);
		}
		file.delete();
		}
		}
		}
		}