2222
2323import org .atmosphere .cpr .AtmosphereResource ;
2424import org .atmosphere .cpr .Broadcaster ;
25- import org .junit .Assert ;
26- import org .junit .Test ;
25+ import org .junit .jupiter .api .Test ;
2726import org .mockito .Answers ;
2827import org .mockito .MockedStatic ;
2928import org .mockito .Mockito ;
4544import com .vaadin .pro .licensechecker .PreTrialLicenseValidationException ;
4645import com .vaadin .pro .licensechecker .Product ;
4746
47+ import static org .junit .jupiter .api .Assertions .assertEquals ;
48+ import static org .junit .jupiter .api .Assertions .assertNotNull ;
49+ import static org .junit .jupiter .api .Assertions .assertNull ;
50+ import static org .junit .jupiter .api .Assertions .assertTrue ;
4851import static org .mockito .ArgumentMatchers .any ;
4952import static org .mockito .ArgumentMatchers .anyString ;
5053import static org .mockito .ArgumentMatchers .eq ;
5154import static org .mockito .ArgumentMatchers .same ;
5255
53- public class DebugWindowConnectionLicenseCheckTest {
56+ class DebugWindowConnectionLicenseCheckTest {
5457
5558 private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper ();
5659 private static final Product TEST_PRODUCT = new Product (
@@ -65,124 +68,117 @@ public class DebugWindowConnectionLicenseCheckTest {
6568 private final ClientMessageReceiver receiver = new ClientMessageReceiver ();
6669
6770 @ Test
68- public void checkLicense_validLicense_sendLicenseOk () {
71+ void checkLicense_validLicense_sendLicenseOk () {
6972 DebugWindowMessage message = doLicenseCheck (LicenseCheckResult .VALID );
70- Assert .assertEquals ("license-check-ok" , message .getCommand ());
71- Assert .assertTrue ("Expected a Product object in response message" ,
72- message .getData () instanceof Product );
73- Assert .assertEquals (TEST_PRODUCT .toString (),
74- message .getData ().toString ());
73+ assertEquals ("license-check-ok" , message .getCommand ());
74+ assertTrue (message .getData () instanceof Product ,
75+ "Expected a Product object in response message" );
76+ assertEquals (TEST_PRODUCT .toString (), message .getData ().toString ());
7577 }
7678
7779 @ Test
78- public void checkLicense_invalidLicense_sendLicenseCheckFailed () {
80+ void checkLicense_invalidLicense_sendLicenseCheckFailed () {
7981 DebugWindowMessage message = doLicenseCheck (LicenseCheckResult .INVALID );
80- Assert .assertEquals ("license-check-failed" , message .getCommand ());
81- Assert .assertTrue (
82- "Expected a ProductAndMessage object in response message" ,
83- message .getData () instanceof ProductAndMessage );
82+ assertEquals ("license-check-failed" , message .getCommand ());
83+ assertTrue (message .getData () instanceof ProductAndMessage ,
84+ "Expected a ProductAndMessage object in response message" );
8485 ProductAndMessage productAndMessage = (ProductAndMessage ) message
8586 .getData ();
86- Assert .assertEquals (INVALID_LICENSE_ERROR ,
87- productAndMessage .getMessage ());
88- Assert .assertEquals (TEST_PRODUCT .toString (),
87+ assertEquals (INVALID_LICENSE_ERROR , productAndMessage .getMessage ());
88+ assertEquals (TEST_PRODUCT .toString (),
8989 productAndMessage .getProduct ().toString ());
90- Assert . assertNull ("Expected pre-trial info to be absent" ,
91- productAndMessage . getPreTrial () );
90+ assertNull (productAndMessage . getPreTrial () ,
91+ "Expected pre-trial info to be absent" );
9292 }
9393
9494 @ Test
95- public void checkLicense_noLicenseKeys_sendLicenseCheckFailed () {
95+ void checkLicense_noLicenseKeys_sendLicenseCheckFailed () {
9696 DebugWindowMessage message = doLicenseCheck (
9797 LicenseCheckResult .MISSING_KEYS );
9898
99- Assert .assertEquals ("license-check-nokey" , message .getCommand ());
100- Assert .assertTrue (
101- "Expected a ProductAndMessage object in response message" ,
102- message .getData () instanceof ProductAndMessage );
99+ assertEquals ("license-check-nokey" , message .getCommand ());
100+ assertTrue (message .getData () instanceof ProductAndMessage ,
101+ "Expected a ProductAndMessage object in response message" );
103102 ProductAndMessage productAndMessage = (ProductAndMessage ) message
104103 .getData ();
105- Assert .assertTrue (
106- productAndMessage .getMessage ().contains (MISSING_KEY_ERROR ));
107- Assert .assertEquals (TEST_PRODUCT .toString (),
104+ assertTrue (productAndMessage .getMessage ().contains (MISSING_KEY_ERROR ));
105+ assertEquals (TEST_PRODUCT .toString (),
108106 productAndMessage .getProduct ().toString ());
109- Assert . assertEquals (TEST_PRODUCT .toString (),
107+ assertEquals (TEST_PRODUCT .toString (),
110108 productAndMessage .getProduct ().toString ());
111- Assert . assertNotNull ("Expected pre-trial info to be present" ,
112- productAndMessage . getPreTrial () );
113- Assert . assertEquals (TEST_PRE_TRIAL .toString (),
109+ assertNotNull (productAndMessage . getPreTrial () ,
110+ "Expected pre-trial info to be present" );
111+ assertEquals (TEST_PRE_TRIAL .toString (),
114112 productAndMessage .getPreTrial ().toString ());
115113 }
116114
117115 @ Test
118- public void startPreTrial_preTrialAllowed_sendPreTrialInfo () {
116+ void startPreTrial_preTrialAllowed_sendPreTrialInfo () {
119117 DebugWindowMessage message = doStartPreTrial (
120118 PreTrial .PreTrialState .START_ALLOWED );
121- Assert . assertEquals ("license-pretrial-started" , message .getCommand ());
122- Assert . assertTrue ("Expected a PreTrial object in response message" ,
123- message . getData () instanceof PreTrial );
119+ assertEquals ("license-pretrial-started" , message .getCommand ());
120+ assertTrue (message . getData () instanceof PreTrial ,
121+ "Expected a PreTrial object in response message" );
124122 PreTrial preTrial = (PreTrial ) message .getData ();
125- Assert . assertEquals (TEST_PRE_TRIAL .toString (), preTrial .toString ());
123+ assertEquals (TEST_PRE_TRIAL .toString (), preTrial .toString ());
126124 }
127125
128126 @ Test
129- public void startPreTrial_preTrialRunning_sendPreTrialInfo () {
127+ void startPreTrial_preTrialRunning_sendPreTrialInfo () {
130128 DebugWindowMessage message = doStartPreTrial (
131129 PreTrial .PreTrialState .RUNNING );
132- Assert . assertEquals ("license-pretrial-started" , message .getCommand ());
133- Assert . assertTrue ("Expected a PreTrial object in response message" ,
134- message . getData () instanceof PreTrial );
130+ assertEquals ("license-pretrial-started" , message .getCommand ());
131+ assertTrue (message . getData () instanceof PreTrial ,
132+ "Expected a PreTrial object in response message" );
135133 PreTrial preTrial = (PreTrial ) message .getData ();
136- Assert . assertEquals (TEST_PRE_TRIAL .toString (), preTrial .toString ());
134+ assertEquals (TEST_PRE_TRIAL .toString (), preTrial .toString ());
137135 }
138136
139137 @ Test
140- public void startPreTrial_preTrialExpired_sendPreTrialExpiredFailure () {
138+ void startPreTrial_preTrialExpired_sendPreTrialExpiredFailure () {
141139 DebugWindowMessage message = doStartPreTrial (
142140 PreTrial .PreTrialState .EXPIRED );
143- Assert . assertEquals ("license-pretrial-expired" , message .getCommand ());
141+ assertEquals ("license-pretrial-expired" , message .getCommand ());
144142 }
145143
146144 @ Test
147- public void startPreTrial_preTrialNotAllowed_sendPreTrialNotAllowedFailure () {
145+ void startPreTrial_preTrialNotAllowed_sendPreTrialNotAllowedFailure () {
148146 DebugWindowMessage message = doStartPreTrial (null );
149- Assert . assertEquals ("license-pretrial-failed" , message .getCommand ());
147+ assertEquals ("license-pretrial-failed" , message .getCommand ());
150148 }
151149
152150 @ Test
153- public void startPreTrial_genericError_sendPreTrialNotAllowedFailure () {
151+ void startPreTrial_genericError_sendPreTrialNotAllowedFailure () {
154152 DebugWindowMessage message = doStartPreTrial (
155153 PreTrial .PreTrialState .ACCESS_DENIED );
156- Assert . assertEquals ("license-pretrial-failed" , message .getCommand ());
154+ assertEquals ("license-pretrial-failed" , message .getCommand ());
157155 }
158156
159157 @ Test
160- public void downloadLicenseKey_licenseKeyAvailable_notifiesDownloadStartAndSuccess () {
158+ void downloadLicenseKey_licenseKeyAvailable_notifiesDownloadStartAndSuccess () {
161159 AtomicReference <Runnable > callbackHolder = new AtomicReference <>();
162160 DebugWindowMessage message = doDownloadKey (true , callbackHolder );
163- Assert .assertEquals ("license-download-started" , message .getCommand ());
164- Assert .assertEquals (TEST_PRODUCT .toString (),
165- message .getData ().toString ());
161+ assertEquals ("license-download-started" , message .getCommand ());
162+ assertEquals (TEST_PRODUCT .toString (), message .getData ().toString ());
166163 callbackHolder .get ().run ();
167- Assert . assertEquals (1 , receiver .messages .size ());
168- Assert . assertEquals ("license-download-completed" ,
164+ assertEquals (1 , receiver .messages .size ());
165+ assertEquals ("license-download-completed" ,
169166 receiver .messages .get (0 ).getCommand ());
170- Assert . assertEquals (TEST_PRODUCT .toString (),
167+ assertEquals (TEST_PRODUCT .toString (),
171168 receiver .messages .get (0 ).getData ().toString ());
172169 }
173170
174171 @ Test
175- public void downloadLicenseKey_licenseKeyNotAvailable_notifiesDownloadStartAndFailure () {
172+ void downloadLicenseKey_licenseKeyNotAvailable_notifiesDownloadStartAndFailure () {
176173 AtomicReference <Runnable > callbackHolder = new AtomicReference <>();
177174 DebugWindowMessage message = doDownloadKey (false , callbackHolder );
178- Assert .assertEquals ("license-download-started" , message .getCommand ());
179- Assert .assertEquals (TEST_PRODUCT .toString (),
180- message .getData ().toString ());
175+ assertEquals ("license-download-started" , message .getCommand ());
176+ assertEquals (TEST_PRODUCT .toString (), message .getData ().toString ());
181177 callbackHolder .get ().run ();
182- Assert . assertEquals (1 , receiver .messages .size ());
183- Assert . assertEquals ("license-download-failed" ,
178+ assertEquals (1 , receiver .messages .size ());
179+ assertEquals ("license-download-failed" ,
184180 receiver .messages .get (0 ).getCommand ());
185- Assert . assertEquals (TEST_PRODUCT .toString (),
181+ assertEquals (TEST_PRODUCT .toString (),
186182 receiver .messages .get (0 ).getData ().toString ());
187183 }
188184
@@ -250,7 +246,7 @@ private DebugWindowMessage sendAndReceive(ObjectNode command,
250246 withMockedLicenseChecker (instrumenter ,
251247 () -> reload .onMessage (receiver .resource , command .toString ()));
252248 int responses = receiver .messages .size ();
253- Assert . assertEquals ("Expected messages" , 1 , responses );
249+ assertEquals (1 , responses , "Expected messages" );
254250 DebugWindowMessage message = receiver .messages .get (0 );
255251 receiver .messages .clear ();
256252 return message ;
0 commit comments