• R/O
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

Commit MetaInfo

Révision2135 (tree)
l'heure2020-09-17 10:22:48
Auteurt_nakayama1971

Message de Log

(empty log message)

Change Summary

Modification

--- trunk/apache/struts1-core/src/test/java/org/apache/struts/action/TestActionMessage.java (revision 2134)
+++ trunk/apache/struts1-core/src/test/java/org/apache/struts/action/TestActionMessage.java (revision 2135)
@@ -198,9 +198,11 @@
198198
199199 Assert.assertNotNull(values);
200200 Assert.assertEquals(values.length, 2);
201- Assert.assertTrue(values[0] instanceof Integer);
201+ Assert.assertNotNull(values[0]);
202+ Assert.assertEquals(Integer.class, values[0].getClass());
202203 Assert.assertEquals("5", values[0].toString());
203- Assert.assertTrue(values[1] instanceof Integer);
204+ Assert.assertNotNull(values[1]);
205+ Assert.assertEquals(Integer.class, values[1].getClass());
204206 Assert.assertEquals("10", values[1].toString());
205207 Assert.assertTrue(this.amWithTwoIntegerValues.isResource());
206208 Assert.assertEquals(this.amWithTwoIntegerValues.getKey(), "amWithTwoIntegerValues");
--- trunk/apache/struts1-core/src/test/java/org/apache/struts/action/TestActionServlet.java (revision 2134)
+++ trunk/apache/struts1-core/src/test/java/org/apache/struts/action/TestActionServlet.java (revision 2135)
@@ -278,8 +278,8 @@
278278 FormBeanConfig result = actionServlet.processFormBeanConfigClass(
279279 customSub, moduleConfig);
280280
281- Assert.assertTrue("Incorrect class of form bean config",
282- result instanceof CustomFormBeanConfig);
281+ Assert.assertEquals("Incorrect class of form bean config",
282+ CustomFormBeanConfig.class, result.getClass());
283283 Assert.assertEquals("Incorrect name", customSub.getName(), result.getName());
284284 Assert.assertEquals("Incorrect type", customSub.getType(), result.getType());
285285 Assert.assertEquals("Incorrect extends", customSub.getExtends(),
@@ -484,8 +484,8 @@
484484 ExceptionConfig result = actionServlet.processExceptionConfigClass(
485485 customSub, moduleConfig, null);
486486
487- Assert.assertTrue("Incorrect class of exception config",
488- result instanceof CustomExceptionConfig);
487+ Assert.assertEquals("Incorrect class of exception config",
488+ CustomExceptionConfig.class, result.getClass());
489489 Assert.assertEquals("Incorrect type", customSub.getType(), result.getType());
490490 Assert.assertEquals("Incorrect key", customSub.getKey(), result.getKey());
491491 Assert.assertEquals("Incorrect extends", customSub.getExtends(), result.getExtends());
@@ -681,8 +681,8 @@
681681 ForwardConfig result = actionServlet.processForwardConfigClass(
682682 customSub, moduleConfig, null);
683683
684- Assert.assertTrue("Incorrect class of forward config",
685- result instanceof CustomForwardConfig);
684+ Assert.assertEquals("Incorrect class of forward config",
685+ CustomForwardConfig.class, result.getClass());
686686 Assert.assertEquals("Incorrect name", customSub.getName(), result.getName());
687687 Assert.assertEquals("Incorrect path", customSub.getPath(), result.getPath());
688688 Assert.assertEquals("Incorrect extends", customSub.getExtends(), result.getExtends());
@@ -917,8 +917,8 @@
917917
918918 ActionConfig result = actionServlet.processActionConfigClass(customSub, moduleConfig);
919919
920- Assert.assertTrue("Incorrect class of action config",
921- result instanceof CustomActionConfig);
920+ Assert.assertEquals("Incorrect class of action config",
921+ CustomActionConfig.class, result.getClass());
922922 Assert.assertEquals("Incorrect path", customSub.getPath(), result.getPath());
923923 Assert.assertEquals("Incorrect extends", customSub.getExtends(),
924924 result.getExtends());
--- trunk/apache/struts1-core/src/test/java/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java (revision 2134)
+++ trunk/apache/struts1-core/src/test/java/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java (revision 2135)
@@ -115,7 +115,7 @@
115115 ActionForm theForm =
116116 (ActionForm) this.context.get(POST_EXECUTION_CONTEXT_KEY);
117117
118- Assert.assertTrue(theForm instanceof MockFormBean);
118+ Assert.assertEquals(MockFormBean.class, theForm.getClass());
119119 }
120120
121121 /**
@@ -147,7 +147,7 @@
147147 ActionForm theForm =
148148 (ActionForm) this.context.get(POST_EXECUTION_CONTEXT_KEY);
149149
150- Assert.assertTrue(theForm instanceof MockFormBean);
150+ Assert.assertEquals(MockFormBean.class, theForm.getClass());
151151 }
152152
153153 /**
@@ -251,6 +251,6 @@
251251
252252 ActionForm theForm = this.context.getActionForm();
253253
254- Assert.assertTrue(theForm instanceof MockFormBean);
254+ Assert.assertEquals(MockFormBean.class, theForm.getClass());
255255 }
256256 }
--- trunk/apache/struts1-core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java (revision 2134)
+++ trunk/apache/struts1-core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java (revision 2135)
@@ -61,6 +61,6 @@
6161 Context<String, Object> wrapped = command.getContext(testContext);
6262
6363 Assert.assertNotNull(wrapped);
64- Assert.assertTrue(wrapped instanceof ServletActionContext);
64+ Assert.assertEquals(ServletActionContext.class, wrapped.getClass());
6565 }
6666 }
--- trunk/apache/struts1-core/src/test/java/org/apache/struts/util/TestRequestUtils.java (revision 2134)
+++ trunk/apache/struts1-core/src/test/java/org/apache/struts/util/TestRequestUtils.java (revision 2135)
@@ -414,7 +414,7 @@
414414 ActionForm form = RequestUtils.createActionForm(request, mapping, moduleConfig, null);
415415
416416 Assert.assertNotNull("ActionForm returned", form);
417- Assert.assertTrue("ActionForm of correct type", form instanceof MockFormBean);
417+ Assert.assertEquals("ActionForm of correct type", MockFormBean.class, form.getClass());
418418 }
419419
420420 /**
@@ -440,7 +440,7 @@
440440 ActionForm form = RequestUtils.createActionForm(request, mapping, moduleConfig2, null);
441441
442442 Assert.assertNotNull("ActionForm returned", form);
443- Assert.assertTrue("ActionForm of correct type", form instanceof MockFormBean);
443+ Assert.assertEquals("ActionForm of correct type", MockFormBean.class, form.getClass());
444444 }
445445
446446 // ----------------------------------------------------------- forwardURL()