@@ -27,40 +27,36 @@ public class ResourceLoaderTest {
2727 @ Test
2828 public void testGetInputStreamResourceKey () throws Exception {
2929
30+ FileDefaultConfig .DEFAULT_FILE_PARAMS .remove ("key1" );
31+ FileDefaultConfig .DEFAULT_FILE_PARAMS .remove ("key2" );
32+
3033 Field field = ResourceLoader .class .getDeclaredField ("RESOURCE_CACHE" );
3134 field .setAccessible (true );
3235
3336 Map <String , RdfFileResourceSpi > resourceMap = ( Map <String , RdfFileResourceSpi >)field .get (null );
34- Assert .assertTrue (resourceMap .isEmpty ());
3537
3638 getInputStream ("aa/bb/cc/dd.json" );
37- Assert .assertEquals (1 , resourceMap .size ());
3839 Assert .assertNotNull (resourceMap .get ("classpath" ));
3940
4041 getInputStream ("classpath:aa/bb/cc/dd.json" );
41- Assert .assertEquals (1 , resourceMap .size ());
4242 Assert .assertNotNull (resourceMap .get ("classpath" ));
4343
4444 getInputStream ("classpath:aa/bb/cc/dd.json?resourceKey=hzconfig" );
45- Assert .assertEquals (2 , resourceMap .size ());
4645 Assert .assertNotNull (resourceMap .get ("classpath" ));
4746 Assert .assertNotNull (resourceMap .get ("classpathhzconfig" ));
4847
4948 getInputStream ("classpath:aa/bb/cc/dd.json?resourceKey=shconfig" );
50- Assert .assertEquals (3 , resourceMap .size ());
5149 Assert .assertNotNull (resourceMap .get ("classpath" ));
5250 Assert .assertNotNull (resourceMap .get ("classpathshconfig" ));
5351
5452 getInputStream ("classpath:aa/bb/cc/dd.json?resourceKey=shconfig&xx=dd" );
55- Assert .assertEquals (3 , resourceMap .size ());
5653 Assert .assertNotNull (resourceMap .get ("classpath" ));
5754 Assert .assertNotNull (resourceMap .get ("classpathhzconfig" ));
5855 Assert .assertNotNull (resourceMap .get ("classpathshconfig" ));
5956
6057
6158 TestResource .TestInputStream testInputStream = (TestResource .TestInputStream )ResourceLoader .getInputStream ("testResource:aa/bb/cc/dd.json" );
6259
63- Assert .assertEquals (4 , resourceMap .size ());
6460 Assert .assertNotNull (resourceMap .get ("classpath" ));
6561 Assert .assertNotNull (resourceMap .get ("classpathhzconfig" ));
6662 Assert .assertNotNull (resourceMap .get ("classpathshconfig" ));
@@ -83,31 +79,35 @@ public void testGetInputStreamResourceKey() throws Exception{
8379 });
8480
8581 testInputStream = (TestResource .TestInputStream )ResourceLoader .getInputStream ("testResource:aa/bb/cc/dd.json?resourceKey=key1" );
86- Assert .assertEquals (5 , resourceMap .size ());
8782 Assert .assertNotNull (resourceMap .get ("classpath" ));
8883 Assert .assertNotNull (resourceMap .get ("classpathhzconfig" ));
8984 Assert .assertNotNull (resourceMap .get ("classpathshconfig" ));
9085 Assert .assertNotNull (resourceMap .get ("testResource" ));
9186 Assert .assertNotNull (resourceMap .get ("testResourcekey1" ));
9287
88+ RdfFileResourceSpi pre = resourceMap .get ("testResourcekey1" );
89+
9390 // 重复看看缓存
9491 testInputStream = (TestResource .TestInputStream )ResourceLoader .getInputStream ("testResource:aa/bb/cc/dd.json?resourceKey=key1" );
95- Assert .assertEquals (5 , resourceMap .size ());
9692 Assert .assertNotNull (resourceMap .get ("classpath" ));
9793 Assert .assertNotNull (resourceMap .get ("classpathhzconfig" ));
9894 Assert .assertNotNull (resourceMap .get ("classpathshconfig" ));
9995 Assert .assertNotNull (resourceMap .get ("testResource" ));
10096 Assert .assertNotNull (resourceMap .get ("testResourcekey1" ));
10197 Assert .assertEquals ("key1" , testInputStream .getConfig ().getParam ("type" ));
98+ Assert .assertEquals (pre , resourceMap .get ("testResourcekey1" ));
10299
103100 testInputStream = (TestResource .TestInputStream )ResourceLoader .getInputStream ("testResource:aa/bb/cc/dd.json?resourceKey=key2" );
104- Assert .assertEquals (6 , resourceMap .size ());
105101 Assert .assertNotNull (resourceMap .get ("classpath" ));
106102 Assert .assertNotNull (resourceMap .get ("classpathhzconfig" ));
107103 Assert .assertNotNull (resourceMap .get ("classpathshconfig" ));
108104 Assert .assertNotNull (resourceMap .get ("testResource" ));
109105 Assert .assertNotNull (resourceMap .get ("testResourcekey1" ));
110106 Assert .assertNotNull (resourceMap .get ("testResourcekey2" ));
111107 Assert .assertEquals ("key2" , testInputStream .getConfig ().getParam ("type" ));
108+
109+ FileDefaultConfig .DEFAULT_FILE_PARAMS .remove ("key1" );
110+ FileDefaultConfig .DEFAULT_FILE_PARAMS .remove ("key2" );
111+
112112 }
113113}
0 commit comments