X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-persister-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fpersist%2Fimpl%2FCapabilityStrippingConfigSnapshotHolderTest.java;h=b22924a722878ca455ee1631793cb4aa9466cbe7;hp=5b0ddbb174e9f78a989a883b97a8230848f2f452;hb=8d9cdd0223be6d550d6f44dcb42fe7366bce3cf9;hpb=f21c5ee10e9c2663b313aed3e842ce0e952e6feb

diff --git a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java
index 5b0ddbb174..b22924a722 100644
--- a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java
+++ b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java
@@ -1,62 +1,46 @@
-/**
- * @author Tomas Olvecky
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *
- * 11 2013
- *
- * Copyright (c) 2013 by Cisco Systems, Inc.
- * All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.controller.netconf.persist.impl;
 
-//import com.google.common.collect.Sets;
-//import org.apache.commons.io.IOUtils;
-//import org.junit.Test;
-//import org.opendaylight.controller.netconf.persist.impl.osgi.ConfigPersisterActivator;
-//import org.opendaylight.controller.netconf.util.xml.XmlUtil;
-//import org.w3c.dom.Element;
-//
-//import java.io.IOException;
-//import java.util.Collections;
-//import java.util.HashSet;
-//import java.util.Set;
-//import java.util.regex.Pattern;
-
-//import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.opendaylight.controller.netconf.util.xml.XmlUtil;
+import org.w3c.dom.Element;
 
 public class CapabilityStrippingConfigSnapshotHolderTest {
 
-//    @Test
-//    public void  testCapabilityStripping() throws Exception {
-//        Set<String> allCapabilities = readLines("/capabilities-all.txt");
-//        Set<String> expectedCapabilities = readLines("/capabilities-stripped.txt");
-//        String snapshotAsString = readToString("/snapshot.xml");
-//        Element element = XmlUtil.readXmlToElement(snapshotAsString);
-//        {
-//            CapabilityStrippingConfigSnapshotHolder tested = new CapabilityStrippingConfigSnapshotHolder(
-//                    element, allCapabilities, Pattern.compile(
-//                    ConfigPersisterActivator.DEFAULT_IGNORED_REGEX
-//            ));
-//            assertEquals(expectedCapabilities, tested.getCapabilities());
-//            assertEquals(Collections.emptySet(), tested.getMissingNamespaces());
-//        }
-//        {
-//            // test regex
-//            CapabilityStrippingConfigSnapshotHolder tested = new CapabilityStrippingConfigSnapshotHolder(
-//                    element, allCapabilities, Pattern.compile(
-//                    "^bar"
-//            ));
-//            assertEquals(expectedCapabilities, tested.getCapabilities());
-//            assertEquals(Sets.newHashSet(ConfigPersisterActivator.DEFAULT_IGNORED_REGEX.substring(1)),
-//                    tested.getMissingNamespaces());
-//        }
-//    }
-//
-//    private Set<String> readLines(String fileName) throws IOException {
-//        return new HashSet<>(IOUtils.readLines(getClass().getResourceAsStream(fileName)));
-//    }
-//
-//    private String readToString(String fileName) throws IOException {
-//        return IOUtils.toString(getClass().getResourceAsStream(fileName));
-//    }
+    @Test
+    public void testCapabilityStripping() throws Exception {
+        Set<String> allCapabilities = readLines("/capabilities-all.txt");
+        Set<String> expectedCapabilities = readLines("/capabilities-stripped.txt");
+        String snapshotAsString = readToString("/snapshot.xml");
+        Element element = XmlUtil.readXmlToElement(snapshotAsString);
+        CapabilityStrippingConfigSnapshotHolder tested = new CapabilityStrippingConfigSnapshotHolder(
+                element, allCapabilities);
+        assertEquals(expectedCapabilities, tested.getCapabilities());
+
+        Set<String> obsoleteCapabilities = Sets.difference(allCapabilities, expectedCapabilities);
+
+        assertEquals(obsoleteCapabilities, tested.getObsoleteCapabilities());
+    }
+
+    private Set<String> readLines(String fileName) throws IOException {
+        return new HashSet<>(IOUtils.readLines(getClass().getResourceAsStream(fileName)));
+    }
+
+    private String readToString(String fileName) throws IOException {
+        return IOUtils.toString(getClass().getResourceAsStream(fileName));
+    }
 
 }