restoring after APPNG-2382 has been fixed

appNG · Jun 10, 2021 · 55619a3 · 55619a3
1 parent 8bd3c46
commit 55619a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -374,11 +374,6 @@
 			<version>8.5.47</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
-		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

diff --git a/src/test/java/org/appng/application/manager/business/ApplicationPropertiesTest.java b/src/test/java/org/appng/application/manager/business/ApplicationPropertiesTest.java
@@ -25,11 +25,11 @@
 import org.appng.application.manager.form.PropertyForm;
 import org.appng.core.domain.ApplicationImpl;
 import org.appng.core.domain.PropertyImpl;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
-import org.junit.runner.OrderWith;
-import org.junit.runner.manipulation.Alphanumeric;
+import org.junit.runners.MethodSorters;
 
-@OrderWith(Alphanumeric.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ApplicationPropertiesTest extends AbstractTest {
 
 	private static final String PROPERTY_EVENT = "propertyEvent";
@@ -44,8 +44,8 @@ public void testCreate() throws ProcessingException, IOException {
 		application.setName("manager");
 		applicationRepository.save(application);
 
-		ActionCall actionCall = getAction(PROPERTY_EVENT, "create-application-property").withParam(FORM_ACTION,
-				"create-application-property").withParam("appid", "1");
+		ActionCall actionCall = getAction(PROPERTY_EVENT, "create-application-property")
+				.withParam(FORM_ACTION, "create-application-property").withParam("appid", "1");
 		CallableAction action = actionCall.getCallableAction(new PropertyForm(new PropertyImpl(TESTPROPERTY, "5")));
 		FieldProcessor perform = action.perform();
 		validate(perform.getMessages());
@@ -79,13 +79,12 @@ public void testUpdate() throws ProcessingException, IOException {
 		PropertyImpl property = new PropertyImpl(TESTPROPERTY, "7", "9");
 		property.setType(Type.INT);
 		property.setClob("");
-		CallableAction action = actionCall
-				.getCallableAction(new PropertyForm(property));
+		CallableAction action = actionCall.getCallableAction(new PropertyForm(property));
 		FieldProcessor perform = action.perform();
 		validate(perform.getMessages());
 
-		CallableDataSource dataSource = getDataSource("property").withParam("appid", "1")
-				.withParam("id", PROPERTY_NAME).getCallableDataSource();
+		CallableDataSource dataSource = getDataSource("property").withParam("appid", "1").withParam("id", PROPERTY_NAME)
+				.getCallableDataSource();
 		dataSource.perform("test");
 		validate(dataSource.getDatasource(), "-data");
 	}

diff --git a/src/test/java/org/appng/application/manager/job/DatabaseReportJobTest.java b/src/test/java/org/appng/application/manager/job/DatabaseReportJobTest.java
@@ -8,14 +8,12 @@
 import org.appng.mail.Mail;
 import org.appng.mail.Mail.RecipientType;
 import org.appng.mail.MailTransport;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.google.common.net.MediaType;
 
-@Ignore
 public class DatabaseReportJobTest extends AbstractTest {
 
 	@Autowired