Skip to content

Commit 6851beb

Browse files
PiotrAniola82PiotrAniola82
authored
Merge pull request #3 from IBM/#2-optimise-testJavacoreSet
Fixes #2 optimised test_javacore_set.py
2 parents 91467a8 + 261baf1 commit 6851beb

File tree

1 file changed

+61
-56
lines changed

1 file changed

+61
-56
lines changed

‎test/test_javacore_set.py‎

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -12,130 +12,135 @@
1212

1313
class TestJavacoreSet(unittest.TestCase):
1414

15-
def setUp(self):
16-
self.snapshot = JavacoreSet("")
17-
self.javacore_set = JavacoreSet('data' + os.path.sep + 'javacores')
15+
@classmethod
16+
def setUpClass(self):
1817
javacores_path = os.getcwd() + os.sep + 'test' + os.sep + 'data' + os.sep + 'javacores'
19-
self.jset = self.javacore_set.create(javacores_path)
20-
self.jset.generate_tips()
18+
self.javacore_set_from_test_data = JavacoreSet(javacores_path)
19+
self.javacore_set_from_test_data = self.javacore_set_from_test_data.create(javacores_path)
20+
self.javacore_set_from_test_data.generate_tips()
21+
22+
def setUp(self):
23+
self.dummy_javacore_set = JavacoreSet("")
2124

2225
def test_parse_mem_arg(self):
2326
line = "2CIUSERARG -Xmx32g"
24-
mem = self.snapshot.parse_mem_arg(line)
27+
mem = self.dummy_javacore_set.parse_mem_arg(line)
2528
self.assertEqual(mem, "32g")
2629
#
2730
line = "2CIUSERARG -Xmx"
28-
mem = self.snapshot.parse_mem_arg(line)
31+
mem = self.dummy_javacore_set.parse_mem_arg(line)
2932
self.assertEqual(mem, UNKNOWN)
3033

3134
def test_parse_xmx(self):
3235
line = "2CIUSERARG -Xmx32g"
33-
self.snapshot.parse_xmx(line)
34-
self.assertEqual(self.snapshot.xmx, "32g")
36+
self.dummy_javacore_set.parse_xmx(line)
37+
self.assertEqual(self.dummy_javacore_set.xmx, "32g")
3538
#
3639
line = "2CIUSERARG -Xmxg"
37-
self.snapshot.parse_xmx(line)
38-
self.assertEqual(self.snapshot.xmx, UNKNOWN)
40+
self.dummy_javacore_set.parse_xmx(line)
41+
self.assertEqual(self.dummy_javacore_set.xmx, UNKNOWN)
3942

4043
def test_parse_xms(self):
4144
line = "2CIUSERARG -Xms32g"
42-
self.snapshot.parse_xms(line)
43-
self.assertEqual(self.snapshot.xms, "32g")
45+
self.dummy_javacore_set.parse_xms(line)
46+
self.assertEqual(self.dummy_javacore_set.xms, "32g")
4447
#
4548
line = "2CIUSERARG -Xmsg"
46-
self.snapshot.parse_xms(line)
47-
self.assertEqual(self.snapshot.xms, UNKNOWN)
49+
self.dummy_javacore_set.parse_xms(line)
50+
self.assertEqual(self.dummy_javacore_set.xms, UNKNOWN)
4851

4952
def test_parse_xmn(self):
5053
line = "2CIUSERARG -Xmn2g"
51-
self.snapshot.parse_xmn(line)
52-
self.assertEqual(self.snapshot.xmn, "2g")
54+
self.dummy_javacore_set.parse_xmn(line)
55+
self.assertEqual(self.dummy_javacore_set.xmn, "2g")
5356
#
5457
line = "2CIUSERARG -Xmng"
55-
self.snapshot.parse_xmn(line)
56-
self.assertEqual(self.snapshot.xmn, UNKNOWN)
58+
self.dummy_javacore_set.parse_xmn(line)
59+
self.assertEqual(self.dummy_javacore_set.xmn, UNKNOWN)
5760

5861
def test_parse_gc_policy(self):
5962
line = "2CIUSERARG -Xgcpolicy:gencon"
60-
self.snapshot.parse_gc_policy(line)
61-
self.assertEqual(self.snapshot.gc_policy, "gencon")
63+
self.dummy_javacore_set.parse_gc_policy(line)
64+
self.assertEqual(self.dummy_javacore_set.gc_policy, "gencon")
6265

6366
def test_parse_compressed_refs(self):
6467
line = "2CIUSERARG -Xcompressedrefs"
65-
self.snapshot.parse_compressed_refs(line)
66-
self.assertTrue(self.snapshot.compressed_refs)
68+
self.dummy_javacore_set.parse_compressed_refs(line)
69+
self.assertTrue(self.dummy_javacore_set.compressed_refs)
6770
#
6871
line = "2CIUSERARG -Xnocompressedrefs"
69-
self.snapshot.parse_compressed_refs(line)
70-
self.assertFalse(self.snapshot.compressed_refs)
72+
self.dummy_javacore_set.parse_compressed_refs(line)
73+
self.assertFalse(self.dummy_javacore_set.compressed_refs)
7174

7275
def test_parse_verbose_gc(self):
7376
line = ""
74-
self.snapshot.parse_verbose_gc(line)
75-
self.assertFalse(self.snapshot.verbose_gc)
77+
self.dummy_javacore_set.verbose_gc = False
78+
self.dummy_javacore_set.parse_verbose_gc(line)
79+
self.assertFalse(self.dummy_javacore_set.verbose_gc)
7680
#
7781
line = "2CIUSERARG -verbose:gc"
78-
self.snapshot.parse_verbose_gc(line)
79-
self.assertTrue(self.snapshot.verbose_gc)
82+
self.dummy_javacore_set.parse_verbose_gc(line)
83+
self.assertTrue(self.dummy_javacore_set.verbose_gc)
8084

8185
def test_parse_user_args(self):
8286
line = "2CIUSERARG -Xmx32g"
83-
self.snapshot.parse_user_args(line)
84-
self.assertEqual(self.snapshot.xmx, "32g")
85-
self.assertTrue("-Xmx32g" in self.snapshot.user_args)
87+
self.dummy_javacore_set.parse_user_args(line)
88+
self.assertEqual(self.dummy_javacore_set.xmx, "32g")
89+
self.assertTrue("-Xmx32g" in self.dummy_javacore_set.user_args)
8690
#
8791
line = "2CIUSERARG -Xms32g"
88-
self.snapshot.parse_user_args(line)
89-
self.assertEqual(self.snapshot.xms, "32g")
92+
self.dummy_javacore_set.parse_user_args(line)
93+
self.assertEqual(self.dummy_javacore_set.xms, "32g")
9094
#
9195
line = "2CIUSERARG -Xmn2g"
92-
self.snapshot.parse_user_args(line)
93-
self.assertEqual(self.snapshot.xmn, "2g")
96+
self.dummy_javacore_set.parse_user_args(line)
97+
self.assertEqual(self.dummy_javacore_set.xmn, "2g")
9498
#
9599
line = "2CIUSERARG -Xgcpolicy:gencon"
96-
self.snapshot.parse_user_args(line)
97-
self.assertEqual(self.snapshot.gc_policy, "gencon")
100+
self.dummy_javacore_set.parse_user_args(line)
101+
self.assertEqual(self.dummy_javacore_set.gc_policy, "gencon")
98102
#
99103
line = "2CIUSERARG -Xcompressedrefs"
100-
self.snapshot.parse_user_args(line)
101-
self.assertTrue(self.snapshot.compressed_refs)
104+
self.dummy_javacore_set.parse_user_args(line)
105+
self.assertTrue(self.dummy_javacore_set.compressed_refs)
102106
#
103107
line = "2CIUSERARG -Xnocompressedrefs"
104-
self.snapshot.parse_user_args(line)
105-
self.assertFalse(self.snapshot.compressed_refs)
108+
self.dummy_javacore_set.parse_user_args(line)
109+
self.assertFalse(self.dummy_javacore_set.compressed_refs)
106110
#
107111
line = ""
108-
self.snapshot.parse_user_args(line)
109-
self.assertFalse(self.snapshot.verbose_gc)
112+
self.dummy_javacore_set.parse_user_args(line)
113+
self.assertFalse(self.dummy_javacore_set.verbose_gc)
110114
#
111115
line = "2CIUSERARG -verbose:gc"
112-
self.snapshot.parse_user_args(line)
113-
self.assertTrue(self.snapshot.verbose_gc)
114-
self.assertTrue("-verbose:gc" in self.snapshot.user_args)
116+
self.dummy_javacore_set.parse_user_args(line)
117+
self.assertTrue(self.dummy_javacore_set.verbose_gc)
118+
self.assertTrue("-verbose:gc" in self.dummy_javacore_set.user_args)
115119

116120
line = "2CIUSERARG -Ddefault.client.encoding=UTF-8"
117-
self.snapshot.parse_user_args(line)
118-
self.assertTrue("-Ddefault.client.encoding=UTF-8" in self.snapshot.user_args)
121+
self.dummy_javacore_set.parse_user_args(line)
122+
self.assertTrue("-Ddefault.client.encoding=UTF-8" in self.dummy_javacore_set.user_args)
119123

120124
def test_sort_snapshots(self):
121125
# tested in test_java_thread.py in function test_sort_snapshots
122126
pass
123127

124128
def test_parse_javacores_contain_valid_file(self):
125-
self.assertTrue(self.jset.files.index('javacore.20220606.114458.32888.0001.txt') >= 0) #Object is on the list
129+
self.assertTrue(self.javacore_set_from_test_data.files.index('javacore.20220606.114458.32888.0001.txt') >= 0) #Object is on the list
126130

127131
def test_parse_javacores_not_contain_wrong_file(self):
128132
# Check whether javacore.wrong.corr is in the list
129133
with self.assertRaises(ValueError):
130-
self.jset.files.index('javacore.wrong.corr')
134+
self.javacore_set_from_test_data.files.index('javacore.wrong.corr')
131135

132136
# Note: the test below rely on the javacores stored in test directory
133137
def test_have_tips(self):
134-
self.assertTrue(any("OutOfMemoryError" in tip for tip in self.jset.tips))
135-
self.assertTrue(any("[WARNING] The time interval between javacore" in tip for tip in self.jset.tips))
138+
self.assertTrue(any("OutOfMemoryError" in tip for tip in self.javacore_set_from_test_data.tips))
139+
self.assertTrue(any("[WARNING] The time interval between javacore" in tip for tip in
140+
self.javacore_set_from_test_data.tips))
136141

137142
# Note: the test below rely on the javacores stored in test directory
138143
def test_generate_blocked_snapshots_list(self):
139-
self.assertEqual(len(self.jset.blocked_snapshots),7, "The javacores from test dir have different number of "
140-
"blocking threads")
141-
self.assertEqual(len(self.jset.blocked_snapshots[0].get_threads_set()), 14)
144+
self.assertEqual(len(self.javacore_set_from_test_data.blocked_snapshots), 7,
145+
"The javacores from test dir have different number of blocking threads")
146+
self.assertEqual(len(self.javacore_set_from_test_data.blocked_snapshots[0].get_threads_set()), 14)

0 commit comments

Comments
 (0)