http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml deleted file mode 100644 index ddad102..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad-signed-deployfile-ignite.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask6</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask6</value> - </util:list> -</beans> -
http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml deleted file mode 100644 index 5b59b93..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/bad_classes.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentAbstractTestTask</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInnerTestTask$GridInnerTestTask</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInterfaceTestTask</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentNonePublicTestTask</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml deleted file mode 100644 index 6ec6d9a..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploy-with-resources-ignite.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask7</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml deleted file mode 100644 index cd09847..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydepend-ignite.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask1</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml deleted file mode 100644 index d9ff2bc..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deploydir-ignite.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml deleted file mode 100644 index 81d5b36..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/deployfile-ignite.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask3</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml deleted file mode 100644 index 7ccf896..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-ignite.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <bean id="userVersion" class="java.lang.String"> - <constructor-arg value="1"/> - </bean> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1</value> - <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml deleted file mode 100644 index 6822e37..0000000 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/well-signed-deployfile-ignite.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Spring configuration file for test classes in gar-file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <description>Ignite Spring configuration file in gar-file.</description> - - <!-- - Test tasks specification. - --> - <util:list id="tasks"> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask5</value> - <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask5</value> - </util:list> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java index 72eec11..d307a32 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java @@ -59,7 +59,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes } /** - * Tests task from file 'deployfile_nodescr.gar'. + * Tests task from file 'deployfile-nodescr.gar'. * * Looks for task {@code GridUriDeploymentTestTask4} without descriptor file from GAR-file. * That task loads resource {@code spring.xml}. @@ -76,7 +76,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes } /** - * Tests task from file 'deployfile_bad.gar'. + * Tests task from file 'deployfile-bad.gar'. * * Looks for tasks {@code GridUriDeploymentAbstractTestTask} * {@code GridInnerTestTask} @@ -87,13 +87,17 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes */ public void testBadDeployment() throws Exception { checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentAbstractTestTask"); + checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridInnerTestTask"); + checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInnerTestTask$GridInnerTestTask"); + checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInnerTestTask.GridInnerTestTask"); + checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInterfaceTestTask"); checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentNonePublicTestTask"); } /** - * Tests task from file 'deploy_depend.gar'. + * Tests task from file 'deployfile-depend.gar'. * * Looks for task {@code GridUriDeploymentTestTask1} with descriptor file from GAR-file. * That task loads resource {@code spring1.xml} and imports external class from /lib/*.jar @@ -107,10 +111,12 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes */ public void testDependenceDeployment() throws Exception { checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask1"); + getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask1") + .getResourceClass().newInstance(); } /** - * Tests task from file 'deploy_nodescr_depend.gar'. + * Tests task from file 'deploydir-nodescr-depend.gar'. * * Looks for task {@code GridUriDeploymentTestTask2} without descriptor file from GAR-file. * That task loads resource {@code spring2.xml} and imports external class from /lib/*.jar @@ -124,6 +130,8 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes */ public void testNoDescriptorDependenceDeployment() throws Exception { checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask2"); + getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask2") + .getResourceClass().newInstance(); } /** @@ -149,4 +157,4 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask6") == null : "Task from GAR with invalid signature should not be deployed."; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java index 00c4d67..333f707 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java @@ -108,16 +108,16 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes * @throws Exception If failed. */ public void testDeployUndeploy2Files() throws Exception { - checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + String taskName = "org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"; + + checkNoTask(taskName); try { copyToResourceBase(LIBS_GAR_FILE_PATH, LIBS_GAR); copyToResourceBase(CLASSES_GAR_FILE_PATH, CLASSES_GAR); - Thread.sleep(FREQ + 3000); - - checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + waitForTask(taskName, true, FREQ + 3000); } catch (Exception e) { e.printStackTrace(); @@ -126,9 +126,7 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes deleteFromResourceBase(LIBS_GAR); deleteFromResourceBase(CLASSES_GAR); - Thread.sleep(FREQ + 3000); - - checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + waitForTask(taskName, false, FREQ + 3000); } } @@ -136,20 +134,18 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes * @throws Exception If failed. */ public void testSameContantFiles() throws Exception { - checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + String taskName = "org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"; + + checkNoTask(taskName); try { copyToResourceBase(ALL_GAR_FILE_PATH, ALL_GAR); - Thread.sleep(FREQ + 3000); - - checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + waitForTask(taskName, true, FREQ + 3000); copyToResourceBase(ALL_GAR_FILE_PATH, "file-copy.gar"); - Thread.sleep(FREQ + 3000); - - checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + waitForTask(taskName, true, FREQ + 3000); } catch (Throwable e) { e.printStackTrace(); @@ -158,9 +154,7 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes deleteFromResourceBase(ALL_GAR); deleteFromResourceBase("file-copy.gar"); - Thread.sleep(FREQ + 3000); - - checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3"); + waitForTask(taskName, false, FREQ + 3000); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java index 817b346..345ce80 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java @@ -56,9 +56,9 @@ public class IgniteUriDeploymentTestSuite { suite.addTest(new TestSuite(GridFileDeploymentUndeploySelfTest.class)); suite.addTest(new TestSuite(GridHttpDeploymentSelfTest.class)); - //suite.addTest(new TestSuite(GridFileDeploymentSelfTest.class)); - //suite.addTest(new TestSuite(GridUriDeploymentMultiScannersErrorThrottlingTest.class)); - //suite.addTest(new TestSuite(GridUriDeploymentMd5CheckSelfTest.class)); + suite.addTest(new TestSuite(GridFileDeploymentSelfTest.class)); + suite.addTest(new TestSuite(GridUriDeploymentMultiScannersErrorThrottlingTest.class)); + suite.addTest(new TestSuite(GridUriDeploymentMd5CheckSelfTest.class)); // GAR Ant task tests. suite.addTest(IgniteToolsSelfTestSuite.suite()); http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java index cb8f8fc..1a9e351 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java @@ -61,7 +61,7 @@ public class ZookeeperDiscoverySpiTestSuite1 extends TestSuite { suite.addTestSuite(ZookeeperClientTest.class); suite.addTestSuite(ZookeeperDiscoverySpiTest.class); - //suite.addTestSuite(ZookeeperDiscoverySpiSaslFailedAuthTest.class); + suite.addTestSuite(ZookeeperDiscoverySpiSaslFailedAuthTest.class); suite.addTestSuite(ZookeeperDiscoverySpiSaslSuccessfulAuthTest.class); return suite; http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslFailedAuthTest.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslFailedAuthTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslFailedAuthTest.java index 864ac96..097b7c5 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslFailedAuthTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslFailedAuthTest.java @@ -27,6 +27,8 @@ public class ZookeeperDiscoverySpiSaslFailedAuthTest extends ZookeeperDiscoveryS * @throws Exception If failed. */ public void testIgniteNodeWithInvalidPasswordFailsToJoin() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-9573";); + System.setProperty(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY, "InvalidZookeeperClient"); http://git-wip-us.apache.org/repos/asf/ignite/blob/02792e5e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0f0dfc0..187eb0d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -827,6 +827,7 @@ <exclude>**/*.csv</exclude><!--CSV files--> <exclude>**/*.jks</exclude><!--bin-files--> <exclude>**/pom-installed.xml</exclude><!--tmp-files--> + <exclude>**/keystore</exclude><!--bin-files--> <exclude>**/keystore/*.jks</exclude><!--bin-files--> <exclude>**/keystore/*.pem</exclude><!--auto generated files--> <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
