Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
rockchip_libcore
Commits
6a8d5d27
Commit
6a8d5d27
authored
13 years ago
by
Jesse Wilson
Browse files
Options
Download
Email Patches
Plain Diff
Drop security manager tests from OldJarFileTest.
Change-Id: I24d60b6db32409ed84a81f4a067e3c60e2817493
parent
cf216b0b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
162 deletions
+31
-162
luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java
luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java
+31
-162
No files found.
luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java
View file @
6a8d5d27
...
...
@@ -19,7 +19,6 @@ package libcore.java.util.jar;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.security.Permission
;
import
java.util.jar.JarEntry
;
import
java.util.jar.JarFile
;
import
java.util.zip.ZipException
;
...
...
@@ -31,72 +30,24 @@ public class OldJarFileTest extends TestCase {
private
final
String
jarName
=
"hyts_patch.jar"
;
// a 'normal' jar file
private
final
String
entryName
=
"foo/bar/A.class"
;
private
File
resources
;
private
File
resources
=
Support_Resources
.
createTempFolder
()
;
// custom security manager
SecurityManager
sm
=
new
SecurityManager
()
{
final
String
forbidenPermissionName
=
"user.dir"
;
public
void
checkPermission
(
Permission
perm
)
{
if
(
perm
.
getName
().
equals
(
forbidenPermissionName
))
{
throw
new
SecurityException
();
}
}
};
@Override
protected
void
setUp
()
{
resources
=
Support_Resources
.
createTempFolder
();
}
/**
* java.util.jar.JarFile#JarFile(java.io.File)
*/
public
void
test_ConstructorLjava_io_File
()
throws
IOException
{
try
{
new
JarFile
(
new
File
(
"Wrong.file"
));
fail
(
"Should throw IOException"
);
}
catch
(
IOException
e
)
{
// expected
}
SecurityManager
oldSm
=
System
.
getSecurityManager
();
System
.
setSecurityManager
(
sm
);
try
{
new
JarFile
(
new
File
(
"tmp.jar"
));
fail
(
"Should throw SecurityException"
);
}
catch
(
IOException
e
)
{
fail
(
"Should throw SecurityException"
);
}
catch
(
SecurityException
e
)
{
// expected
}
finally
{
System
.
setSecurityManager
(
oldSm
);
}
catch
(
IOException
expected
)
{
}
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
new
JarFile
(
new
File
(
resources
,
jarName
));
}
/**
* java.util.jar.JarFile#JarFile(java.lang.String)
*/
public
void
test_ConstructorLjava_lang_String
()
throws
IOException
{
try
{
new
JarFile
(
"Wrong.file"
);
fail
(
"Should throw IOException"
);
}
catch
(
IOException
e
)
{
// expected
}
SecurityManager
oldSm
=
System
.
getSecurityManager
();
System
.
setSecurityManager
(
sm
);
try
{
new
JarFile
(
"tmp.jar"
);
fail
(
"Should throw SecurityException"
);
}
catch
(
IOException
e
)
{
fail
(
"Should throw SecurityException"
);
}
catch
(
SecurityException
e
)
{
// expected
}
finally
{
System
.
setSecurityManager
(
oldSm
);
}
catch
(
IOException
expected
)
{
}
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
...
...
@@ -104,27 +55,11 @@ public class OldJarFileTest extends TestCase {
new
JarFile
(
fileName
);
}
/**
* java.util.jar.JarFile#JarFile(java.lang.String, boolean)
*/
public
void
test_ConstructorLjava_lang_StringZ
()
throws
IOException
{
try
{
new
JarFile
(
"Wrong.file"
,
false
);
fail
(
"Should throw IOException"
);
}
catch
(
IOException
e
)
{
// expected
}
SecurityManager
oldSm
=
System
.
getSecurityManager
();
System
.
setSecurityManager
(
sm
);
try
{
new
JarFile
(
"tmp.jar"
,
true
);
fail
(
"Should throw SecurityException"
);
}
catch
(
IOException
e
)
{
fail
(
"Should throw SecurityException"
);
}
catch
(
SecurityException
e
)
{
// expected
}
finally
{
System
.
setSecurityManager
(
oldSm
);
}
catch
(
IOException
expected
)
{
}
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
...
...
@@ -132,80 +67,38 @@ public class OldJarFileTest extends TestCase {
new
JarFile
(
fileName
,
true
);
}
/**
* java.util.jar.JarFile#JarFile(java.io.File, boolean)
*/
public
void
test_ConstructorLjava_io_FileZ
()
throws
IOException
{
try
{
new
JarFile
(
new
File
(
"Wrong.file"
),
true
);
fail
(
"Should throw IOException"
);
}
catch
(
IOException
e
)
{
// expected
}
SecurityManager
oldSm
=
System
.
getSecurityManager
();
System
.
setSecurityManager
(
sm
);
try
{
new
JarFile
(
new
File
(
"tmp.jar"
),
false
);
fail
(
"Should throw SecurityException"
);
}
catch
(
IOException
e
)
{
fail
(
"Should throw SecurityException"
);
}
catch
(
SecurityException
e
)
{
// expected
}
finally
{
System
.
setSecurityManager
(
oldSm
);
}
catch
(
IOException
expected
)
{
}
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
new
JarFile
(
new
File
(
resources
,
jarName
),
false
);
}
/**
* java.util.jar.JarFile#JarFile(java.io.File, boolean, int)
*/
public
void
test_ConstructorLjava_io_FileZI
()
{
public
void
test_ConstructorLjava_io_FileZI
()
throws
IOException
{
try
{
new
JarFile
(
new
File
(
"Wrong.file"
),
true
,
ZipFile
.
OPEN_READ
);
fail
(
"Should throw IOException"
);
}
catch
(
IOException
e
)
{
// expected
}
SecurityManager
oldSm
=
System
.
getSecurityManager
();
System
.
setSecurityManager
(
sm
);
try
{
new
JarFile
(
new
File
(
"tmp.jar"
),
false
,
ZipFile
.
OPEN_READ
);
fail
(
"Should throw SecurityException"
);
}
catch
(
IOException
e
)
{
fail
(
"Should throw SecurityException"
);
}
catch
(
SecurityException
e
)
{
// expected
}
finally
{
System
.
setSecurityManager
(
oldSm
);
}
catch
(
IOException
expected
)
{
}
try
{
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
new
JarFile
(
new
File
(
resources
,
jarName
),
false
,
ZipFile
.
OPEN_READ
);
}
catch
(
IOException
e
)
{
fail
(
"Should not throw IOException"
);
}
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
new
JarFile
(
new
File
(
resources
,
jarName
),
false
,
ZipFile
.
OPEN_READ
);
try
{
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
new
JarFile
(
new
File
(
resources
,
jarName
),
false
,
ZipFile
.
OPEN_READ
|
ZipFile
.
OPEN_DELETE
+
33
);
fail
(
"Should throw IllegalArgumentException"
);
}
catch
(
IOException
e
)
{
fail
(
"Should not throw IOException"
);
}
catch
(
IllegalArgumentException
e
)
{
// expected
}
catch
(
IllegalArgumentException
expected
)
{
}
}
public
void
test_close
()
throws
IOException
{
String
modifiedJarName
=
"Modified_SF_EntryAttributes.jar"
;
Support_Resources
.
copyFile
(
resources
,
null
,
modifiedJarName
);
...
...
@@ -218,67 +111,44 @@ public class OldJarFileTest extends TestCase {
// Can not check IOException
}
/**
* @throws IOException
* java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry)
*/
public
void
test_getInputStreamLjava_util_jar_JarEntry
()
throws
IOException
{
File
localFile
=
null
;
try
{
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
localFile
=
new
File
(
resources
,
jarName
);
}
catch
(
Exception
e
)
{
fail
(
"Failed to create local file: "
+
e
);
}
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
File
localFile
=
new
File
(
resources
,
jarName
);
byte
[]
b
=
new
byte
[
1024
];
try
{
JarFile
jf
=
new
JarFile
(
localFile
);
java
.
io
.
InputStream
is
=
jf
.
getInputStream
(
jf
.
getEntry
(
entryName
));
// BEGIN android-removed
// jf.close();
// END android-removed
assertTrue
(
"Returned invalid stream"
,
is
.
available
()
>
0
);
int
r
=
is
.
read
(
b
,
0
,
1024
);
is
.
close
();
StringBuffer
sb
=
new
StringBuffer
(
r
);
for
(
int
i
=
0
;
i
<
r
;
i
++)
{
sb
.
append
((
char
)
(
b
[
i
]
&
0xff
));
}
String
contents
=
sb
.
toString
();
assertTrue
(
"Incorrect stream read"
,
contents
.
indexOf
(
"bar"
)
>
0
);
// BEGIN android-added
jf
.
close
();
// END android-added
}
catch
(
Exception
e
)
{
fail
(
"Exception during test: "
+
e
.
toString
());
JarFile
jf
=
new
JarFile
(
localFile
);
InputStream
is
=
jf
.
getInputStream
(
jf
.
getEntry
(
entryName
));
assertTrue
(
"Returned invalid stream"
,
is
.
available
()
>
0
);
int
r
=
is
.
read
(
b
,
0
,
1024
);
is
.
close
();
StringBuilder
stringBuffer
=
new
StringBuilder
(
r
);
for
(
int
i
=
0
;
i
<
r
;
i
++)
{
stringBuffer
.
append
((
char
)
(
b
[
i
]
&
0xff
));
}
String
contents
=
stringBuffer
.
toString
();
assertTrue
(
"Incorrect stream read"
,
contents
.
indexOf
(
"bar"
)
>
0
);
jf
.
close
();
try
{
JarFile
jf
=
new
JarFile
(
localFile
);
InputStream
in
=
jf
.
getInputStream
(
new
JarEntry
(
"invalid"
));
assertNull
(
"Got stream for non-existent entry"
,
in
);
}
catch
(
Exception
e
)
{
fail
(
"Exception during test 2: "
+
e
);
}
jf
=
new
JarFile
(
localFile
);
InputStream
in
=
jf
.
getInputStream
(
new
JarEntry
(
"invalid"
));
assertNull
(
"Got stream for non-existent entry"
,
in
);
try
{
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
File
signedFile
=
new
File
(
resources
,
jarName
);
JarFile
jf
=
new
JarFile
(
signedFile
);
jf
=
new
JarFile
(
signedFile
);
JarEntry
jre
=
new
JarEntry
(
"foo/bar/A.class"
);
jf
.
getInputStream
(
jre
);
// InputStream returned in any way, exception can be thrown in case
// of reading from this stream only.
// fail("Should throw ZipException");
}
catch
(
ZipException
ee
)
{
// expected
}
catch
(
ZipException
expected
)
{
}
try
{
Support_Resources
.
copyFile
(
resources
,
null
,
jarName
);
File
signedFile
=
new
File
(
resources
,
jarName
);
JarFile
jf
=
new
JarFile
(
signedFile
);
jf
=
new
JarFile
(
signedFile
);
JarEntry
jre
=
new
JarEntry
(
"foo/bar/A.class"
);
jf
.
close
();
jf
.
getInputStream
(
jre
);
...
...
@@ -286,8 +156,7 @@ public class OldJarFileTest extends TestCase {
// of reading from this stream only.
// The same for IOException
fail
(
"Should throw IllegalStateException"
);
}
catch
(
IllegalStateException
ee
)
{
// expected
}
catch
(
IllegalStateException
expected
)
{
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment