Skip to content

Commit 71c7ab6

Browse files
ddsharpeddsharpe
authored
remove public identifiers from test methods per JUnit5 (#1106)
* remove public identifiers from test methods per JUnit5 * remove unused variable
1 parent 53ff946 commit 71c7ab6

File tree

2 files changed

+29
-31
lines changed

2 files changed

+29
-31
lines changed

‎core/src/main/java/oracle/weblogic/deploy/json/JsonStreamTranslator.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ public JsonStreamTranslator(String streamFileName, InputStream jsonStream, boole
5454
*/
5555
@Override
5656
public PyDictionary parse() throws JsonException {
57-
final String METHOD = "parse";
58-
5957
PyDictionary result = null;
6058
if (jsonStream != null) {
6159
try {

‎system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private static PrintWriter getTestMethodWriter(TestInfo testInfo) throws IOExcep
109109
@Order(1)
110110
@Tag("gate")
111111
@Test
112-
public void test01CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
112+
void test01CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
113113
String cmd = createDomainScript + " -oracle_home " + mwhome_12213;
114114
try (PrintWriter out = getTestMethodWriter(testInfo)) {
115115
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
@@ -126,7 +126,7 @@ public void test01CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
126126
@Order(2)
127127
@Tag("gate")
128128
@Test
129-
public void test02CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
129+
void test02CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
130130
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_type WLS";
131131
try (PrintWriter out = getTestMethodWriter(testInfo)) {
132132
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
@@ -144,7 +144,7 @@ public void test02CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
144144
@Order(3)
145145
@Tag("gate")
146146
@Test
147-
public void test03CreateDomainNoModelfile(TestInfo testInfo) throws Exception {
147+
void test03CreateDomainNoModelfile(TestInfo testInfo) throws Exception {
148148
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir;
149149
try (PrintWriter out = getTestMethodWriter(testInfo)) {
150150
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
@@ -162,7 +162,7 @@ public void test03CreateDomainNoModelfile(TestInfo testInfo) throws Exception {
162162
@Order(4)
163163
@Tag("gate")
164164
@Test
165-
public void test04CreateDomainNoArchivefile(TestInfo testInfo) throws Exception {
165+
void test04CreateDomainNoArchivefile(TestInfo testInfo) throws Exception {
166166
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir +
167167
" -model_file " + getSampleModelFile("-constant") ;
168168
try (PrintWriter out = getTestMethodWriter(testInfo)) {
@@ -181,7 +181,7 @@ public void test04CreateDomainNoArchivefile(TestInfo testInfo) throws Exception
181181
@Order(5)
182182
@Tag("gate")
183183
@Test
184-
public void test05CreateDomain(TestInfo testInfo) throws Exception {
184+
void test05CreateDomain(TestInfo testInfo) throws Exception {
185185
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir +
186186
" -model_file " + getSampleModelFile("-constant") +
187187
" -archive_file " + getSampleArchiveFile();
@@ -202,7 +202,7 @@ public void test05CreateDomain(TestInfo testInfo) throws Exception {
202202
@Order(6)
203203
@Tag("gate")
204204
@Test
205-
public void test06CreateDomainDifferentDomainName(TestInfo testInfo) throws Exception {
205+
void test06CreateDomainDifferentDomainName(TestInfo testInfo) throws Exception {
206206
String cmd = createDomainScript
207207
+ " -oracle_home " + mwhome_12213
208208
+ " -domain_home " + domainParentDir + FS + "domain2"
@@ -222,7 +222,7 @@ public void test06CreateDomainDifferentDomainName(TestInfo testInfo) throws Exce
222222
@Order(7)
223223
@Tag("gate")
224224
@Test
225-
public void test07CreateDomainWLSType(TestInfo testInfo) throws Exception {
225+
void test07CreateDomainWLSType(TestInfo testInfo) throws Exception {
226226
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
227227
domainParentDir + FS + "domain2 -model_file " +
228228
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
@@ -242,7 +242,7 @@ public void test07CreateDomainWLSType(TestInfo testInfo) throws Exception {
242242
@Order(8)
243243
@Tag("gate")
244244
@Test
245-
public void test08CreateDomainNoVariableFile(TestInfo testInfo) throws Exception {
245+
void test08CreateDomainNoVariableFile(TestInfo testInfo) throws Exception {
246246
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir +
247247
" -model_file " + getSampleModelFile("1") +
248248
" -archive_file " + getSampleArchiveFile() ;
@@ -262,7 +262,7 @@ public void test08CreateDomainNoVariableFile(TestInfo testInfo) throws Exception
262262
@Order(9)
263263
@Tag("gate")
264264
@Test
265-
public void test09CreateDomainWithVariableFile(TestInfo testInfo) throws Exception {
265+
void test09CreateDomainWithVariableFile(TestInfo testInfo) throws Exception {
266266
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
267267
domainParentDir + FS + "domain2 -model_file " +
268268
getSampleModelFile("1") + " -archive_file " + getSampleArchiveFile() +
@@ -282,7 +282,7 @@ public void test09CreateDomainWithVariableFile(TestInfo testInfo) throws Excepti
282282
@Order(10)
283283
@Tag("gate")
284284
@Test
285-
public void test10CreateDomainWithWlstPath(TestInfo testInfo) throws Exception {
285+
void test10CreateDomainWithWlstPath(TestInfo testInfo) throws Exception {
286286
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
287287
domainParentDir + FS + "domain2 -model_file " +
288288
getSampleModelFile("1") + " -archive_file " + getSampleArchiveFile() +
@@ -303,7 +303,7 @@ public void test10CreateDomainWithWlstPath(TestInfo testInfo) throws Exception {
303303
@Order(11)
304304
@Tag("gate")
305305
@Test
306-
public void test11CreateDomainWithOracleCommonWlstPath(TestInfo testInfo) throws Exception {
306+
void test11CreateDomainWithOracleCommonWlstPath(TestInfo testInfo) throws Exception {
307307
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
308308
domainParentDir + FS + "domain2 -model_file " +
309309
getSampleModelFile("1") + " -archive_file " + getSampleArchiveFile() +
@@ -324,7 +324,7 @@ public void test11CreateDomainWithOracleCommonWlstPath(TestInfo testInfo) throws
324324
@Order(12)
325325
@Tag("gate")
326326
@Test
327-
public void test12CreateJRFDomainNoRunRCU(TestInfo testInfo) throws Exception {
327+
void test12CreateJRFDomainNoRunRCU(TestInfo testInfo) throws Exception {
328328
try (PrintWriter out = getTestMethodWriter(testInfo)) {
329329
Path source = Paths.get(getSampleModelFile("2"));
330330
Path modelOut = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "2.yaml");
@@ -349,7 +349,7 @@ public void test12CreateJRFDomainNoRunRCU(TestInfo testInfo) throws Exception {
349349
@Order(13)
350350
@Tag("gate")
351351
@Test
352-
public void test13CreateJRFDomainRunRCU(TestInfo testInfo) throws Exception {
352+
void test13CreateJRFDomainRunRCU(TestInfo testInfo) throws Exception {
353353
waitForDatabase();
354354
try (PrintWriter out = getTestMethodWriter(testInfo)) {
355355
Path source = Paths.get(getSampleModelFile("2"));
@@ -378,7 +378,7 @@ public void test13CreateJRFDomainRunRCU(TestInfo testInfo) throws Exception {
378378
@Order(14)
379379
@Tag("gate")
380380
@Test
381-
public void test14OnlineUpdate1(TestInfo testInfo) throws Exception {
381+
void test14OnlineUpdate1(TestInfo testInfo) throws Exception {
382382
assumeTrue(rcuDomainCreated, "testDOnlineUpdate skipped because testDCreateJRFDomainRunRCU failed");
383383

384384
// Setup boot.properties
@@ -423,7 +423,7 @@ public void test14OnlineUpdate1(TestInfo testInfo) throws Exception {
423423
@Order(15)
424424
@Tag("gate")
425425
@Test
426-
public void test15OnlineUpdate2(TestInfo testInfo) throws Exception {
426+
void test15OnlineUpdate2(TestInfo testInfo) throws Exception {
427427
assumeTrue(rcuDomainCreated, "testDOnlineUpdate2 skipped because testDCreateJRFDomainRunRCU failed");
428428

429429
String domainHome = domainParentDir + FS + "jrfDomain1";
@@ -464,7 +464,7 @@ public void test15OnlineUpdate2(TestInfo testInfo) throws Exception {
464464
@Order(16)
465465
@Tag("gate")
466466
@Test
467-
public void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception {
467+
void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception {
468468
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
469469
domainParentDir + FS + "restrictedJRFD1 -model_file " +
470470
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
@@ -485,7 +485,7 @@ public void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception
485485
@Order(17)
486486
@Tag("gate")
487487
@Test
488-
public void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exception {
488+
void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exception {
489489
try (PrintWriter out = getTestMethodWriter(testInfo)) {
490490
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
491491
String cmd = discoverDomainScript
@@ -528,7 +528,7 @@ private void verifyFDiscoverDomainWithRequiredArgument(String expectedModelFile)
528528
@Order(18)
529529
@Tag("gate")
530530
@Test
531-
public void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
531+
void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
532532
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
533533
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
534534
String cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
@@ -552,7 +552,7 @@ public void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exceptio
552552
@Order(19)
553553
@Tag("gate")
554554
@Test
555-
public void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
555+
void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
556556
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
557557
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
558558
Path discoveredVariableFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.properties");
@@ -589,7 +589,7 @@ private void verifyGDiscoverDomainWithVariableFile(String expectedModelFile) thr
589589
@Order(20)
590590
@Tag("gate")
591591
@Test
592-
public void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
592+
void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
593593
assumeTrue(rcuDomainCreated, "testHDiscoverDomainJRFDomainType skipped because testDCreateJRFDomainRunRCU failed");
594594

595595
try (PrintWriter out = getTestMethodWriter(testInfo)) {
@@ -631,7 +631,7 @@ private void verifyHDiscoverDomainJRFDomainType(String expectedModelFile) {
631631
@Order(21)
632632
@Tag("gate")
633633
@Test
634-
public void test21UpdateDomain(TestInfo testInfo) throws Exception {
634+
void test21UpdateDomain(TestInfo testInfo) throws Exception {
635635
try (PrintWriter out = getTestMethodWriter(testInfo)) {
636636
Path source = Paths.get(getSampleVariableFile());
637637
Path variableFile = getTestOutputPath(testInfo).resolve(SAMPLE_VARIABLE_FILE);
@@ -667,7 +667,7 @@ public void test21UpdateDomain(TestInfo testInfo) throws Exception {
667667
@Order(22)
668668
@Tag("gate")
669669
@Test
670-
public void test22DeployAppWithoutModelfile(TestInfo testInfo) throws Exception {
670+
void test22DeployAppWithoutModelfile(TestInfo testInfo) throws Exception {
671671
try (PrintWriter out = getTestMethodWriter(testInfo)) {
672672
String cmd = deployAppScript
673673
+ " -oracle_home " + mwhome_12213
@@ -686,7 +686,7 @@ public void test22DeployAppWithoutModelfile(TestInfo testInfo) throws Exception
686686
@Order(23)
687687
@Tag("gate")
688688
@Test
689-
public void test23DeployAppWithModelfile(TestInfo testInfo) throws Exception {
689+
void test23DeployAppWithModelfile(TestInfo testInfo) throws Exception {
690690
try (PrintWriter out = getTestMethodWriter(testInfo)) {
691691
String cmd = deployAppScript
692692
+ " -oracle_home " + mwhome_12213
@@ -706,7 +706,7 @@ public void test23DeployAppWithModelfile(TestInfo testInfo) throws Exception {
706706
@Order(24)
707707
@Tag("gate")
708708
@Test
709-
public void test24ValidateModelWithOracleHomeOnly(TestInfo testInfo) throws Exception {
709+
void test24ValidateModelWithOracleHomeOnly(TestInfo testInfo) throws Exception {
710710
try (PrintWriter out = getTestMethodWriter(testInfo)) {
711711
String cmd = validateModelScript + " -oracle_home " + mwhome_12213;
712712
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
@@ -722,7 +722,7 @@ public void test24ValidateModelWithOracleHomeOnly(TestInfo testInfo) throws Exce
722722
@Order(25)
723723
@Tag("gate")
724724
@Test
725-
public void test25ValidateModelWithOracleHomeModelFile(TestInfo testInfo) throws Exception {
725+
void test25ValidateModelWithOracleHomeModelFile(TestInfo testInfo) throws Exception {
726726
try (PrintWriter out = getTestMethodWriter(testInfo)) {
727727
String cmd = validateModelScript + " -oracle_home " + mwhome_12213 + " -model_file " +
728728
getSampleModelFile("-constant");
@@ -739,7 +739,7 @@ public void test25ValidateModelWithOracleHomeModelFile(TestInfo testInfo) throws
739739
@Order(26)
740740
@Tag("gate")
741741
@Test
742-
public void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exception {
742+
void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exception {
743743
try (PrintWriter out = getTestMethodWriter(testInfo)) {
744744
String cmd = validateModelScript
745745
+ " -oracle_home " + mwhome_12213
@@ -757,7 +757,7 @@ public void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exc
757757
@Order(27)
758758
@Tag("gate")
759759
@Test
760-
public void test27CompareModelRemoveAttribute(TestInfo testInfo) throws Exception {
760+
void test27CompareModelRemoveAttribute(TestInfo testInfo) throws Exception {
761761
try (PrintWriter out = getTestMethodWriter(testInfo)) {
762762
Path outputDir = getTestOutputPath(testInfo).resolve("wdt_temp_output");
763763
Files.createDirectories(outputDir);
@@ -782,7 +782,7 @@ public void test27CompareModelRemoveAttribute(TestInfo testInfo) throws Exceptio
782782
@Order(28)
783783
@Tag("gate")
784784
@Test
785-
public void test28ValidateModelWithInvalidModelfile(TestInfo testInfo) throws Exception {
785+
void test28ValidateModelWithInvalidModelfile(TestInfo testInfo) throws Exception {
786786
try (PrintWriter out = getTestMethodWriter(testInfo)) {
787787
String cmd = validateModelScript
788788
+ " -oracle_home " + mwhome_12213
@@ -797,7 +797,7 @@ public void test28ValidateModelWithInvalidModelfile(TestInfo testInfo) throws Ex
797797
@Order(29)
798798
@Tag("gate")
799799
@Test
800-
public void test29EncryptModel(TestInfo testInfo) throws Exception {
800+
void test29EncryptModel(TestInfo testInfo) throws Exception {
801801
try (PrintWriter out = getTestMethodWriter(testInfo)) {
802802
Path source = Paths.get(getSampleModelFile("-constant"));
803803
Path model = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "-constant.yaml");

0 commit comments

Comments
 (0)