Modified: sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java?rev=1831365&r1=1831364&r2=1831365&view=diff ============================================================================== --- sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java [UTF-8] (original) +++ sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java [UTF-8] Thu May 10 19:08:39 2018 @@ -16,336 +16,332 @@ */ package org.apache.sis.internal.storage; +import java.util.Map; +import java.util.HashMap; +import java.util.List; import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.stream.Stream; import org.apache.sis.feature.builder.FeatureTypeBuilder; import org.apache.sis.filter.DefaultFilterFactory; import org.apache.sis.internal.feature.AttributeConvention; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.FeatureSet; import org.apache.sis.test.TestCase; -import org.apache.sis.util.iso.Names; import org.junit.Test; + +import static org.junit.Assert.*; + +// Branch-dependent imports import org.opengis.feature.Feature; import org.opengis.feature.FeatureType; import org.opengis.filter.FilterFactory; import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.util.GenericName; -import static org.junit.Assert.*; + /** * Tests {@link JoinFeatureSet}. * - * @author Johann Sorel (Geomatys) + * @author Johann Sorel (Geomatys) * @version 1.0 * @since 1.0 * @module */ -public class JoinFeatureSetTest extends TestCase { +public final strictfp class JoinFeatureSetTest extends TestCase { + /** + * The set of features to be joined together. + */ + private final FeatureSet featureSet1, featureSet2; - private static final FilterFactory FF = new DefaultFilterFactory(); - private static final String ATT_ID = AttributeConvention.IDENTIFIER_PROPERTY.toString(); + /** + * Creates a new test case. + */ + public JoinFeatureSetTest() { + FeatureTypeBuilder builder = new FeatureTypeBuilder().setName("Type1"); + builder.addAttribute( String.class).setName(AttributeConvention.IDENTIFIER_PROPERTY); + builder.addAttribute( String.class).setName("myNameSpace", "att1"); + builder.addAttribute(Integer.class).setName("myNameSpace", "att2"); + final FeatureType type1 = builder.build(); + + List<Feature> features = new ArrayList<>(5); + + Feature f = type1.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_1_0"); + f.setPropertyValue("att1", "str1"); + f.setPropertyValue("att2", 1); + features.add(f); + + f = type1.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_1_1"); + f.setPropertyValue("att1", "str2"); + f.setPropertyValue("att2", 2); + features.add(f); + + f = type1.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_1_2"); + f.setPropertyValue("att1", "str3"); + f.setPropertyValue("att2", 3); + features.add(f); + + f = type1.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_1_3"); + f.setPropertyValue("att1", "str50"); + f.setPropertyValue("att2", 50); + features.add(f); + + f = type1.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_1_4"); + f.setPropertyValue("att1", "str51"); + f.setPropertyValue("att2", 51); + features.add(f); + + featureSet1 = new MemoryFeatureSet(null, null, type1, features); + + // ---------------------------------------------------------------------- + + builder = new FeatureTypeBuilder().setName("Type2"); + builder.addAttribute( String.class).setName(AttributeConvention.IDENTIFIER_PROPERTY); + builder.addAttribute(Integer.class).setName("otherNameSpace", "att3"); + builder.addAttribute( Double.class).setName("otherNameSpace", "att4"); + final FeatureType type2 = builder.build(); + + features = new ArrayList<>(6); + + f = type2.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_2_0"); + f.setPropertyValue("att3", 1); + f.setPropertyValue("att4", 10d); + features.add(f); + + f = type2.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_2_1"); + f.setPropertyValue("att3", 2); + f.setPropertyValue("att4", 20d); + features.add(f); + + f = type2.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_2_2"); + f.setPropertyValue("att3", 2); + f.setPropertyValue("att4", 30d); + features.add(f); + + f = type2.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_2_3"); + f.setPropertyValue("att3", 3); + f.setPropertyValue("att4", 40d); + features.add(f); + + f = type2.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_2_4"); + f.setPropertyValue("att3", 60); + f.setPropertyValue("att4", 60d); + features.add(f); + + f = type2.newInstance(); + f.setPropertyValue(AttributeConvention.IDENTIFIER, "fid_2_5"); + f.setPropertyValue("att3", 61); + f.setPropertyValue("att4", 61d); + features.add(f); - private final FeatureSet featureSet1; - private final FeatureSet featureSet2; - private final GenericName name1; - private final GenericName name2; - - private final String fid_1_0; - private final String fid_1_1; - private final String fid_1_2; - private final String fid_1_3; - private final String fid_1_4; - private final String fid_2_0; - private final String fid_2_1; - private final String fid_2_2; - private final String fid_2_3; - private final String fid_2_4; - private final String fid_2_5; - - - public JoinFeatureSetTest() throws Exception { - FeatureTypeBuilder builder = new FeatureTypeBuilder(); - - //---------------------------------------------------------------------- - name1 = Names.createLocalName(null, null, "Type1"); - builder.setName(name1); - builder.addAttribute(String.class).setName(AttributeConvention.IDENTIFIER_PROPERTY); - builder.addAttribute(String.class).setName("http://type1.com";, "att1"); - builder.addAttribute(Integer.class).setName("http://type1.com";, "att2"); - final FeatureType sft1 = builder.build(); - - final List<Feature> features1 = new ArrayList<>(); - - Feature sf = sft1.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_1_0"); - sf.setPropertyValue("att1", "str1"); - sf.setPropertyValue("att2", 1); - fid_1_0 = getId(sf); - features1.add(sf); - - sf = sft1.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_1_1"); - sf.setPropertyValue("att1", "str2"); - sf.setPropertyValue("att2", 2); - fid_1_1 = getId(sf); - features1.add(sf); - - sf = sft1.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_1_2"); - sf.setPropertyValue("att1", "str3"); - sf.setPropertyValue("att2", 3); - fid_1_2 = getId(sf); - features1.add(sf); - - sf = sft1.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_1_3"); - sf.setPropertyValue("att1", "str50"); - sf.setPropertyValue("att2", 50); - fid_1_3 = getId(sf); - features1.add(sf); - - sf = sft1.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_1_4"); - sf.setPropertyValue("att1", "str51"); - sf.setPropertyValue("att2", 51); - fid_1_4 = getId(sf); - features1.add(sf); - - featureSet1 = new MemoryFeatureSet(null, null, sft1, features1); - - - //---------------------------------------------------------------------- - name2 = Names.createLocalName(null, null, "Type2"); - builder = new FeatureTypeBuilder(); - builder.setName(name2); - builder.addAttribute(String.class).setName(AttributeConvention.IDENTIFIER_PROPERTY); - builder.addAttribute(Integer.class).setName("http://type2.com";, "att3"); - builder.addAttribute(Double.class).setName("http://type2.com";, "att4"); - final FeatureType sft2 = builder.build(); - - final List<Feature> features2 = new ArrayList<>(); - - sf = sft2.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_2_0"); - sf.setPropertyValue("att3", 1); - sf.setPropertyValue("att4", 10d); - fid_2_0 = getId(sf); - features2.add(sf); - - sf = sft2.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_2_1"); - sf.setPropertyValue("att3", 2); - sf.setPropertyValue("att4", 20d); - fid_2_1 = getId(sf); - features2.add(sf); - - sf = sft2.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_2_2"); - sf.setPropertyValue("att3", 2); - sf.setPropertyValue("att4", 30d); - fid_2_2 = getId(sf); - features2.add(sf); - - sf = sft2.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_2_3"); - sf.setPropertyValue("att3", 3); - sf.setPropertyValue("att4", 40d); - fid_2_3 = getId(sf); - features2.add(sf); - - sf = sft2.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_2_4"); - sf.setPropertyValue("att3", 60); - sf.setPropertyValue("att4", 60d); - fid_2_4 = getId(sf); - features2.add(sf); - - sf = sft2.newInstance(); - sf.setPropertyValue(ATT_ID, "fid_2_5"); - sf.setPropertyValue("att3", 61); - sf.setPropertyValue("att4", 61d); - fid_2_5 = getId(sf); - features2.add(sf); + featureSet2 = new MemoryFeatureSet(null, null, type2, features); + } - featureSet2 = new MemoryFeatureSet(null, null, sft2, features2); + /** + * Creates a new join feature set of the given type using the {@link #featureSet1} and {@link #featureSet2}. + */ + private FeatureSet create(final JoinFeatureSet.Type type) throws DataStoreException { + final FilterFactory factory = new DefaultFilterFactory(); + final PropertyIsEqualTo condition = factory.equals(factory.property("att2"), factory.property("att3")); + final Map<String,Object> properties = new HashMap<>(4); + assertNull(properties.put("name", "JoinSet")); + assertNull(properties.put("identifierDelimiter", " ")); + return new JoinFeatureSet(null, featureSet1, "s1", featureSet2, "s2", type, condition, properties); + } + /** + * Returns the identifier of the given feature. + */ + private static String getId(final Feature feature) { + return String.valueOf(feature.getPropertyValue(AttributeConvention.IDENTIFIER)); } /** * Test inner join feature set. + * + * @throws DataStoreException if an error occurred while creating the feature set. */ @Test - public void testInnerJoin() throws Exception{ - - final PropertyIsEqualTo condition = FF.equals(FF.property("att2"), FF.property("att3")); - final FeatureSet col = new JoinFeatureSet(null, featureSet1, "s1", featureSet2, "s2", JoinFeatureSet.Type.INNER, condition); - + public void testInnerJoin() throws DataStoreException { + final FeatureSet col = create(JoinFeatureSet.Type.INNER); try (Stream<Feature> stream = col.features(false)) { final Iterator<Feature> ite = stream.iterator(); - Feature f = null; - Feature c1 = null; - Feature c2 = null; - int count = 0; while (ite.hasNext()) { count++; - f = ite.next(); - if (getId(f).equals(fid_1_0 +" "+fid_2_0)) { - c1 = (Feature) f.getPropertyValue("s1"); - c2 = (Feature) f.getPropertyValue("s2"); - assertEquals("str1", c1.getProperty("att1").getValue()); - assertEquals(1, c1.getProperty("att2").getValue()); - assertEquals(1, c2.getProperty("att3").getValue()); - assertEquals(10d, c2.getProperty("att4").getValue()); - } else if(getId(f).equals(fid_1_1 +" "+fid_2_1)) { - c1 = (Feature) f.getPropertyValue("s1"); - c2 = (Feature) f.getPropertyValue("s2"); - assertEquals("str2", c1.getProperty("att1").getValue()); - assertEquals(2, c1.getProperty("att2").getValue()); - assertEquals(2, c2.getProperty("att3").getValue()); - assertEquals(20d, c2.getProperty("att4").getValue()); - } else if(getId(f).equals(fid_1_1 +" "+fid_2_2)) { - c1 = (Feature) f.getPropertyValue("s1"); - c2 = (Feature) f.getPropertyValue("s2"); - assertEquals("str2", c1.getProperty("att1").getValue()); - assertEquals(2, c1.getProperty("att2").getValue()); - assertEquals(2, c2.getProperty("att3").getValue()); - assertEquals(30d, c2.getProperty("att4").getValue()); - } else if(getId(f).equals(fid_1_2 +" "+fid_2_3)) { - c1 = (Feature) f.getPropertyValue("s1"); - c2 = (Feature) f.getPropertyValue("s2"); - assertEquals("str3", c1.getProperty("att1").getValue()); - assertEquals(3, c1.getProperty("att2").getValue()); - assertEquals(3, c2.getProperty("att3").getValue()); - assertEquals(40d, c2.getProperty("att4").getValue()); - } else { - fail("unexpected feature"); + final Feature f = ite.next(); + final Feature c1 = (Feature) f.getPropertyValue("s1"); + final Feature c2 = (Feature) f.getPropertyValue("s2"); + switch (getId(f)) { + case "fid_1_0 fid_2_0": { + assertEquals("str1", c1.getProperty("att1").getValue()); + assertEquals( 1, c1.getProperty("att2").getValue()); + assertEquals( 1, c2.getProperty("att3").getValue()); + assertEquals(10d, c2.getProperty("att4").getValue()); + break; + } + case "fid_1_1 fid_2_1": { + assertEquals("str2", c1.getProperty("att1").getValue()); + assertEquals( 2, c1.getProperty("att2").getValue()); + assertEquals( 2, c2.getProperty("att3").getValue()); + assertEquals(20d, c2.getProperty("att4").getValue()); + break; + } + case "fid_1_1 fid_2_2": { + assertEquals("str2", c1.getProperty("att1").getValue()); + assertEquals( 2, c1.getProperty("att2").getValue()); + assertEquals( 2, c2.getProperty("att3").getValue()); + assertEquals(30d, c2.getProperty("att4").getValue()); + break; + } + case "fid_1_2 fid_2_3": { + assertEquals("str3", c1.getProperty("att1").getValue()); + assertEquals( 3, c1.getProperty("att2").getValue()); + assertEquals( 3, c2.getProperty("att3").getValue()); + assertEquals(40d, c2.getProperty("att4").getValue()); + break; + } + default: { + fail("unexpected feature"); + break; + } } } - - assertEquals("Was expecting 4 features.",4, count); + assertEquals("Unexpected amount of features.", 4, count); } } /** * Test outer join feature set. + * + * @throws DataStoreException if an error occurred while creating the feature set. */ @Test - public void testOuterLeft() throws Exception{ - - final PropertyIsEqualTo condition = FF.equals(FF.property("att2"), FF.property("att3")); - final FeatureSet col = new JoinFeatureSet(null, featureSet1, "s1", featureSet2, "s2", JoinFeatureSet.Type.LEFT_OUTER, condition); - + public void testOuterLeft() throws DataStoreException { + final FeatureSet col = create(JoinFeatureSet.Type.LEFT_OUTER); try (Stream<Feature> stream = col.features(false)) { final Iterator<Feature> ite = stream.iterator(); - - boolean foundStr1 = false; + boolean foundStr1 = false; boolean foundStr20 = false; boolean foundStr21 = false; - boolean foundStr3 = false; + boolean foundStr3 = false; boolean foundStr50 = false; boolean foundStr51 = false; - int count = 0; while (ite.hasNext()) { - final Feature f = ite.next(); - final Feature c1 = (Feature) f.getPropertyValue("s1"); - final Feature c2 = (Feature) f.getPropertyValue("s2"); + final Feature f = ite.next(); + final Feature c1 = (Feature) f.getPropertyValue("s1"); + final Feature c2 = (Feature) f.getPropertyValue("s2"); final String att1 = c1.getProperty("att1").getValue().toString(); - - if (att1.equals("str1")) { - foundStr1 = true; - assertEquals(c1.getProperty("att2").getValue(), 1); - assertEquals(c2.getProperty("att3").getValue(), 1); - assertEquals(c2.getProperty("att4").getValue(), 10d); - } else if(att1.equals("str2")) { - assertEquals(c1.getProperty("att2").getValue(), 2); - assertEquals(c2.getProperty("att3").getValue(), 2); - double att4 = (Double)c2.getProperty("att4").getValue(); - if(att4 == 20d){ - foundStr20 = true; - }else if(att4 == 30d){ - foundStr21 = true; - } - } else if(att1.equals("str3")) { - foundStr3 = true; - assertEquals(c1.getProperty("att2").getValue(), 3); - assertEquals(c2.getProperty("att3").getValue(), 3); - assertEquals(c2.getProperty("att4").getValue(), 40d); - } else if(att1.equals("str50")) { - foundStr50 = true; - assertEquals(c1.getProperty("att2").getValue(), 50); - assertNull(c2); - } else if(att1.equals("str51")) { - foundStr51 = true; - assertEquals(c1.getProperty("att2").getValue(), 51); - assertNull(c2); + switch (att1) { + case "str1": { + foundStr1 = true; + assertEquals( 1, c1.getProperty("att2").getValue()); + assertEquals( 1, c2.getProperty("att3").getValue()); + assertEquals(10d, c2.getProperty("att4").getValue()); + break; + } + case "str2": { + assertEquals(2, c1.getProperty("att2").getValue()); + assertEquals(2, c2.getProperty("att3").getValue()); + double att4 = (Double) c2.getProperty("att4").getValue(); + foundStr20 |= (att4 == 20); + foundStr21 |= (att4 == 30); + break; + } + case "str3": { + foundStr3 = true; + assertEquals( 3, c1.getProperty("att2").getValue()); + assertEquals( 3, c2.getProperty("att3").getValue()); + assertEquals(40d, c2.getProperty("att4").getValue()); + break; + } + case "str50": { + foundStr50 = true; + assertEquals(50, c1.getProperty("att2").getValue()); + assertNull(c2); + break; + } + case "str51": { + foundStr51 = true; + assertEquals(51, c1.getProperty("att2").getValue()); + assertNull(c2); + break; + } + default: { + fail("unexpected feature"); + break; + } } count++; } - assertTrue(foundStr1); assertTrue(foundStr20); assertTrue(foundStr21); assertTrue(foundStr3); assertTrue(foundStr50); assertTrue(foundStr51); - assertEquals(6, count); + assertEquals("Unexpected amount of features.", 6, count); } } /** * Test outer join feature set. + * + * @throws DataStoreException if an error occurred while creating the feature set. */ @Test - public void testOuterRight() throws Exception{ - - final PropertyIsEqualTo condition = FF.equals(FF.property("att2"), FF.property("att3")); - final FeatureSet col = new JoinFeatureSet(null, featureSet1, "s1", featureSet2, "s2", JoinFeatureSet.Type.RIGHT_OUTER, condition); - + public void testOuterRight() throws DataStoreException { + final FeatureSet col = create(JoinFeatureSet.Type.RIGHT_OUTER); try (Stream<Feature> stream = col.features(false)) { final Iterator<Feature> ite = stream.iterator(); - - boolean foundStr1 = false; + boolean foundStr1 = false; boolean foundStr20 = false; boolean foundStr21 = false; - boolean foundStr3 = false; + boolean foundStr3 = false; boolean foundStr60 = false; boolean foundStr61 = false; - int count = 0; while (ite.hasNext()) { - final Feature f = ite.next(); + final Feature f = ite.next(); final Feature c1 = (Feature) f.getPropertyValue("s1"); final Feature c2 = (Feature) f.getPropertyValue("s2"); - if (c1 != null) { - final Object att1 = c1.getProperty("att1").getValue(); - if ("str1".equals(att1)) { - foundStr1 = true; - assertEquals(c1.getProperty("att2").getValue(), 1); - assertEquals(c2.getProperty("att3").getValue(), 1); - assertEquals(c2.getProperty("att4").getValue(), 10d); - } else if("str2".equals(att1)) { - assertEquals(c1.getProperty("att2").getValue(), 2); - assertEquals(c2.getProperty("att3").getValue(), 2); - double att4 = (Double)c2.getProperty("att4").getValue(); - if(att4 == 20d){ - foundStr20 = true; - }else if(att4 == 30d){ - foundStr21 = true; + switch (c1.getProperty("att1").getValue().toString()) { + case "str1": { + foundStr1 = true; + assertEquals( 1, c1.getProperty("att2").getValue()); + assertEquals( 1, c2.getProperty("att3").getValue()); + assertEquals(10d, c2.getProperty("att4").getValue()); + break; + } + case "str2": { + assertEquals(2, c1.getProperty("att2").getValue()); + assertEquals(2, c2.getProperty("att3").getValue()); + double att4 = (Double) c2.getProperty("att4").getValue(); + foundStr20 |= (att4 == 20d); + foundStr21 |= (att4 == 30d); + break; + } + case "str3": { + foundStr3 = true; + assertEquals( 3, c1.getProperty("att2").getValue()); + assertEquals( 3, c2.getProperty("att3").getValue()); + assertEquals(40d,c2.getProperty("att4").getValue()); + break; } - } else if("str3".equals(att1)) { - foundStr3 = true; - assertEquals(c1.getProperty("att2").getValue(), 3); - assertEquals(c2.getProperty("att3").getValue(), 3); - assertEquals(c2.getProperty("att4").getValue(), 40d); } } else { - int att3 = (Integer)c2.getProperty("att3").getValue(); - + int att3 = (Integer) c2.getProperty("att3").getValue(); if (att3 == 60) { assertEquals(c2.getProperty("att4").getValue(), 60d); foundStr60 = true; @@ -354,10 +350,8 @@ public class JoinFeatureSetTest extends foundStr61 = true; } } - count++; } - assertTrue(foundStr1); assertTrue(foundStr20); assertTrue(foundStr21); @@ -365,11 +359,6 @@ public class JoinFeatureSetTest extends assertTrue(foundStr60); assertTrue(foundStr61); assertEquals(6, count); - } } - - private static String getId(Feature feature) { - return String.valueOf(feature.getPropertyValue(AttributeConvention.IDENTIFIER_PROPERTY.toString())); - } }
