You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2017/03/13 15:29:07 UTC
[44/48] polygene-java git commit: Fix some broken tests
Fix some broken tests
POLYGENE-231
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/fb0418d3
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/fb0418d3
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/fb0418d3
Branch: refs/heads/serialization-3.0
Commit: fb0418d3190fc4f0c06a3f501b84b8209b85dfb1
Parents: 4228cc1
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Mar 13 16:20:45 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Mar 13 16:27:47 2017 +0100
----------------------------------------------------------------------
.../apache/polygene/spi/serialization/SerializationSettings.java | 2 +-
.../java/org/apache/polygene/tools/model/VisitableDetailTest.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fb0418d3/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java b/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java
index cba63a4..fd33629 100644
--- a/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java
+++ b/core/spi/src/main/java/org/apache/polygene/spi/serialization/SerializationSettings.java
@@ -41,7 +41,7 @@ public class SerializationSettings<SettingsType extends SerializationSettings>
private final Map<ValueType, Converter<Object>> converters = new LinkedHashMap<>();
- public final Map<ValueType, Converter<Object>> getConverters()
+ public final Map<ValueType, Converter<?>> getConverters()
{
return Collections.unmodifiableMap( converters );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fb0418d3/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
index d06bc96..d6af619 100644
--- a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
+++ b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
@@ -22,7 +22,6 @@ package org.apache.polygene.tools.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.polygene.api.service.ServiceActivation;
import org.apache.polygene.tools.model.descriptor.ServiceDetailDescriptor;
import org.apache.polygene.tools.model.descriptor.TransientDetailDescriptor;
import org.junit.Test;
@@ -83,7 +82,6 @@ public class VisitableDetailTest
// Module
"visitEnter( ModuleName )",
"visit( " + ModuleActivator.class.getName() + " )",
- "visit( " + ServiceActivation.ServiceActivator.class.getName() + " )",
// Leaving Structure
"visitLeave( ModuleName )",
"visitLeave( LayerName )",