http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java new file mode 100644 index 0000000..13a2a3e --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java @@ -0,0 +1,45 @@ +/* + * 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. + */ + +package org.apache.ignite.spi.checkpoint.jdbc; + +import org.apache.ignite.spi.checkpoint.*; +import org.apache.ignite.testframework.junits.spi.*; +import org.hsqldb.jdbc.*; + +/** + * Grid jdbc checkpoint SPI default config self test. + */ +@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +public class JdbcCheckpointSpiDefaultConfigSelfTest extends + GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> { + /** {@inheritDoc} */ + @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception { + jdbcDataSource ds = new jdbcDataSource(); + + ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName()); + ds.setUser("sa"); + ds.setPassword(""); + + spi.setDataSource(ds); + + // Default BLOB type is not valid for hsqldb. + spi.setValueFieldType("longvarbinary"); + + super.spiConfigure(spi); + } +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java new file mode 100644 index 0000000..3849b81 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java @@ -0,0 +1,47 @@ +/* + * 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. + */ + +package org.apache.ignite.spi.checkpoint.jdbc; + +import org.apache.ignite.spi.*; +import org.apache.ignite.testframework.junits.spi.*; +import org.hsqldb.jdbc.*; + +/** + * Grid jdbc checkpoint SPI start stop self test. + */ +@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +public class JdbcCheckpointSpiStartStopSelfTest + extends GridSpiStartStopAbstractTest<JdbcCheckpointSpi> { + /** {@inheritDoc} */ + @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception { + jdbcDataSource ds = new jdbcDataSource(); + + ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName()); + ds.setUser("sa"); + ds.setPassword(""); + + spi.setDataSource(ds); + spi.setCheckpointTableName("startstop_checkpoints"); + spi.setKeyFieldName("key"); + spi.setValueFieldName("value"); + spi.setValueFieldType("longvarbinary"); + spi.setExpireDateFieldName("expire_date"); + + super.spiConfigure(spi); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java index 6ea63c1..55bd5fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java @@ -39,7 +39,7 @@ import java.util.*; * <pre class="snippet"> * <servlet> * <servlet-name>GridGain</servlet-name> - * <servlet-class>org.gridgain.grid.loaders.servlet.GridServletLoader</servlet-class> + * <servlet-class>org.apache.ignite.loaders.servlet.GridServletLoader</servlet-class> * <init-param> * <param-name>cfgFilePath</param-name> * <param-value>config/default-config.xml</param-value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java index 0629262..3777053 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java @@ -42,7 +42,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * Here is a typical example of configuring log4j logger in GridGain configuration file: * <pre name="code" class="xml"> * <property name="gridLogger"> - * <bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"> + * <bean class="org.apache.ignite.logger.log4j.GridLog4jLogger"> * <constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/> * </bean> * </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java index e5e6b7a..1a80f6b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java @@ -30,7 +30,7 @@ public class IgniteLoggingSelfTestSuite extends TestSuite { public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Logging Test Suite"); - suite.addTest(new TestSuite(GridJavaLoggerTest.class)); + suite.addTest(new TestSuite(IgniteJavaLoggerTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java index e5ce464..cca0603 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java @@ -34,16 +34,16 @@ public class IgniteSpiCheckpointSelfTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite Checkpoint Test Suite"); // Cache. - suite.addTest(new TestSuite(GridCacheCheckpointSpiConfigSelfTest.class)); - suite.addTest(new TestSuite(GridCacheCheckpointSpiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheCheckpointSpiStartStopSelfTest.class)); - suite.addTest(new TestSuite(GridCacheCheckpointSpiSecondCacheSelfTest.class)); + suite.addTest(new TestSuite(CacheCheckpointSpiConfigSelfTest.class)); + suite.addTest(new TestSuite(CacheCheckpointSpiSelfTest.class)); + suite.addTest(new TestSuite(CacheCheckpointSpiStartStopSelfTest.class)); + suite.addTest(new TestSuite(CacheCheckpointSpiSecondCacheSelfTest.class)); // JDBC. - suite.addTest(new TestSuite(GridJdbcCheckpointSpiConfigSelfTest.class)); - suite.addTest(new TestSuite(GridJdbcCheckpointSpiCustomConfigSelfTest.class)); - suite.addTest(new TestSuite(GridJdbcCheckpointSpiDefaultConfigSelfTest.class)); - suite.addTest(new TestSuite(GridJdbcCheckpointSpiStartStopSelfTest.class)); + suite.addTest(new TestSuite(JdbcCheckpointSpiConfigSelfTest.class)); + suite.addTest(new TestSuite(JdbcCheckpointSpiCustomConfigSelfTest.class)); + suite.addTest(new TestSuite(JdbcCheckpointSpiDefaultConfigSelfTest.class)); + suite.addTest(new TestSuite(JdbcCheckpointSpiStartStopSelfTest.class)); // Shared FS. suite.addTest(new TestSuite(GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.class));
