chore: Updated index, issue-2155, and metric integration tests to nod…

…e:test

test/integration/index/index-disabled.tap.js → test/integration/index/index-disabled.test.js

@@ -5,15 +5,14 @@
 
 'use strict'
 
-const test = require('tap').test
-
-test('loading the application via index.js with agent disabled', function (t) {
-  t.plan(2)
+const test = require('node:test')
+const assert = require('node:assert')
 
+test('loading the application via index.js with agent disabled', () => {
   process.env.NEW_RELIC_HOME = __dirname + '/..'
   process.env.NEW_RELIC_ENABLED = 'false'
   const api = require('../../../index.js')
 
-  t.ok(api, 'should have an API')
-  t.notOk(api.agent, 'should not have an associated agent')
+  assert.ok(api, 'should have an API')
+  assert.equal(api.agent, undefined, 'should not have an associated agent')
 })

test/integration/index/index-no-config.test.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const test = require('node:test')
+const assert = require('node:assert')
+
+test('loading the application via index.js with no config', (t) => {
+  process.env.NEW_RELIC_HOME = '/this/is/not/a/real/path'
+  process.env.HOME = '/this/is/also/not/a/real/path'
+  process.cwd = function () {
+    return __dirname
+  }
+
+  /* eslint-disable no-console */
+  const logs = []
+  const logError = console.error
+  t.after(() => {
+    console.error = logError
+  })
+  console.error = (...args) => logs.push(args)
+  /* eslint-enable no-console */
+
+  let api
+  assert.doesNotThrow(function () {
+    api = require('../../../')
+  }, 'should not die when the config file is not found')
+
+  assert.ok(api, 'should have an API')
+  assert.equal(api.agent, undefined, 'should not have an associated agent')
+  assert.equal(logs.length, 2)
+})

test/integration/issue-2155/test.tap.mjs → test/integration/issue-2155/test.test.mjs

@@ -3,10 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import tap from 'tap'
-import crypto from 'crypto'
-import path from 'path'
-import url from 'url'
+import test from 'node:test'
+import assert from 'node:assert'
+import crypto from 'node:crypto'
+import path from 'node:path'
+import url from 'node:url'
+
 import helper from '../../lib/agent_helper.js'
 import shimmer from '../../../lib/shimmer.js'
 import InstrumentationDescriptor from '../../../lib/instrumentation-descriptor.js'
@@ -35,7 +37,8 @@ function instrumentation(shim, resolvedModule) {
   })
 }
 
-tap.beforeEach(async (t) => {
+test.beforeEach(async (ctx) => {
+  ctx.nr = {}
   shimmer.registerInstrumentation({
     type: InstrumentationDescriptor.TYPE_GENERIC,
     moduleName: 'foo',
@@ -44,18 +47,18 @@ tap.beforeEach(async (t) => {
   })
 
   const agent = helper.instrumentMockedAgent()
-  t.context.agent = agent
+  ctx.nr.agent = agent
 
   const { default: foo } = await import('./foo.cjs?v=' + crypto.randomBytes(16).toString('hex'))
-  t.context.mod = foo
+  ctx.nr.mod = foo
 })
 
-tap.afterEach((t) => {
-  helper.unloadAgent(t.context.agent)
+test.afterEach((ctx) => {
+  helper.unloadAgent(ctx.nr.agent)
 })
 
-tap.test('CJS imported as ESM gets wrapped correctly', async (t) => {
-  const { mod } = t.context
+test('CJS imported as ESM gets wrapped correctly', async (t) => {
+  const { mod } = t.nr
   const instance = mod()
-  t.equal(instance.name(), 'wrapped: foo')
+  assert.equal(instance.name(), 'wrapped: foo')
 })

test/integration/metric/normalization.test.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const test = require('node:test')
+const tspl = require('@matteo.collina/tspl')
+
+const ruleTests = require('../../lib/cross_agent_tests/rules')
+const Config = require('../../../lib/config')
+const Normalizer = require('../../../lib/metrics/normalizer')
+
+test('cross agent tests', async (t) => {
+  for (const ruleTest of ruleTests) {
+    await t.test(ruleTest.testname, async (t) => {
+      const plan = tspl(t, { plan: ruleTest.tests.length * 2 })
+      const config = new Config({})
+
+      const normalizer = new Normalizer(config, 'Url')
+      normalizer.load(ruleTest.rules)
+
+      ruleTest.tests.forEach(function (io) {
+        const normalized = normalizer.normalize(io.input)
+
+        if (io.expected === null) {
+          plan.ok('ignored, not checking name')
+          plan.ok(normalized.ignore, 'should ignore ' + io.input)
+        } else {
+          plan.equal(
+            normalized.value,
+            io.expected,
+            'should normalize ' + io.input + ' to ' + io.expected
+          )
+          plan.equal(normalized.ignore, false, 'should not ignore ' + io.input)
+        }
+      })
+    })
+  }
+})