Merge "Directly link to external documentation."
diff --git a/luni/src/test/java/libcore/java/util/logging/OldFileHandlerTest.java b/luni/src/test/java/libcore/java/util/logging/OldFileHandlerTest.java
index ead0b2e..c9f4d31 100644
--- a/luni/src/test/java/libcore/java/util/logging/OldFileHandlerTest.java
+++ b/luni/src/test/java/libcore/java/util/logging/OldFileHandlerTest.java
@@ -74,12 +74,12 @@
File file = new File(TEMPPATH + SEP + "log");
file.mkdir();
manager.readConfiguration(propertiesToInputStream(props));
- handler = new FileHandler();
r = new LogRecord(Level.CONFIG, "msg");
}
protected void tearDown() throws Exception {
if (null != handler) {
+ // Close handler created in setup to ensure that its lock is released.
handler.close();
}
reset(TEMPPATH + SEP + "log", "");
@@ -93,6 +93,7 @@
}
public void testFileHandler() throws Exception {
+ handler = new FileHandler();
assertEquals("character encoding is non equal to actual value",
"iso-8859-1", handler.getEncoding());
assertNotNull("Filter is null", handler.getFilter());
@@ -115,7 +116,6 @@
}
public void testFileHandler_1params() throws Exception {
-
handler = new FileHandler("%t/log/string");
assertEquals("character encoding is non equal to actual value",
"iso-8859-1", handler.getEncoding());
@@ -466,11 +466,10 @@
}
public void testClose() throws Exception {
- FileHandler h = new FileHandler("%t/log/stringPublish");
- h.publish(r);
- h.close();
- assertFileContent(TEMPPATH + SEP + "log", "stringPublish", h
- .getFormatter());
+ handler = new FileHandler("%t/log/stringPublish");
+ handler.publish(r);
+ handler.close();
+ assertFileContent(TEMPPATH + SEP + "log", "stringPublish", handler.getFormatter());
}
/*
diff --git a/mmodules/simple/api/intra/current-api.txt b/mmodules/simple/api/intra/current-api.txt
deleted file mode 100644
index fc2039b..0000000
--- a/mmodules/simple/api/intra/current-api.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 2.0
-package libcore.mmodule.simple {
-
- public class DemoSimpleClass {
- method public static String intraCoreDependencyMethod();
- method public static String simpleMethod();
- }
-
-}
-
diff --git a/mmodules/simple/api/intra/current-removed.txt b/mmodules/simple/api/intra/current-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/mmodules/simple/api/intra/current-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
