Skip to content

Commit

Permalink
# ignite-63
Browse files Browse the repository at this point in the history
  • Loading branch information
@sboikov
sboikov committed Jan 23, 2015
1 parent 1d3160e commit 4549d99
Show file tree
Hide file tree
Showing 15 changed files with 99 additions and 152 deletions.
52 changes: 26 additions & 26 deletions ...e/ignite/gridify/GridAbstractAopTest.java → ...pache/ignite/gridify/AbstractAopTest.java
View file
Expand Up @@ -38,7 +38,7 @@
* Abstract AOP test. * Abstract AOP test.
*/ */
@SuppressWarnings( {"OverlyStrongTypeCast", "JUnitAbstractTestClassNamingConvention", "ProhibitedExceptionDeclared", "IfMayBeConditional"}) @SuppressWarnings( {"OverlyStrongTypeCast", "JUnitAbstractTestClassNamingConvention", "ProhibitedExceptionDeclared", "IfMayBeConditional"})
public abstract class GridAbstractAopTest extends GridCommonAbstractTest { public abstract class AbstractAopTest extends GridCommonAbstractTest {
/** */ /** */
private IgniteDeploymentMode depMode = IgniteDeploymentMode.PRIVATE; private IgniteDeploymentMode depMode = IgniteDeploymentMode.PRIVATE;


Expand Down Expand Up @@ -338,10 +338,10 @@ private void checkDefault(IgniteDeploymentMode depMode) throws Exception {


Object targetObj = target(); Object targetObj = target();


if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
res = ((GridTestAopTarget)targetObj).gridifyDefault("1"); res = ((TestAopTarget)targetObj).gridifyDefault("1");
else else
res = ((GridTestAopTargetInterface) targetObj).gridifyDefault("1"); res = ((TestAopTargetInterface) targetObj).gridifyDefault("1");


assert res == 1 : "Invalid gridifyDefault result: " + res; assert res == 1 : "Invalid gridifyDefault result: " + res;
} }
Expand Down Expand Up @@ -485,10 +485,10 @@ private void checkNonDefaultClass(IgniteDeploymentMode depMode) throws Exception


Object targetObj = target(); Object targetObj = target();


if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
res = ((GridTestAopTarget) targetObj).gridifyNonDefaultClass("1"); res = ((TestAopTarget) targetObj).gridifyNonDefaultClass("1");
else else
res = ((GridTestAopTargetInterface) targetObj).gridifyNonDefaultClass("1"); res = ((TestAopTargetInterface) targetObj).gridifyNonDefaultClass("1");


if (res != 10) if (res != 10)
fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=10]"); fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=10]");
Expand Down Expand Up @@ -518,10 +518,10 @@ private void checkNonDefaultName(IgniteDeploymentMode depMode) throws Exception


Object targetObj = target(); Object targetObj = target();


if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
res = ((GridTestAopTarget) targetObj).gridifyNonDefaultName("2"); res = ((TestAopTarget) targetObj).gridifyNonDefaultName("2");
else else
res = ((GridTestAopTargetInterface) targetObj).gridifyNonDefaultName("2"); res = ((TestAopTargetInterface) targetObj).gridifyNonDefaultName("2");


if (res != 20) if (res != 20)
fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=2]"); fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=2]");
Expand Down Expand Up @@ -551,12 +551,12 @@ private void checkDefaultException(IgniteDeploymentMode depMode) throws Exceptio
boolean isE = false; boolean isE = false;


try { try {
if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
((GridTestAopTarget) targetObj).gridifyDefaultException("1"); ((TestAopTarget) targetObj).gridifyDefaultException("1");
else else
((GridTestAopTargetInterface) targetObj).gridifyDefaultException("1"); ((TestAopTargetInterface) targetObj).gridifyDefaultException("1");
} }
catch (GridTestGridifyException e) { catch (TestGridifyException e) {
info("@Gridify method gridifyDefaultException(0) returns exception: " + e); info("@Gridify method gridifyDefaultException(0) returns exception: " + e);


isE = true; isE = true;
Expand All @@ -565,7 +565,7 @@ private void checkDefaultException(IgniteDeploymentMode depMode) throws Exceptio
e.printStackTrace(); e.printStackTrace();


fail("@Gridify method gridifyDefaultException(0) returns exception [exception" + e fail("@Gridify method gridifyDefaultException(0) returns exception [exception" + e
+ ", expect=" + GridTestGridifyException.class.getName() + ']'); + ", expect=" + TestGridifyException.class.getName() + ']');
} }


if (!isE) if (!isE)
Expand Down Expand Up @@ -594,10 +594,10 @@ private void checkDefaultResource(IgniteDeploymentMode depMode) throws Exception


Object targetObj = target(); Object targetObj = target();


if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
res = ((GridTestAopTarget)targetObj).gridifyDefaultResource("1"); res = ((TestAopTarget)targetObj).gridifyDefaultResource("1");
else else
res = ((GridTestAopTargetInterface)targetObj).gridifyDefaultResource("1"); res = ((TestAopTargetInterface)targetObj).gridifyDefaultResource("1");


if (res != 1) if (res != 1)
fail("Method gridifyDefaultResource returned wrong value [result=" + res + ", expect=1]"); fail("Method gridifyDefaultResource returned wrong value [result=" + res + ", expect=1]");
Expand Down Expand Up @@ -627,10 +627,10 @@ private void checkNonDefaultClassResource(IgniteDeploymentMode depMode) throws E


Object targetObj = target(); Object targetObj = target();


if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
res = ((GridTestAopTarget) targetObj).gridifyNonDefaultClassResource("3"); res = ((TestAopTarget) targetObj).gridifyNonDefaultClassResource("3");
else else
res = ((GridTestAopTargetInterface) targetObj).gridifyNonDefaultClassResource("3"); res = ((TestAopTargetInterface) targetObj).gridifyNonDefaultClassResource("3");


if (res != 30) if (res != 30)
fail("Method gridifyNonDefaultClassResource returned wrong value [result=" + res + ", expect=3]"); fail("Method gridifyNonDefaultClassResource returned wrong value [result=" + res + ", expect=3]");
Expand Down Expand Up @@ -660,10 +660,10 @@ private void checkNonDefaultNameResource(IgniteDeploymentMode depMode) throws Ex


Object targetObj = target(); Object targetObj = target();


if (targetObj instanceof GridTestAopTarget) if (targetObj instanceof TestAopTarget)
res = ((GridTestAopTarget)targetObj).gridifyNonDefaultNameResource("4"); res = ((TestAopTarget)targetObj).gridifyNonDefaultNameResource("4");
else else
res = ((GridTestAopTargetInterface)targetObj).gridifyNonDefaultNameResource("4"); res = ((TestAopTargetInterface)targetObj).gridifyNonDefaultNameResource("4");


if (res != 40) if (res != 40)
fail("Method gridifyNonDefaultNameResource returned wrong value [result=" + res + ", expect=4]"); fail("Method gridifyNonDefaultNameResource returned wrong value [result=" + res + ", expect=4]");
Expand Down Expand Up @@ -702,9 +702,9 @@ protected Object targetWithUserClassLoader() throws Exception {
ClassLoader tstClsLdr = new GridTestClassLoader( ClassLoader tstClsLdr = new GridTestClassLoader(
Collections.singletonMap("org/apache/ignite/gridify/test_resource.properties", "param1=2"), Collections.singletonMap("org/apache/ignite/gridify/test_resource.properties", "param1=2"),
getClass().getClassLoader(), getClass().getClassLoader(),
GridTestAopTarget.class.getName(), GridTestAopTargetInterface.class.getName()); TestAopTarget.class.getName(), TestAopTargetInterface.class.getName());


return tstClsLdr.loadClass("GridTestAopTarget").newInstance(); return tstClsLdr.loadClass("TestAopTarget").newInstance();
} }


/** /**
Expand Down
2 changes: 1 addition & 1 deletion .../ignite/gridify/GridBasicAopSelfTest.java → ...ache/ignite/gridify/BasicAopSelfTest.java
View file
Expand Up @@ -32,7 +32,7 @@
* The main purpose of this test is to check that AOP is properly configured. It should * The main purpose of this test is to check that AOP is properly configured. It should
* be included in all suites that require AOP. * be included in all suites that require AOP.
*/ */
public class GridBasicAopSelfTest extends GridCommonAbstractTest { public class BasicAopSelfTest extends GridCommonAbstractTest {
/** /**
* @throws Exception If failed. * @throws Exception If failed.
*/ */
Expand Down
6 changes: 3 additions & 3 deletions ...ite/gridify/GridNonSpringAopSelfTest.java → .../ignite/gridify/NonSpringAopSelfTest.java
View file
Expand Up @@ -44,14 +44,14 @@
* 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder. * 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder.
*/ */
@GridCommonTest(group="AOP") @GridCommonTest(group="AOP")
public class GridNonSpringAopSelfTest extends GridAbstractAopTest { public class NonSpringAopSelfTest extends AbstractAopTest {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override protected Object target() { @Override protected Object target() {
return new GridTestAopTarget(); return new TestAopTarget();
} }


/** {@inheritDoc} */ /** {@inheritDoc} */
@Override public String getTestGridName() { @Override public String getTestGridName() {
return "GridTestAopTarget"; return "TestAopTarget";
} }
} }
6 changes: 3 additions & 3 deletions ...ignite/gridify/GridSpringAopSelfTest.java → ...che/ignite/gridify/SpringAopSelfTest.java
View file
Expand Up @@ -24,15 +24,15 @@
* Spring AOP test. * Spring AOP test.
*/ */
@GridCommonTest(group="AOP") @GridCommonTest(group="AOP")
public class GridSpringAopSelfTest extends GridAbstractAopTest { public class SpringAopSelfTest extends AbstractAopTest {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override protected Object target() { @Override protected Object target() {
return GridifySpringEnhancer.enhance(new GridTestAopTarget()); return GridifySpringEnhancer.enhance(new TestAopTarget());
} }


/** {@inheritDoc} */ /** {@inheritDoc} */
@Override public String getTestGridName() { @Override public String getTestGridName() {
return "GridTestAopTargetInterface"; return "TestAopTargetInterface";
} }


/** {@inheritDoc} */ /** {@inheritDoc} */
Expand Down
42 changes: 21 additions & 21 deletions ...che/ignite/gridify/GridTestAopTarget.java → .../apache/ignite/gridify/TestAopTarget.java
View file
Expand Up @@ -25,12 +25,12 @@
/** /**
* AOP test. * AOP test.
*/ */
public class GridTestAopTarget implements GridTestAopTargetInterface { public class TestAopTarget implements TestAopTargetInterface {
/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTarget") @Gridify(gridName="TestAopTarget")
@Override public int gridifyDefault(String arg) { @Override public int gridifyDefault(String arg) {
return Integer.parseInt(arg); return Integer.parseInt(arg);
} }
Expand All @@ -39,7 +39,7 @@ public class GridTestAopTarget implements GridTestAopTargetInterface {
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTarget", taskClass = GridTestGridifyTask.class) @Gridify(gridName="TestAopTarget", taskClass = TestGridifyTask.class)
@Override public int gridifyNonDefaultClass(String arg) { @Override public int gridifyNonDefaultClass(String arg) {
return Integer.parseInt(arg); return Integer.parseInt(arg);
} }
Expand All @@ -49,7 +49,7 @@ public class GridTestAopTarget implements GridTestAopTargetInterface {
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTarget", taskName = GridTestGridifyTask.TASK_NAME) @Gridify(gridName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
@Override public int gridifyNonDefaultName(String arg) { @Override public int gridifyNonDefaultName(String arg) {
return Integer.parseInt(arg); return Integer.parseInt(arg);
} }
Expand All @@ -58,28 +58,28 @@ public class GridTestAopTarget implements GridTestAopTargetInterface {
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTarget", taskName = "") @Gridify(gridName="TestAopTarget", taskName = "")
@Override public int gridifyNoName(String arg) { @Override public int gridifyNoName(String arg) {
return 0; return 0;
} }


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTarget") @Gridify(gridName="TestAopTarget")
@Override public int gridifyDefaultException(String arg) throws GridTestGridifyException { @Override public int gridifyDefaultException(String arg) throws TestGridifyException {
throw new GridTestGridifyException(arg); throw new TestGridifyException(arg);
} }


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTarget") @Gridify(gridName="TestAopTarget")
@Override public int gridifyDefaultResource(String arg) throws GridTestGridifyException { @Override public int gridifyDefaultResource(String arg) throws TestGridifyException {
int res = Integer.parseInt(arg); int res = Integer.parseInt(arg);


Integer rsrcVal = getResource(); Integer rsrcVal = getResource();
Expand All @@ -93,10 +93,10 @@ public class GridTestAopTarget implements GridTestAopTargetInterface {
/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTarget", taskClass = GridTestGridifyTask.class) @Gridify(gridName="TestAopTarget", taskClass = TestGridifyTask.class)
@Override public int gridifyNonDefaultClassResource(String arg) throws GridTestGridifyException { @Override public int gridifyNonDefaultClassResource(String arg) throws TestGridifyException {
assert getResource() != null; assert getResource() != null;


return Integer.parseInt(arg); return Integer.parseInt(arg);
Expand All @@ -106,20 +106,20 @@ public class GridTestAopTarget implements GridTestAopTargetInterface {
/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTarget", taskName = GridTestGridifyTask.TASK_NAME) @Gridify(gridName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
@Override public int gridifyNonDefaultNameResource(String arg) throws GridTestGridifyException { @Override public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException {
assert getResource() != null; assert getResource() != null;


return Integer.parseInt(arg); return Integer.parseInt(arg);
} }


/** /**
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
private Integer getResource() throws GridTestGridifyException { private Integer getResource() throws TestGridifyException {
try (InputStream in = getClass().getResourceAsStream("test_resource.properties")) { try (InputStream in = getClass().getResourceAsStream("test_resource.properties")) {
assert in != null; assert in != null;


Expand All @@ -132,7 +132,7 @@ private Integer getResource() throws GridTestGridifyException {
return Integer.parseInt(val); return Integer.parseInt(val);
} }
catch (IOException e) { catch (IOException e) {
throw new GridTestGridifyException("Failed to test load properties file.", e); throw new TestGridifyException("Failed to test load properties file.", e);
} }
} }
} }
34 changes: 17 additions & 17 deletions ...e/gridify/GridTestAopTargetInterface.java → ...gnite/gridify/TestAopTargetInterface.java
View file
Expand Up @@ -24,64 +24,64 @@
/** /**
* Test AOP target interface. * Test AOP target interface.
*/ */
public interface GridTestAopTargetInterface extends Serializable { public interface TestAopTargetInterface extends Serializable {
/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTargetInterface") @Gridify(gridName="TestAopTargetInterface")
public int gridifyDefault(String arg); public int gridifyDefault(String arg);


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTargetInterface", taskName = GridTestGridifyTask.TASK_NAME) @Gridify(gridName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
public int gridifyNonDefaultName(String arg); public int gridifyNonDefaultName(String arg);


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTargetInterface", taskClass = GridTestGridifyTask.class) @Gridify(gridName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
public int gridifyNonDefaultClass(String arg); public int gridifyNonDefaultClass(String arg);


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
*/ */
@Gridify(gridName="GridTestAopTargetInterface", taskName = "") @Gridify(gridName="TestAopTargetInterface", taskName = "")
public int gridifyNoName(String arg); public int gridifyNoName(String arg);


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTargetInterface") @Gridify(gridName="TestAopTargetInterface")
public int gridifyDefaultException(String arg) throws GridTestGridifyException; public int gridifyDefaultException(String arg) throws TestGridifyException;


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTargetInterface") @Gridify(gridName="TestAopTargetInterface")
public int gridifyDefaultResource(String arg) throws GridTestGridifyException; public int gridifyDefaultResource(String arg) throws TestGridifyException;


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTargetInterface", taskClass = GridTestGridifyTask.class) @Gridify(gridName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
public int gridifyNonDefaultClassResource(String arg) throws GridTestGridifyException; public int gridifyNonDefaultClassResource(String arg) throws TestGridifyException;


/** /**
* @param arg Argument. * @param arg Argument.
* @return Result. * @return Result.
* @throws GridTestGridifyException If failed. * @throws TestGridifyException If failed.
*/ */
@Gridify(gridName="GridTestAopTargetInterface", taskName = GridTestGridifyTask.TASK_NAME) @Gridify(gridName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
public int gridifyNonDefaultNameResource(String arg) throws GridTestGridifyException; public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException;
} }

0 comments on commit 4549d99

Please sign in to comment.