alex-plekhanov commented on code in PR #11938: URL: https://github.com/apache/ignite/pull/11938#discussion_r2003131232
########## modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerPooledSelfTest.java: ########## @@ -1,42 +0,0 @@ -/* - * 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.internal.marshaller.optimized; - -import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.testframework.junits.common.GridCommonTest; - -/** - * Optimized marshaller self test. - */ -@GridCommonTest(group = "Marshaller") -public class OptimizedMarshallerPooledSelfTest extends OptimizedMarshallerSelfTest { - /** {@inheritDoc} */ - @Override protected Marshaller marshaller() { - OptimizedMarshaller m = new OptimizedMarshaller(false); - - m.setPoolSize(8); Review Comment: This test checks optimized marshaller behavior with pool size. Why test was deleted? It doesn't set marshaller in ignite configuration anywhere. ########## modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java: ########## @@ -127,30 +120,6 @@ protected CacheConfiguration cacheConfiguration() { stopAllGrids(); } - /** - * Check whether test objects are stored correctly via stream API. - * - * @throws Exception If failed. - */ - @Test - public void testStream() throws Exception { - final Ignite grid = startGrid(); - - final IgniteCache<TestObj, TestObj> cache = grid.createCache(CACHE_NAME); - - final TestObj testObj = streamData(grid); Review Comment: `streamData` method can be deleted too ########## modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java: ########## @@ -83,7 +83,6 @@ public class ConfigVariations { /** */ @SuppressWarnings("unchecked") private static final ConfigParameter<IgniteConfiguration>[][] BASIC_IGNITE_SET = new ConfigParameter[][] { - Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class), binaryMarshallerFactory()), Review Comment: binaryMarshallerFactory method can be deleted ########## modules/core/src/test/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerSelfTest.java: ########## @@ -1,33 +0,0 @@ -/* - * 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.marshaller.jdk; - -import org.apache.ignite.marshaller.GridMarshallerAbstractTest; -import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.testframework.junits.common.GridCommonTest; - -/** - * JDK marshaller self test. - */ -@GridCommonTest(group = "Marshaller") -public class GridJdkMarshallerSelfTest extends GridMarshallerAbstractTest { Review Comment: Why this class was deleted? It doesn't exploit `setMarshaller` method, but checks marshalling/unmarshalling of system ignite objects by `JdkMarshaller`. ########## modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java: ########## @@ -36,8 +39,17 @@ @GridCommonTest(group = "Marshaller") public class OptimizedMarshallerSelfTest extends GridMarshallerAbstractTest { /** {@inheritDoc} */ - @Override protected Marshaller marshaller() { - return new OptimizedMarshaller(false); + @Override protected Marshaller marshaller() throws IgniteCheckedException { + OptimizedMarshaller marsh = new OptimizedMarshaller(false); + + MarshallerContextTestImpl ctx = new MarshallerContextTestImpl(); + + ctx.setMarshallerMappingFileStoreDir(new SharedFileTree(U.defaultWorkDirectory()).marshaller()); + ctx.onMarshallerProcessorStarted(newContext(), null); + + marsh.setContext(ctx); Review Comment: Duplicated code. Can we move context creation to some common place (GridMarshallerAbstractTest#beforeTest for example) ########## modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java: ########## @@ -124,97 +81,14 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest } }; - /** */ - protected GridMarshallerAbstractTest() { - super(/*start grid*/true); - } - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - - CacheConfiguration namedCache = new CacheConfiguration(DEFAULT_CACHE_NAME); - - namedCache.setName(CACHE_NAME); - namedCache.setAtomicityMode(TRANSACTIONAL); - - cfg.setMarshaller(marshaller()); - cfg.setCacheConfiguration(new CacheConfiguration(DEFAULT_CACHE_NAME), namedCache); - - return cfg; - } - /** * @return Marshaller. */ - protected abstract Marshaller marshaller(); + protected abstract Marshaller marshaller() throws IgniteCheckedException; /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - marsh = grid().configuration().getMarshaller(); - igniteInstanceName = grid().configuration().getIgniteInstanceName(); - } - - /** - * @throws Exception If failed. - */ - @Test - public void testDefaultCache() throws Exception { Review Comment: Why most of the methods are deleted from this class? These method don't exploit `setMarshaller`, but check ignite system objects marshalling using provided marshaller. Perhaps it still can be used inside ignite somewhere (since OptimizedMarshaller and JdkMarshaller are still used). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
